diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2021-02-24 15:21:07 -0500 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-03-01 16:50:57 +0000 |
| commit | 3074b426cf0ef83ebab6bfe7c086813698d2fa29 (patch) | |
| tree | 9e1b4e42b06d18a39d6a68f62b01ca8be797585a | |
| parent | ce0ddfbe4865b1ab977750cf758d0ccca992e30e (diff) | |
meta-agl-core: update packagegroup-agl-core-boot
Update packagegroup-agl-core-boot to match the current state of
packagegroup-core-boot in upstream poky master. The changes
remove use of some of the global VIRTUAL-RUNTIME variables that are
now assumed to be globally scoped, and replacing the hard-coded
busybox usage with appropriate VIRTUAL-RUNTIME variables.
Bug-AGL: SPEC-3819
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I5d16c44bf78afd2a8b0914c3381f94e7e5382223
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26099
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
| -rw-r--r-- | meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb index 5ffa4cfff..e4b540d79 100644 --- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb +++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb @@ -19,12 +19,9 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" # Distro can override the following VIRTUAL-RUNTIME providers: VIRTUAL-RUNTIME_dev_manager ?= "udev" -VIRTUAL-RUNTIME_login_manager ?= "busybox" -VIRTUAL-RUNTIME_init_manager ?= "sysvinit" -VIRTUAL-RUNTIME_initscripts ?= "initscripts" VIRTUAL-RUNTIME_keymaps ?= "keymaps" -SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \ +SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '${VIRTUAL-RUNTIME_base-utils-hwclock}', '', d)} \ modutils-initscripts \ init-ifupdown \ ${VIRTUAL-RUNTIME_initscripts} \ @@ -33,7 +30,7 @@ SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwc RDEPENDS_${PN} = "\ base-files \ base-passwd \ - busybox \ + ${VIRTUAL-RUNTIME_base-utils} \ rng-tools \ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ |