diff options
10 files changed, 8 insertions, 5 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 779b03d50c..019ceeb290 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc @@ -25,6 +25,7 @@ VIRTUAL-RUNTIME_alsa-state ?= "alsa-state" VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt" VIRTUAL-RUNTIME_base-utils ?= "busybox" VIRTUAL-RUNTIME_base-utils-hwclock ?= "busybox-hwclock" +VIRTUAL-RUNTIME_base-utils-syslog ?= "busybox-syslog" # # Default recipe providers diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 2ad29a7e72..e1fba4243a 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -47,7 +47,7 @@ RCONFLICTS_${PN}-syslog = "rsyslog sysklogd syslog-ng" CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" -RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" +RRECOMMENDS_${PN} = "${PN}-udhcpc" RDEPENDS_${PN} = "${@["", "busybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]}" diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb index 6de860e43a..7df8ab1ebd 100644 --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb @@ -27,7 +27,5 @@ inherit core-image IMAGE_ROOTFS_SIZE = "8192" IMAGE_ROOTFS_EXTRA_SPACE = "0" -BAD_RECOMMENDATIONS += "busybox-syslog" - # Use the same restriction as initramfs-live-install COMPATIBLE_HOST = "(i.86|x86_64).*-linux" diff --git a/meta/recipes-core/images/core-image-tiny-initramfs.bb b/meta/recipes-core/images/core-image-tiny-initramfs.bb index 51d08a0cd1..d7f97f3a17 100644 --- a/meta/recipes-core/images/core-image-tiny-initramfs.bb +++ b/meta/recipes-core/images/core-image-tiny-initramfs.bb @@ -23,8 +23,6 @@ inherit core-image IMAGE_ROOTFS_SIZE = "8192" IMAGE_ROOTFS_EXTRA_SPACE = "0" -BAD_RECOMMENDATIONS += "busybox-syslog" - # Use the same restriction as initramfs-live-install COMPATIBLE_HOST = "(i.86|x86_64).*-linux" diff --git a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb index 6337b998ac..660343eafa 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb @@ -2,6 +2,7 @@ SUMMARY = "Modular initramfs system" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" +RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" PR = "r4" diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb index f588a1077b..cc842ae8b7 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb @@ -6,6 +6,7 @@ SRC_URI = "file://init-install-efi.sh" PR = "r1" RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" +RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" S = "${WORKDIR}" diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb index 9222d57c1a..48fc0c4a76 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb @@ -8,6 +8,7 @@ PR = "r9" S = "${WORKDIR}" RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" +RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" do_install() { install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb index 78a61cde25..523138cff3 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-install-efi_1.0.bb @@ -2,6 +2,7 @@ SUMMARY = "initramfs-framework module for EFI installation option" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" RDEPENDS_${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" +RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" PR = "r4" diff --git a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb index 04e90cd302..56898e824f 100644 --- a/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-module-install_1.0.bb @@ -2,6 +2,7 @@ SUMMARY = "initramfs-framework module for installation option" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" +RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" # The same restriction as grub COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)' diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index 76cd7fc4eb..8dc445dc8f 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb @@ -46,4 +46,5 @@ RDEPENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" RRECOMMENDS_${PN} = "\ + ${VIRTUAL-RUNTIME_base-utils-syslog} \ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" |