aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Ferraris <arnaud.ferraris@collabora.com>2021-12-07 18:31:11 +0100
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2021-12-08 13:04:08 +0000
commitdfc94b8254a86b2c94bec6a68068b2ed5861f66e (patch)
tree43ad258dc7e9390d4dd05d6774ec40b129a5c567
parentccaedc3d351273f39ee4af773a627de5bbe9e642 (diff)
meta-app-framework: add new AGL feature and fix build
This layer uses a new `agl-app-fw` feature to guard bbappends, so this commit declares it in the conf include and makes sure it's used when the feature is enabled. Moreover, the `layer.conf` files referenced a non-existent `licenses` folder, causing build issues. This commit fixes this by not adding this folder to LICENSE_PATH. Bug-AGL: SPEC-4161 Change-Id: I3360b0f3b36413e741de2d2d3e4a98fff1e1e8db Signed-off-by: Arnaud Ferraris <arnaud.ferraris@collabora.com> Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26973 Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account
-rw-r--r--meta-app-framework/conf/include/agl-app-framework.inc3
-rw-r--r--meta-app-framework/conf/layer.conf3
-rw-r--r--templates/feature/agl-app-framework/50_local.conf.inc2
3 files changed, 3 insertions, 5 deletions
diff --git a/meta-app-framework/conf/include/agl-app-framework.inc b/meta-app-framework/conf/include/agl-app-framework.inc
index 12091d38e..296f49e79 100644
--- a/meta-app-framework/conf/include/agl-app-framework.inc
+++ b/meta-app-framework/conf/include/agl-app-framework.inc
@@ -1 +1,2 @@
-# any required local.conf additions \ No newline at end of file
+# enable the layer
+AGL_FEATURES:append = " agl-app-fw"
diff --git a/meta-app-framework/conf/layer.conf b/meta-app-framework/conf/layer.conf
index b82d8a19a..930fbd9ea 100644
--- a/meta-app-framework/conf/layer.conf
+++ b/meta-app-framework/conf/layer.conf
@@ -11,6 +11,3 @@ BBFILE_PRIORITY_meta-app-framework = "60"
LAYERSERIES_COMPAT_meta-app-framework = "dunfell"
LAYERDEPENDS_meta-app-framework = "core aglcore"
-
-#
-LICENSE_PATH += "${LAYERDIR}/licenses"
diff --git a/templates/feature/agl-app-framework/50_local.conf.inc b/templates/feature/agl-app-framework/50_local.conf.inc
index de1b9dde0..ce541a7b0 100644
--- a/templates/feature/agl-app-framework/50_local.conf.inc
+++ b/templates/feature/agl-app-framework/50_local.conf.inc
@@ -1,2 +1,2 @@
#see meta-agl/meta-app-framework/conf/include/agl-app-framework.inc
-#require conf/include/agl-app-framework.inc
+require conf/include/agl-app-framework.inc