summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2021-02-03 00:00:56 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2021-02-03 00:00:56 +0100
commit6a720d37ec56998b078b22c17218bcfeea6f4909 (patch)
treebdcc335b95955c2248079d2d9ed4c1ff541bdc78
parent710583ec2e6e45ec23a1995376fb8bdec842505c (diff)
Use change agl-devel to not use DISTRO_FEATURESsandbox/jsmoeller/agl-features
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org> Change-Id: I0742ab92df09863a00f1c1ced46bebede9dc486b
-rw-r--r--meta-agl-core/conf/include/agl-devel.inc2
-rw-r--r--meta-agl-core/recipes-kernel/linux/linux-agl.inc4
-rw-r--r--meta-app-framework/recipes-core/af-main/af-main_git.inc2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta-agl-core/conf/include/agl-devel.inc b/meta-agl-core/conf/include/agl-devel.inc
index 919f066..d6d1369 100644
--- a/meta-agl-core/conf/include/agl-devel.inc
+++ b/meta-agl-core/conf/include/agl-devel.inc
@@ -15,4 +15,4 @@ SDKIMAGE_FEATURES="dev-pkgs"
# allows insertion of code or items specific to developement
OVERRIDES .= ":agl-devel"
-DISTRO_FEATURES_append = " agl-devel"
+AGL_FEATURES_append = " agl-devel"
diff --git a/meta-agl-core/recipes-kernel/linux/linux-agl.inc b/meta-agl-core/recipes-kernel/linux/linux-agl.inc
index cd960ef..3f55771 100644
--- a/meta-agl-core/recipes-kernel/linux/linux-agl.inc
+++ b/meta-agl-core/recipes-kernel/linux/linux-agl.inc
@@ -128,5 +128,5 @@ SRC_URI_append = " file://netfilter.cfg"
KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/netfilter.cfg"
# Enable support for SystemTap
-SRC_URI_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'file://systemtap.cfg', '', d)}"
-KERNEL_CONFIG_FRAGMENTS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '${WORKDIR}/systemtap.cfg', '', d)}"
+SRC_URI_append = " ${@bb.utils.contains('AGL_FEATURES', 'agl-devel', 'file://systemtap.cfg', '', d)}"
+KERNEL_CONFIG_FRAGMENTS_append = " ${@bb.utils.contains('AGL_FEATURES', 'agl-devel', '${WORKDIR}/systemtap.cfg', '', d)}"
diff --git a/meta-app-framework/recipes-core/af-main/af-main_git.inc b/meta-app-framework/recipes-core/af-main/af-main_git.inc
index 5ac76a7..7358abd 100644
--- a/meta-app-framework/recipes-core/af-main/af-main_git.inc
+++ b/meta-app-framework/recipes-core/af-main/af-main_git.inc
@@ -24,7 +24,7 @@ systemd_units_root = "/var/local/lib/systemd"
CFLAGS_append_agl-devel = " -DAGL_DEVEL"
# only install sample keys in agl-devel mode
# for production you need to deploy real keys
-EXTRA_OECMAKE_append_agl-sign-wgts = " ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', '-DINSTALL_SAMPLE_KEYS=ON', '-DINSTALL_SAMPLE_KEYS=OFF', d)}"
+EXTRA_OECMAKE_append_agl-sign-wgts = " ${@bb.utils.contains('AGL_FEATURES', 'agl-devel', '-DINSTALL_SAMPLE_KEYS=ON', '-DINSTALL_SAMPLE_KEYS=OFF', d)}"