diff options
author | 2022-06-06 18:06:42 -0400 | |
---|---|---|
committer | 2022-06-06 18:06:42 -0400 | |
commit | 2d38bf45515463dbe56a67029577834c1d941051 (patch) | |
tree | 3f5056ec358b282e2bf9f4e047cafc88b8e82b84 /recipes-platform/images | |
parent | c5c43ada3a831e3194578830522713edfb482ca7 (diff) |
Rework demo packagegroup and images
Rework the agl-ivi-demo-platform* images to reduce duplication,
and move the additions for the agl-demo-cluster-support and
agl-demo-preload features.
Changes:
- Pull in agl-image-ivi.bb in the crosssdk image rather than
duplicating its contents. This means the package additions
from the demo features will be reflected in the SDK, which
seems more in line with general expectations of how Yocto SDKs
work.
- New packagegroups are created for the agl-demo-cluster-support
and agl-demo-preload features, and they are pulled into the
agl-ivi-demo-platform / agl-demo-platform image using features
in IMAGE_FEATURES. This avoids changing the contents of various
packagegroups based on AGL_FEATURES and seems more futureproof
with respect to binary packaging.
- ALLOW_EMPTY has been removed in a few packagegroup recipes, as
it does not seem to make sense if the packagegroup will never
be empty.
- The cluster-dashboard-demo-config recipe pulled into the
agl-demo-cluster-support packagegroup has been added back, it
was accidentally removed in the application framework cleanup.
Bug-AGL: SPEC-4424
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I114b77ded6c47414270acfc3cd06e998dbcc4cef
Diffstat (limited to 'recipes-platform/images')
-rw-r--r-- | recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb | 16 | ||||
-rw-r--r-- | recipes-platform/images/agl-ivi-demo-platform-html5.bb | 11 | ||||
-rw-r--r-- | recipes-platform/images/agl-ivi-demo-platform.bb | 10 |
3 files changed, 13 insertions, 24 deletions
diff --git a/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb b/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb index 45db0e30..03bc3c40 100644 --- a/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb +++ b/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb @@ -1,19 +1,11 @@ +require agl-ivi-demo-platform.bb + SUMMARY = "Cross SDK of Full AGL Distribution for IVI profile" DESCRIPTION = "SDK image for full AGL Distribution for IVI profile. \ It includes the full meta-toolchain, plus developement headers and libraries \ to form a standalone cross SDK." - -require agl-image-ivi.bb - -# add packages for demo platform (include demo apps) here -IMAGE_INSTALL:append = " \ - packagegroup-agl-demo-platform \ - " - -LICENSE = "MIT" - require recipes-platform/images/agl-image-minimal-crosssdk.inc # Add wayland-scanner to SDK (SPEC-945) @@ -50,10 +42,10 @@ TOOLCHAIN_TARGET_TASK += "waltham-dev" TOOLCHAIN_HOST_TASK += " \ nativesdk-lua \ - " +" # Required dependencies for app and test builds TOOLCHAIN_TARGET_TASK += " \ lua-dev \ lua-staticdev \ - " +" diff --git a/recipes-platform/images/agl-ivi-demo-platform-html5.bb b/recipes-platform/images/agl-ivi-demo-platform-html5.bb index bef66eb3..805e239a 100644 --- a/recipes-platform/images/agl-ivi-demo-platform-html5.bb +++ b/recipes-platform/images/agl-ivi-demo-platform-html5.bb @@ -1,14 +1,9 @@ -SUMMARY = "DEMO platform of AGL HTML5 profile" -DESCRIPTION = "Contains the web runtime and sample web apps" - require agl-image-ivi.bb -LICENSE = "MIT" - -IMAGE_FEATURES:append = " \ - " +SUMMARY = "DEMO platform of AGL HTML5 profile" +DESCRIPTION = "Contains the web runtime and sample web apps" # add packages for demo platform (include demo apps) here IMAGE_INSTALL:append = " \ packagegroup-agl-demo-platform-html5 \ - " +" diff --git a/recipes-platform/images/agl-ivi-demo-platform.bb b/recipes-platform/images/agl-ivi-demo-platform.bb index 78a6b2c2..d3bda6ae 100644 --- a/recipes-platform/images/agl-ivi-demo-platform.bb +++ b/recipes-platform/images/agl-ivi-demo-platform.bb @@ -1,13 +1,15 @@ +require agl-image-ivi.bb + DESCRIPTION = "AGL Demo Platform image currently contains a simple HMI and \ demos." -require agl-image-ivi.bb - +FEATURE_PACKAGES_agl-demo-preload = "packagegroup-agl-demo-preload" +FEATURE_PACKAGES_agl-demo-cluster-support = "packagegroup-agl-demo-cluster-support" -LICENSE = "MIT" +IMAGE_FEATURES += "${@bb.utils.filter("AGL_FEATURES", "agl-demo-preload agl-demo-cluster-support", d)}" # add packages for demo platform (include demo apps) here IMAGE_INSTALL:append = " \ packagegroup-agl-demo-platform \ - " +" |