diff options
Diffstat (limited to 'eclass/kernel-install.eclass')
| -rw-r--r-- | eclass/kernel-install.eclass | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass index b4c3d5fe7b4d..5a5b833cdd7b 100644 --- a/eclass/kernel-install.eclass +++ b/eclass/kernel-install.eclass @@ -63,16 +63,15 @@ RESTRICT+=" _IDEPEND_BASE=" !initramfs? ( || ( - sys-kernel/installkernel-gentoo - sys-kernel/installkernel-systemd + >=sys-kernel/installkernel-gentoo-8 + >=sys-kernel/installkernel-systemd-2-r5 ) ) initramfs? ( >=sys-kernel/dracut-059-r4 || ( - <=sys-kernel/installkernel-gentoo-7 >=sys-kernel/installkernel-gentoo-8[dracut(-)] - sys-kernel/installkernel-systemd + >=sys-kernel/installkernel-systemd-2-r5 ) ) " @@ -543,14 +542,11 @@ kernel-install_pkg_pretend() { ewarn "for your hardware to work. If in doubt, it is recommended" ewarn "to pause or abort the build process and install it before" ewarn "resuming." - - if use initramfs; then - elog - elog "If you decide to install linux-firmware later, you can rebuild" - elog "the initramfs via issuing a command equivalent to:" - elog - elog " emerge --config ${CATEGORY}/${PN}:${SLOT}" - fi + elog + elog "If you decide to install linux-firmware later, you can rebuild" + elog "the initramfs via issuing a command equivalent to:" + elog + elog " emerge --config ${CATEGORY}/${PN}:${SLOT}" fi if ! use initramfs && ! has_version "${CATEGORY}/${PN}[-initramfs]"; then @@ -633,13 +629,9 @@ kernel-install_extract_from_uki() { # @FUNCTION: kernel-install_install_all # @USAGE: <ver> # @DESCRIPTION: -# Build an initramfs for the kernel if required and install the kernel. -# This is called from pkg_postinst() and pkg_config(). <ver> is the -# full kernel version. -# -# With sys-kernel/installkernel-systemd, or version 8 or greater of -# sys-kernel/installkernel-gentoo, the generation of the initrd via dracut -# is handled by kernel-install instead. +# Install the kernel, initramfs/uki generation is optionally handled by +# installkernel. This is called from pkg_postinst() and pkg_config(). +# <ver> is the full kernel version. kernel-install_install_all() { debug-print-function ${FUNCNAME} "${@}" @@ -673,13 +665,6 @@ kernel-install_install_all() { while :; do nonfatal mount-boot_check_status || break - if use initramfs && has_version "<=sys-kernel/installkernel-gentoo-7"; then - # putting it alongside kernel image as 'initrd' makes - # kernel-install happier - nonfatal dist-kernel_build_initramfs \ - "${image_dir}/initrd" "${module_ver}" || break - fi - nonfatal dist-kernel_install_kernel "${module_ver}" \ "${image_path}" "${kernel_dir}/System.map" || break @@ -743,7 +728,7 @@ kernel-install_pkg_prerm() { kernel-install_pkg_postrm() { debug-print-function ${FUNCNAME} "${@}" - if [[ -z ${ROOT} && ! ${KERNEL_IUSE_GENERIC_UKI} ]] && use initramfs; then + if [[ -z ${ROOT} && ! ${KERNEL_IUSE_GENERIC_UKI} ]]; then local dir_ver=${PV}${KV_LOCALVERSION} local kernel_dir=${EROOT}/usr/src/linux-${dir_ver} local image_path=$(dist-kernel_get_image_path) |