diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-10-14 02:08:32 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-10-15 21:05:53 +0000 |
| commit | b1e5801ba688672facfefaec3ee815413dd1dd3e (patch) | |
| tree | 1658a3d1fd311bb572de05541ca2e22c9b8e2b72 | |
| parent | a1e6ba6c82afa7e3c161462c0d1b0027495e70f7 (diff) | |
Adapt packages of agl-image-ivi-crosssdkjellyfish_10.0.1jellyfish/10.0.110.0.1
The agl-image-ivi-crosssdk image was missing multiple services required for CI use.
Bug-AGL: SPEC-3598
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: Ide6a367955b9a019863d7b29e04157c94dd33f60
(cherry picked from commit ec26de7ad1430322731f1424e72c4a2f7584cbd3)
| -rw-r--r-- | recipes-platform/images/agl-image-ivi-crosssdk.bb | 11 | ||||
| -rw-r--r-- | recipes-platform/images/agl-image-ivi.bb | 5 | ||||
| -rw-r--r-- | recipes-platform/images/agl-image-ivi.inc | 13 |
3 files changed, 22 insertions, 7 deletions
diff --git a/recipes-platform/images/agl-image-ivi-crosssdk.bb b/recipes-platform/images/agl-image-ivi-crosssdk.bb index 93537feb..72bf8f7b 100644 --- a/recipes-platform/images/agl-image-ivi-crosssdk.bb +++ b/recipes-platform/images/agl-image-ivi-crosssdk.bb @@ -1,2 +1,9 @@ -# just for backward compatibility -require recipes-platform/images/agl-image-minimal-crosssdk.bb +require recipes-platform/images/agl-image-minimal-crosssdk.inc +require agl-image-ivi.inc + +inherit populate_sdk + +# Task do_populate_sdk and do_rootfs can't be exec simultaneously. +# Both exec "createrepo" on the same directory, and so one of them +# can failed (randomly). +addtask do_populate_sdk after do_rootfs diff --git a/recipes-platform/images/agl-image-ivi.bb b/recipes-platform/images/agl-image-ivi.bb index 1e587006..b3c72de0 100644 --- a/recipes-platform/images/agl-image-ivi.bb +++ b/recipes-platform/images/agl-image-ivi.bb @@ -6,8 +6,3 @@ require agl-image-ivi.inc LICENSE = "MIT" -IMAGE_INSTALL_append = "\ - packagegroup-agl-image-ivi \ - " - -DISTRO_FEATURES_append = " agl-core-image-profile" diff --git a/recipes-platform/images/agl-image-ivi.inc b/recipes-platform/images/agl-image-ivi.inc index 610d4e46..95b6ca68 100644 --- a/recipes-platform/images/agl-image-ivi.inc +++ b/recipes-platform/images/agl-image-ivi.inc @@ -1,3 +1,16 @@ require recipes-platform/images/agl-image-minimal.inc +IMAGE_INSTALL_append = "\ + packagegroup-agl-image-ivi \ + packagegroup-agl-ivi-services \ + agl-service-homescreen \ + agl-service-weather \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'pipewire', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'agl-service-mediaplayer', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pipewire', 'agl-service-radio', '', d)} \ + can-utils \ + iproute2 \ + " + IMAGE_FEATURES += "splash package-management ssh-server-dropbear" +DISTRO_FEATURES_append = " agl-core-image-profile" |