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" | |||
25 | VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt" | 25 | VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt" |
26 | VIRTUAL-RUNTIME_base-utils ?= "busybox" | 26 | VIRTUAL-RUNTIME_base-utils ?= "busybox" |
27 | VIRTUAL-RUNTIME_base-utils-hwclock ?= "busybox-hwclock" | 27 | VIRTUAL-RUNTIME_base-utils-hwclock ?= "busybox-hwclock" |
28 | VIRTUAL-RUNTIME_base-utils-syslog ?= "busybox-syslog" | ||
28 | 29 | ||
29 | # | 30 | # |
30 | # Default recipe providers | 31 | # 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" | |||
47 | 47 | ||
48 | CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" | 48 | CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" |
49 | 49 | ||
50 | RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" | 50 | RRECOMMENDS_${PN} = "${PN}-udhcpc" |
51 | 51 | ||
52 | RDEPENDS_${PN} = "${@["", "busybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]}" | 52 | RDEPENDS_${PN} = "${@["", "busybox-inittab"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]}" |
53 | 53 | ||
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 | |||
27 | IMAGE_ROOTFS_SIZE = "8192" | 27 | IMAGE_ROOTFS_SIZE = "8192" |
28 | IMAGE_ROOTFS_EXTRA_SPACE = "0" | 28 | IMAGE_ROOTFS_EXTRA_SPACE = "0" |
29 | 29 | ||
30 | BAD_RECOMMENDATIONS += "busybox-syslog" | ||
31 | |||
32 | # Use the same restriction as initramfs-live-install | 30 | # Use the same restriction as initramfs-live-install |
33 | COMPATIBLE_HOST = "(i.86|x86_64).*-linux" | 31 | 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 | |||
23 | IMAGE_ROOTFS_SIZE = "8192" | 23 | IMAGE_ROOTFS_SIZE = "8192" |
24 | IMAGE_ROOTFS_EXTRA_SPACE = "0" | 24 | IMAGE_ROOTFS_EXTRA_SPACE = "0" |
25 | 25 | ||
26 | BAD_RECOMMENDATIONS += "busybox-syslog" | ||
27 | |||
28 | # Use the same restriction as initramfs-live-install | 26 | # Use the same restriction as initramfs-live-install |
29 | COMPATIBLE_HOST = "(i.86|x86_64).*-linux" | 27 | COMPATIBLE_HOST = "(i.86|x86_64).*-linux" |
30 | 28 | ||
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" | |||
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" | 4 | RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}" |
5 | RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | ||
5 | 6 | ||
6 | PR = "r4" | 7 | PR = "r4" |
7 | 8 | ||
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" | |||
6 | PR = "r1" | 6 | PR = "r1" |
7 | 7 | ||
8 | RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" | 8 | RDEPENDS_${PN} = "parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" |
9 | RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | ||
9 | 10 | ||
10 | S = "${WORKDIR}" | 11 | S = "${WORKDIR}" |
11 | 12 | ||
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" | |||
8 | S = "${WORKDIR}" | 8 | S = "${WORKDIR}" |
9 | 9 | ||
10 | RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" | 10 | RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" |
11 | RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | ||
11 | 12 | ||
12 | do_install() { | 13 | do_install() { |
13 | install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh | 14 | 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" | |||
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | RDEPENDS_${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" | 4 | RDEPENDS_${PN} = "initramfs-framework-base parted e2fsprogs-mke2fs dosfstools util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" |
5 | RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | ||
5 | 6 | ||
6 | PR = "r4" | 7 | PR = "r4" |
7 | 8 | ||
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" | |||
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" | 4 | RDEPENDS_${PN} = "initramfs-framework-base grub parted e2fsprogs-mke2fs util-linux-blkid ${VIRTUAL-RUNTIME_base-utils}" |
5 | RRECOMMENDS_${PN} = "${VIRTUAL-RUNTIME_base-utils-syslog}" | ||
5 | 6 | ||
6 | # The same restriction as grub | 7 | # The same restriction as grub |
7 | COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*)-(linux.*|freebsd.*)' | 8 | 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} = "\ | |||
46 | ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" | 46 | ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" |
47 | 47 | ||
48 | RRECOMMENDS_${PN} = "\ | 48 | RRECOMMENDS_${PN} = "\ |
49 | ${VIRTUAL-RUNTIME_base-utils-syslog} \ | ||
49 | ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" | 50 | ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" |