From: Scott Murray <scott.murray@konsulko.com>
Date: Thu, 21 Nov 2024 01:03:14 +0000 (-0500)
Subject: Use new agl-kuksa-val feature
X-Git-Tag: 18.91.0~3
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=da4b433728b918de0b96b1b740b526ca7f245ef5;p=AGL%2Fmeta-agl-demo.git

Use new agl-kuksa-val feature

Update agl-demo and agl-demo-control-panel feature definitions to use
new agl-kuksa-val feature instead of pulling in meta-agl-kuksa-val
directly.

Bug-AGL: SPEC-5299

Change-Id: I059bfa86eb7725aa24f366ea781691db018238aa
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30537
ci-image-build: Jenkins Job builder account
Tested-by: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
---

diff --git a/templates/feature/agl-demo-control-panel/50_bblayers.conf.inc b/templates/feature/agl-demo-control-panel/50_bblayers.conf.inc
index ccf05668e..a583f9785 100644
--- a/templates/feature/agl-demo-control-panel/50_bblayers.conf.inc
+++ b/templates/feature/agl-demo-control-panel/50_bblayers.conf.inc
@@ -2,7 +2,6 @@
 #---------------------------------------------------
 BBLAYERS =+ " \
    ${METADIR}/meta-agl-demo/meta-agl-demo-control-panel \
-   ${METADIR}/meta-agl/meta-agl-kuksa-val \
 "
 
 #AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems"
diff --git a/templates/feature/agl-demo-control-panel/included.dep b/templates/feature/agl-demo-control-panel/included.dep
new file mode 100644
index 000000000..4d7582cde
--- /dev/null
+++ b/templates/feature/agl-demo-control-panel/included.dep
@@ -0,0 +1 @@
+agl-kuksa-val
diff --git a/templates/feature/agl-demo/50_bblayers.conf.inc b/templates/feature/agl-demo/50_bblayers.conf.inc
index 994b85c26..d2e1cced1 100644
--- a/templates/feature/agl-demo/50_bblayers.conf.inc
+++ b/templates/feature/agl-demo/50_bblayers.conf.inc
@@ -1,7 +1,6 @@
 # This layer contains the WIP feature/demo code only
 #---------------------------------------------------
 BBLAYERS =+ " \
-   ${METADIR}/meta-agl/meta-agl-kuksa-val \
    ${METADIR}/meta-agl-demo \
 "
 
diff --git a/templates/feature/agl-demo/included.dep b/templates/feature/agl-demo/included.dep
index a81b5a431..449fc2a7c 100644
--- a/templates/feature/agl-demo/included.dep
+++ b/templates/feature/agl-demo/included.dep
@@ -1 +1 @@
-agl-pipewire agl-app-framework agl-selinux agl-flutter agl-weston-remoting
+agl-pipewire agl-app-framework agl-selinux agl-kuksa-val agl-flutter agl-weston-remoting