From: Scott Murray Date: Tue, 12 Jan 2021 21:41:29 +0000 (-0500) Subject: Remove separate agl-{cluster,telematics}-demo features X-Git-Tag: 10.92.0~8 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=d7d6c8622195aaf83bd66b53dec231d7b1c30bf1;p=AGL%2Fmeta-agl-demo.git Remove separate agl-{cluster,telematics}-demo features Changes: - Remove feature templates and associated include files for the agl-cluster-demo and agl-telematics-demo features. All of the demo images can now be built by just configuring with the agl-demo feature. - Remove feature template for agl-cluster-demo-preload, the cluster demo configuration it was pulling into the cluster image is now driven by the agl-demo-preload feature instead. - Moved speech framework and Alexa voiceagent feature inclusion to agl-demo-platform.inc to avoid them accidentally being pulled into the cluster or telematics demo images. Part of this change is moving agl-voiceagent-alexa from using IMAGE_FEATURES to AGL_FEATURES, which needs a corresponding change to meta-agl-devel. - Remove leftover use of agl-core-image-profile DISTRO_FEATURE, which no longer exists. - Remove unneeded explicit dependency on the PREFERRED_RPROVIDER_virtual/voice-high-config, things seem to be working fine with the dependency from agl-service-voice-high, so it is not required. Bug-AGL: SPEC-3749 Signed-off-by: Scott Murray Change-Id: Ibcfbce28231a91aa56269db9196c471458d0e928 --- diff --git a/conf/include/agl-cluster-demo-preload.inc b/conf/include/agl-cluster-demo-preload.inc deleted file mode 100644 index 70421e8cf..000000000 --- a/conf/include/agl-cluster-demo-preload.inc +++ /dev/null @@ -1 +0,0 @@ -AGL_FEATURES_append = " agl-cluster-demo-preload" diff --git a/conf/include/agl-cluster-demo.inc b/conf/include/agl-cluster-demo.inc deleted file mode 100644 index a8847e071..000000000 --- a/conf/include/agl-cluster-demo.inc +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE_FEATURES =+ "debug-tweaks" - -#DISTRO_FEATURES_append = " " - -#IMAGE_INSTALL_append = " " diff --git a/conf/include/agl-demo.inc b/conf/include/agl-demo.inc index 7d6db8ce4..55f2e8ab0 100644 --- a/conf/include/agl-demo.inc +++ b/conf/include/agl-demo.inc @@ -18,4 +18,3 @@ PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "${@bb.utils.contains('DISTRO # voice api inclusion PREFERRED_RPROVIDER_virtual/voice-high-config = "default-voice-high-config" FEATURE_PACKAGES_agl-speech-framework = "packagegroup-agl-speech-services" -IMAGE_FEATURES += "agl-speech-framework" diff --git a/conf/include/agl-telematics-demo.inc b/conf/include/agl-telematics-demo.inc deleted file mode 100644 index a8847e071..000000000 --- a/conf/include/agl-telematics-demo.inc +++ /dev/null @@ -1,5 +0,0 @@ -IMAGE_FEATURES =+ "debug-tweaks" - -#DISTRO_FEATURES_append = " " - -#IMAGE_INSTALL_append = " " diff --git a/recipes-platform/images/agl-cluster-demo-platform.bb b/recipes-platform/images/agl-cluster-demo-platform.bb index 52d737b74..9af32ee42 100644 --- a/recipes-platform/images/agl-cluster-demo-platform.bb +++ b/recipes-platform/images/agl-cluster-demo-platform.bb @@ -4,11 +4,11 @@ require agl-cluster-demo-platform.inc LICENSE = "MIT" -IMAGE_FEATURES_append = " \ - " +IMAGE_FEATURES_append = "" # add packages for cluster demo platform (include demo apps) here IMAGE_INSTALL_append = " \ packagegroup-agl-cluster-demo-platform \ + ${@bb.utils.contains("AGL_FEATURES", "agl-demo-preload", "cluster-dashboard-demo-config", "", d)} \ " diff --git a/recipes-platform/images/agl-demo-platform.inc b/recipes-platform/images/agl-demo-platform.inc index f363e304f..e901409a3 100644 --- a/recipes-platform/images/agl-demo-platform.inc +++ b/recipes-platform/images/agl-demo-platform.inc @@ -1,2 +1,8 @@ # Base image require agl-image-ivi.inc + +# Pull in speech framework bits +IMAGE_FEATURES += "agl-speech-framework" + +# Pull in Alexa voiceagent if configured +IMAGE_FEATURES += "${@bb.utils.filter("AGL_FEATURES", "agl-voiceagent-alexa", d)}" diff --git a/recipes-platform/images/agl-image-ivi.inc b/recipes-platform/images/agl-image-ivi.inc index 95b6ca688..6aa961bcd 100644 --- a/recipes-platform/images/agl-image-ivi.inc +++ b/recipes-platform/images/agl-image-ivi.inc @@ -13,4 +13,3 @@ IMAGE_INSTALL_append = "\ " IMAGE_FEATURES += "splash package-management ssh-server-dropbear" -DISTRO_FEATURES_append = " agl-core-image-profile" diff --git a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb index 612e26d45..910b55bd8 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-cluster-demo-platform.bb @@ -31,8 +31,6 @@ AGL_APIS = " \ agl-service-signal-composer \ " -DEMO_PRELOAD = "${@bb.utils.contains("DISTRO_FEATURES", "agl-cluster-demo-preload", "cluster-dashboard-demo-config", "",d)}" - RDEPENDS_${PN}_append = " \ weston-ini-conf-landscape \ hmi-debug \ @@ -40,5 +38,4 @@ RDEPENDS_${PN}_append = " \ linux-firmware-ralink \ ${AGL_APPS} \ ${AGL_APIS} \ - ${DEMO_PRELOAD} \ " diff --git a/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb b/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb index 8dd97f394..acdeca72a 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-speech-services.bb @@ -10,5 +10,4 @@ PACKAGES = "\ RDEPENDS_${PN} += "\ agl-service-voice-high \ agl-service-voice-high-capabilities \ - ${PREFERRED_RPROVIDER_virtual/voice-high-config} \ " diff --git a/templates/feature/agl-cluster-demo-preload/50_local.conf.inc b/templates/feature/agl-cluster-demo-preload/50_local.conf.inc deleted file mode 100644 index f15acf66e..000000000 --- a/templates/feature/agl-cluster-demo-preload/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -#see meta-agl-cluster-demo/conf/include/agl-cluster-demo-preload.inc -require conf/include/agl-cluster-demo-preload.inc diff --git a/templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md b/templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md deleted file mode 100644 index bfb210867..000000000 --- a/templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -description: Feature agl-cluster-demo-preload -authors: Scott Murray ---- - -### Feature agl-cluster-demo-preload - -*Description is missing - please complete file meta-agl-cluster-demo/templates/feature/agl-cluster-demo-preload/README_feature_agl-cluster-demo-preload.md* - diff --git a/templates/feature/agl-cluster-demo/50_local.conf.inc b/templates/feature/agl-cluster-demo/50_local.conf.inc deleted file mode 100644 index 90b0380d4..000000000 --- a/templates/feature/agl-cluster-demo/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -#see meta-agl-cluster-demo/conf/include/agl-cluster-demo.inc -require conf/include/agl-cluster-demo.inc diff --git a/templates/feature/agl-cluster-demo/included.dep b/templates/feature/agl-cluster-demo/included.dep deleted file mode 100644 index 82639da07..000000000 --- a/templates/feature/agl-cluster-demo/included.dep +++ /dev/null @@ -1 +0,0 @@ -agl-demo diff --git a/templates/feature/agl-telematics-demo/50_local.conf.inc b/templates/feature/agl-telematics-demo/50_local.conf.inc deleted file mode 100644 index 64c8714bb..000000000 --- a/templates/feature/agl-telematics-demo/50_local.conf.inc +++ /dev/null @@ -1,2 +0,0 @@ -#see meta-agl-telematics-demo/conf/include/agl-telematics-demo.inc -require conf/include/agl-telematics-demo.inc diff --git a/templates/feature/agl-telematics-demo/included.dep b/templates/feature/agl-telematics-demo/included.dep deleted file mode 100644 index 92798cdc9..000000000 --- a/templates/feature/agl-telematics-demo/included.dep +++ /dev/null @@ -1 +0,0 @@ -agl-demo \ No newline at end of file