diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-11-18 11:02:30 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-18 11:02:30 +0000 |
| commit | ce89e807ecd2194613ad6e6bcee8cf95e982ad1a (patch) | |
| tree | 5664e77b09dcdec8263e4a0ebbf87da3e1524e87 /eclass | |
| parent | 7e6812aaf62d1be61aaa50252c7e868fc9eabf4c (diff) | |
gentoo auto-resync : 18:11:2023 - 11:02:29
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 38794 -> 38791 bytes | |||
| -rw-r--r-- | eclass/dist-kernel-utils.eclass | 4 | ||||
| -rw-r--r-- | eclass/kernel-install.eclass | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex a50f18b8385e..3dd3f9b96bb3 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass index d455c88ebee1..76a2f8d48cdf 100644 --- a/eclass/dist-kernel-utils.eclass +++ b/eclass/dist-kernel-utils.eclass @@ -33,6 +33,8 @@ case ${EAPI} in *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac +inherit toolchain-funcs + if [[ ${KERNEL_IUSE_SECUREBOOT} ]]; then inherit secureboot fi @@ -135,7 +137,7 @@ dist-kernel_install_kernel() { ebegin "Installing the kernel via installkernel" # note: .config is taken relatively to System.map; # initrd relatively to bzImage - installkernel "${version}" "${image}" "${map}" + ARCH=$(tc-arch-kernel) installkernel "${version}" "${image}" "${map}" eend ${?} || die -n "Installing the kernel failed" } diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass index ea6ba3569a17..a0eceae8280b 100644 --- a/eclass/kernel-install.eclass +++ b/eclass/kernel-install.eclass @@ -510,7 +510,7 @@ kernel-install_pkg_postrm() { local kernel_dir=${EROOT}/usr/src/linux-${dir_ver} local image_path=$(dist-kernel_get_image_path) ebegin "Removing initramfs" - rm -f "${kernel_dir}/${image_path%/*}"/initrd{,.uefi} && + rm -f "${kernel_dir}/${image_path%/*}"/{initrd,uki.efi} && find "${kernel_dir}" -depth -type d -empty -delete eend ${?} fi |