From ba4938837d52c0aff763d8acdc03ce103dd3ff82 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 24 Dec 2023 13:37:40 +0000 Subject: gentoo auto-resync : 24:12:2023 - 13:37:40 --- eclass/Manifest.gz | Bin 38923 -> 38926 bytes eclass/kernel-build.eclass | 1 + eclass/kernel-install.eclass | 21 +++++++++++++++++++++ 3 files changed, 22 insertions(+) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 2b898824e425..4824529a3ec9 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index 2253f4d854d1..70eb1243fcbc 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -403,6 +403,7 @@ kernel-build_src_install() { --kmoddir "${ED}/lib/modules/${dir_ver}" --kver "${dir_ver}" --verbose + --compress="xz -9e --check=crc32" --no-hostonly --no-hostonly-cmdline --no-hostonly-i18n diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass index 919a5d11fd84..9612700a1431 100644 --- a/eclass/kernel-install.eclass +++ b/eclass/kernel-install.eclass @@ -430,6 +430,12 @@ kernel-install_test() { > "${T}"/empty-file || die mkdir -p "${T}"/empty-directory || die + local compress="gzip" + if [[ ${KERNEL_IUSE_GENERIC_UKI} ]] && use generic-uki; then + # Test with same compression method as the generic initrd + compress="xz -9e --check=crc32" + fi + dracut \ --conf "${T}"/empty-file \ --confdir "${T}"/empty-directory \ @@ -439,6 +445,7 @@ kernel-install_test() { --omit "${omit_mods[*]}" \ --nostrip \ --no-early-microcode \ + --compress="${compress}" \ "${T}/initrd" "${version}" || die kernel-install_create_qemu_image "${T}/fs.img" @@ -547,6 +554,20 @@ kernel-install_pkg_pretend() { elog " emerge --config ${CATEGORY}/${PN}:${SLOT}" fi fi + + if ! use initramfs && ! has_version "${CATEGORY}/${PN}[-initramfs]"; then + ewarn + ewarn "WARNING: The standard configuration of the Gentoo distribution" + ewarn "kernels requires an initramfs! You have disabled the initramfs" + ewarn "USE flag and as a result dracut was not pulled in as a dependency." + ewarn "Please ensure that you are either overriding the standard" + ewarn "configuration or that an alternative initramfs generation plugin" + ewarn "is installed for your installkernel implementation!" + ewarn + ewarn "This is an advanced use case, you are on your own to ensure" + ewarn "that your system is bootable!" + ewarn + fi } # @FUNCTION: kernel-install_src_test -- cgit v1.2.3