diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2024-02-20 13:04:54 -0500 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-03-08 18:27:03 +0000 |
| commit | 188db67d4205a7d37c374cc20d9d3bd90324cb41 (patch) | |
| tree | 40dc5c43fa21cc108cfed25ff11056a504fbc743 | |
| parent | 0c14b48d5b0c1129e79f7a59daaedd3f55989c5c (diff) | |
Add CAN test tools image feature
Add can-test-tools image feature and use it to remove duplication
of adding the tools to various images.
Bug-AGL: SPEC-5083
Change-Id: I4f4eec87eb26825f69f056183829feab7d90caf5
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29700
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
ci-image-build: Jenkins Job builder account
Tested-by: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
5 files changed, 10 insertions, 4 deletions
diff --git a/recipes-platform/images/agl-demo-features.inc b/recipes-platform/images/agl-demo-features.inc index b33749761..a8112c83d 100644 --- a/recipes-platform/images/agl-demo-features.inc +++ b/recipes-platform/images/agl-demo-features.inc @@ -1,3 +1,8 @@ +FEATURE_PACKAGES_can-test-tools = " \ + can-utils \ + cannelloni \ +" + FEATURE_PACKAGES_kuksa-val-databroker-client = " \ kuksa-certificates-agl-ca \ ${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', 'packagegroup-agl-kuksa-val-databroker-devel' , '', d)} \ diff --git a/recipes-platform/images/agl-image-ivi.bb b/recipes-platform/images/agl-image-ivi.bb index c0b6e4f7f..165a45b09 100644 --- a/recipes-platform/images/agl-image-ivi.bb +++ b/recipes-platform/images/agl-image-ivi.bb @@ -7,7 +7,6 @@ LICENSE = "MIT" require recipes-platform/images/agl-image-compositor.bb IMAGE_INSTALL += " \ - can-utils \ packagegroup-agl-ivi-connectivity \ packagegroup-agl-ivi-graphics \ packagegroup-agl-ivi-multimedia \ diff --git a/recipes-platform/images/agl-ivi-demo-features.inc b/recipes-platform/images/agl-ivi-demo-features.inc index 19a7792eb..eb4d253c9 100644 --- a/recipes-platform/images/agl-ivi-demo-features.inc +++ b/recipes-platform/images/agl-ivi-demo-features.inc @@ -3,7 +3,10 @@ require agl-demo-features.inc FEATURE_PACKAGES_agl-demo-preload = "packagegroup-agl-demo-preload" FEATURE_PACKAGES_agl-demo-cluster-support = "packagegroup-agl-demo-cluster-support" -IMAGE_FEATURES += "${@bb.utils.filter("AGL_FEATURES", "agl-demo-preload agl-demo-cluster-support", d)}" +IMAGE_FEATURES += " \ + ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "can-test-tools" , "", d)} \ + ${@bb.utils.filter("AGL_FEATURES", "agl-demo-preload agl-demo-cluster-support", d)} \ +" IMAGE_FEATURES += " \ kuksa-val-databroker-client \ diff --git a/recipes-platform/images/agl-kvm-demo-platform.bb b/recipes-platform/images/agl-kvm-demo-platform.bb index 338b3e6c5..feafe2e13 100644 --- a/recipes-platform/images/agl-kvm-demo-platform.bb +++ b/recipes-platform/images/agl-kvm-demo-platform.bb @@ -11,6 +11,7 @@ IMAGE_FEATURES += "splash package-management ssh-server-openssh" # some clients run on the host IMAGE_FEATURES += " \ ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-kuksa", "kuksa-val-databroker kuksa-val-databroker-client", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "agl-devel", "can-test-tools" , "", d)} \ " # Add packages for KVM+QEMU demo platform here diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb index 02926d34e..90283e065 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb @@ -33,8 +33,6 @@ RDEPENDS:${PN} += " \ udisks2 \ linux-firmware-ath9k \ linux-firmware-ralink \ - can-utils \ - cannelloni \ iproute2 \ ${DEMO_PLATFORM_CONF} \ ${TTF_FONTS} \ |