From 188db67d4205a7d37c374cc20d9d3bd90324cb41 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 20 Feb 2024 13:04:54 -0500 Subject: 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 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/29700 Reviewed-by: Jan-Simon Moeller ci-image-build: Jenkins Job builder account Tested-by: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account --- recipes-platform/images/agl-demo-features.inc | 5 +++++ recipes-platform/images/agl-image-ivi.bb | 1 - recipes-platform/images/agl-ivi-demo-features.inc | 5 ++++- recipes-platform/images/agl-kvm-demo-platform.bb | 1 + recipes-platform/packagegroups/packagegroup-agl-demo.bb | 2 -- 5 files changed, 10 insertions(+), 4 deletions(-) (limited to 'recipes-platform') diff --git a/recipes-platform/images/agl-demo-features.inc b/recipes-platform/images/agl-demo-features.inc index b3374976..a8112c83 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 c0b6e4f7..165a45b0 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 19a7792e..eb4d253c 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 338b3e6c..feafe2e1 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 02926d34..90283e06 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} \ -- cgit 1.2.3-korg