From 8c6ffb685b3e4a85e944c99135b5b4eb598666e3 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Mon, 27 Apr 2020 23:06:24 +0200 Subject: packagegroup-meta-initramfs: remove klibc utilities and kexec-tools-klibc klibc utils have no update-alternatives because these live ideally alone in the initramfs. mwta-initramfs image is not minimal having busybox, linux- utils,coreutils so to resolve the conflict we remove the shared klibc utils. The image is mostly for build-tests and contains dracut, which does not have runtime dependencies on kexec-tools, so we can safely remove the klibc static version of kexec and vmcore-dmesg (not availaible on some archs). Doing this we can safely remove EXCLUDE_FROM_WORLD Fix: ERROR: meta-initramfs-image-1.0-r0 do_rootfs: Postinstall scriptlets of ['busybox', 'util-linux-umount', 'util-linux-dmesg','coreutils', 'util-linux-mount', 'cpio', 'util-linux-kill', 'util-linux-losetup'] have failed. Signed-off-by: Andrea Adami Signed-off-by: Khem Raj --- .../packagegroups/packagegroup-meta-initramfs.bb | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'meta-initramfs') diff --git a/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb b/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb index bfede5a749..2955baea2b 100644 --- a/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb +++ b/meta-initramfs/recipes-core/packagegroups/packagegroup-meta-initramfs.bb @@ -6,31 +6,13 @@ PROVIDES = "${PACKAGES}" PACKAGES = ' \ packagegroup-meta-initramfs \ packagegroup-meta-initramfs-devtools \ - packagegroup-meta-initramfs-kernel \ ' RDEPENDS_packagegroup-meta-initramfs = "\ packagegroup-meta-initramfs-devtools \ - packagegroup-meta-initramfs-kernel \ " RDEPENDS_packagegroup-meta-initramfs-devtools = "\ - libklibc dracut \ - klibc-utils-cat klibc-utils-losetup klibc-utils-readlink klibc-utils-chroot \ - klibc-utils-ls klibc-utils-reboot klibc-utils-cpio klibc-utils-minips \ - klibc-utils-resume klibc-utils-dd klibc-utils-mkdir klibc-utils-run-init \ - klibc-utils-dmesg klibc-utils-mkfifo klibc-utils-sh.shared klibc-utils-false \ - klibc-utils-mknod klibc-utils-sleep klibc-utils-fstype klibc-utils-mount \ - klibc-utils-sync klibc-utils-halt klibc-utils-mv klibc-utils-true klibc-utils-ipconfig \ - klibc-utils-nfsmount klibc-utils-umount klibc-utils-kill klibc-utils-nuke klibc-utils-uname \ - mtdinfo-klibc ubiattach-klibc ubiblock-klibc ubicrc32-klibc ubidetach-klibc \ - ubiformat-klibc ubimkvol-klibc ubinfo-klibc ubinize-klibc ubirename-klibc \ - ubirmvol-klibc ubirsvol-klibc ubiupdatevol-klibc \ + dracut \ ${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64", "grubby", "", d)} \ " - -RDEPENDS_packagegroup-meta-initramfs-kernel = "\ - kexec-klibc vmcore-dmesg-klibc \ - " - -EXCLUDE_FROM_WORLD = "1" -- cgit v1.2.3-54-g00ecf