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

diff --git a/meta-app-framework/conf/include/agl-app-framework.inc b/meta-app-framework/conf/include/agl-app-framework.inc
index 12091d3..296f49e 100644 (file)
--- 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 b82d8a1..930fbd9 100644 (file)
--- 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 de1b9dd..ce541a7 100644 (file)
--- 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