aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-03-30 15:08:58 -0400
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2020-04-27 17:12:24 +0200
commit61becb58b652e04f5d55e160755cd7fb99f66403 (patch)
treee3d9e49d0aca308917aacfe6c894642d1c33e4f3
parent8951581150502aeb0be31b2b86fba534abce096b (diff)
Update distro_features_check usage
Replace distro_features_check usage with features_check to work with dunfell, which has removed distro_features_check. Bug-AGL: SPEC-3302 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I46ef0d0feaa5515dd664de4cc5a9691e2ebe109b
-rw-r--r--meta-agl-profile-cluster-qt5/recipes-platform/images/agl-image-cluster-qt5.inc2
-rw-r--r--meta-agl-profile-cluster/recipes-platform/images/agl-image-cluster.inc2
-rw-r--r--meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc2
-rw-r--r--meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.inc2
-rw-r--r--meta-agl-profile-telematics/recipes-platform/images/agl-image-telematics.inc2
-rw-r--r--meta-security/recipes-security/security-manager/security-manager.inc2
-rw-r--r--meta-security/recipes-security/smacknet/smacknet.bb2
7 files changed, 7 insertions, 7 deletions
diff --git a/meta-agl-profile-cluster-qt5/recipes-platform/images/agl-image-cluster-qt5.inc b/meta-agl-profile-cluster-qt5/recipes-platform/images/agl-image-cluster-qt5.inc
index 9f9f530f9..93826aa46 100644
--- a/meta-agl-profile-cluster-qt5/recipes-platform/images/agl-image-cluster-qt5.inc
+++ b/meta-agl-profile-cluster-qt5/recipes-platform/images/agl-image-cluster-qt5.inc
@@ -2,6 +2,6 @@ require recipes-platform/images/agl-image-boot.inc
IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
-inherit distro_features_check
+inherit features_check
REQUIRED_DISTRO_FEATURES = "wayland"
diff --git a/meta-agl-profile-cluster/recipes-platform/images/agl-image-cluster.inc b/meta-agl-profile-cluster/recipes-platform/images/agl-image-cluster.inc
index 9f9f530f9..93826aa46 100644
--- a/meta-agl-profile-cluster/recipes-platform/images/agl-image-cluster.inc
+++ b/meta-agl-profile-cluster/recipes-platform/images/agl-image-cluster.inc
@@ -2,6 +2,6 @@ require recipes-platform/images/agl-image-boot.inc
IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
-inherit distro_features_check
+inherit features_check
REQUIRED_DISTRO_FEATURES = "wayland"
diff --git a/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc b/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc
index ed1634fcc..cef3bf64e 100644
--- a/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc
+++ b/meta-agl-profile-graphical-qt5/recipes-platform/images/agl-image-graphical-qt5.inc
@@ -2,6 +2,6 @@ require recipes-platform/images/agl-image-minimal.inc
IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
-inherit distro_features_check
+inherit features_check
REQUIRED_DISTRO_FEATURES = "wayland"
diff --git a/meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.inc b/meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.inc
index ed1634fcc..cef3bf64e 100644
--- a/meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.inc
+++ b/meta-agl-profile-graphical/recipes-platform/images/agl-image-weston.inc
@@ -2,6 +2,6 @@ require recipes-platform/images/agl-image-minimal.inc
IMAGE_FEATURES += "splash package-management ssh-server-dropbear"
-inherit distro_features_check
+inherit features_check
REQUIRED_DISTRO_FEATURES = "wayland"
diff --git a/meta-agl-profile-telematics/recipes-platform/images/agl-image-telematics.inc b/meta-agl-profile-telematics/recipes-platform/images/agl-image-telematics.inc
index b8c228cdc..3e951550e 100644
--- a/meta-agl-profile-telematics/recipes-platform/images/agl-image-telematics.inc
+++ b/meta-agl-profile-telematics/recipes-platform/images/agl-image-telematics.inc
@@ -1,5 +1,5 @@
require recipes-platform/images/agl-image-boot.inc
-inherit distro_features_check
+inherit features_check
REQUIRED_DISTRO_FEATURES = "3g"
diff --git a/meta-security/recipes-security/security-manager/security-manager.inc b/meta-security/recipes-security/security-manager/security-manager.inc
index fdc5083e6..e1d1f4011 100644
--- a/meta-security/recipes-security/security-manager/security-manager.inc
+++ b/meta-security/recipes-security/security-manager/security-manager.inc
@@ -36,7 +36,7 @@ EXTRA_OECMAKE = " \
inherit systemd
SYSTEMD_SERVICE_${PN} = "security-manager.service"
-inherit distro_features_check
+inherit features_check
REQUIRED_DISTRO_FEATURES += "smack"
# The upstream source code contains the Tizen-specific policy configuration files.
diff --git a/meta-security/recipes-security/smacknet/smacknet.bb b/meta-security/recipes-security/smacknet/smacknet.bb
index 553456aee..250cdb132 100644
--- a/meta-security/recipes-security/smacknet/smacknet.bb
+++ b/meta-security/recipes-security/smacknet/smacknet.bb
@@ -12,7 +12,7 @@ S = "${WORKDIR}"
inherit systemd
-inherit distro_features_check
+inherit features_check
REQUIRED_DISTRO_FEATURES = "smack"
#netlabel configuration service