gentoo resync : 03.03.2021

1 files changed, 16 insertions, 5 deletions

diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index b8109f47d0bf..231dce2de6a4 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -58,6 +58,12 @@ RDEPEND="
 		sys-kernel/installkernel-systemd-boot
 	)
 	initramfs? ( >=sys-kernel/dracut-049-r3 )"
+# needed by objtool that is installed along with the kernel and used
+# to build external modules
+# NB: linux-mod.eclass also adds this dep but it's cleaner to have
+# it here, and resolves QA warnings: https://bugs.gentoo.org/732210
+RDEPEND+="
+	virtual/libelf"
 BDEPEND="
 	test? (
 		dev-tcltk/expect
@@ -211,9 +217,15 @@ kernel-install_test() {
 
 	local qemu_arch=$(kernel-install_get_qemu_arch)
 
+	# NB: if you pass a path that does not exist or is not a regular
+	# file/directory, dracut will silently ignore it and use the default
+	# https://github.com/dracutdevs/dracut/issues/1136
+	> "${T}"/empty-file || die
+	mkdir -p "${T}"/empty-directory || die
+
 	dracut \
-		--conf /dev/null \
-		--confdir /dev/null \
+		--conf "${T}"/empty-file \
+		--confdir "${T}"/empty-directory \
 		--no-hostonly \
 		--kmoddir "${modules}" \
 		"${T}/initrd" "${version}" || die
@@ -402,8 +414,7 @@ kernel-install_pkg_prerm() {
 
 # @FUNCTION: kernel-install_pkg_postrm
 # @DESCRIPTION:
-# No-op at the moment.  Will be used to remove obsolete kernels
-# in the future.
+# Clean up the generated initramfs from the removed kernel directory.
 kernel-install_pkg_postrm() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -411,7 +422,7 @@ kernel-install_pkg_postrm() {
 		local ver="${PV}${KV_LOCALVERSION}"
 		local image_path=$(dist-kernel_get_image_path)
 		ebegin "Removing initramfs"
-		rm -f "${EROOT}/usr/src/linux-${ver}/${image_path%/*}/initrd" &&
+		rm -f "${EROOT}/usr/src/linux-${ver}/${image_path%/*}"/initrd{,.uefi} &&
 			find "${EROOT}/usr/src/linux-${ver}" -depth -type d -empty -delete
 		eend ${?}
 	fi