From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 238C81581FD for ; Tue, 09 Sep 2025 20:19:06 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id E20A8340FF8 for ; Tue, 09 Sep 2025 20:19:05 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 89643110579; Tue, 09 Sep 2025 20:18:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 80BCD110579 for ; Tue, 09 Sep 2025 20:18:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2EAE2340EF8 for ; Tue, 09 Sep 2025 20:18:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D22A0396B for ; Tue, 09 Sep 2025 20:18:45 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1757449118.71ef04cd8812ed08e5ab18bc6ff5114ac4699a04.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/gentoo-kernel-bin/Manifest sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.46.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 71ef04cd8812ed08e5ab18bc6ff5114ac4699a04 X-VCS-Branch: master Date: Tue, 09 Sep 2025 20:18:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 00b653db-f718-4fa7-b9b5-a7c052b8408f X-Archives-Hash: efbc401d0006c025b71731ddeaadbabf commit: 71ef04cd8812ed08e5ab18bc6ff5114ac4699a04 Author: Michał Górny gentoo org> AuthorDate: Tue Sep 9 20:03:46 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Sep 9 20:18:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71ef04cd sys-kernel/gentoo-kernel-bin: Bump to 6.12.46 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.12.46.ebuild | 229 +++++++++++++++++++++ 2 files changed, 235 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 0853f20d1902..7febf6cec5fb 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -66,6 +66,10 @@ DIST gentoo-kernel-6.12.45_p1-1.amd64.gpkg.tar 306780160 BLAKE2B 64b8283064b408a DIST gentoo-kernel-6.12.45_p1-1.arm64.gpkg.tar 279992320 BLAKE2B aaa807c2077973c42a2fb77dd48b57280cc0ebc0ecb47f0bd4612b7dbd5cc979100c0247f5e058f9167c22f3a8a9345d408ca13eb8abfe4281ac4a2cfd1fdfac SHA512 72518f217d71d61d00a9c5a821df9e5214a261c27eb23a94809ce7091bc999a302a5ae0a305f5df6be002b5a6d2cfcf8f6567aba335b27b649d847cc92eec6b3 DIST gentoo-kernel-6.12.45_p1-1.ppc64le.gpkg.tar 72499200 BLAKE2B 514ae93f238cd89a3bb8d2768720198764a2f26be7567413fb3d22f8e5b507e00353065e43bde898524fdb5f198e6a4d9ed22aeb4e88a4c1b65fc60e376f45af SHA512 329230a91e6a5fbc583f44447f4da1a10fdcbee0f26dc2c398f827a2f5f8c5dae6fcb3038c70324f6e07e59b1cdc9a7f12f96d06532ac47375b4bb0a2b5331d1 DIST gentoo-kernel-6.12.45_p1-1.x86.gpkg.tar 77690880 BLAKE2B 9ad75c1189ae8a413aff9e4a6eedd4040c2e01e7001cadc73d4014ff648408eb9374653d48cd53f04a3534e2db28a98272bec4cbfe25d41268ea1981c7936cd6 SHA512 c6de45bbcabb41ef6c1c93f18eaaaf875eccdf38bdf1861c2e3d1e8b8085c466b78b2ca930d1a5c5c476bd339c7286c3286ddc1c3118c9f9a63539d1e4f9b240 +DIST gentoo-kernel-6.12.46-1.amd64.gpkg.tar 306810880 BLAKE2B c9cea0a37d5be1a76d4c45cc31b340969bf014be94b44fcb9fb2bcaf4e893c4a0d865e0d78f78481b0e6737da28322844579784623c5ec7bc145744a9631245b SHA512 d6512492cff9b5ed153d34cd4a50a4ba7fb87d924509cbeb46e4d2a5361694b827b3e26ad0457dafe93bbe453a69d3431919e105c6186aabc7a02e391da93992 +DIST gentoo-kernel-6.12.46-1.arm64.gpkg.tar 280115200 BLAKE2B f15bdb731a907eb5a537142abf2148041afe562967ff46f43db05a68a93841941e9d6305b363becc65a98897377b941db9b00a5daa6502c0f2fbd179d67f558c SHA512 6b8f554c76ffc536952bcdf360954a45fbed6f674a591a5479db975c062077bf5ea4b66d4bf5a2b1e79fbbe969f3df1bf13ae9b24f1d998e57e092b52049e926 +DIST gentoo-kernel-6.12.46-1.ppc64le.gpkg.tar 72509440 BLAKE2B 4d397ca0bdfac4f93bcb78c77664f58c4edacaef58958a3dad27a84b4d7cc03d90d40737b54bd5ca41634554f9e8668229e98daf953685456a542df889f214f8 SHA512 2372af4954bce16358d13499db574a3e13e68ebb2bd37771f1c6d2d4cde812c0569e7690b8bb96c9ca10562446efe2bbdb1d4cb8f64e527b40bb942bb6a54dd8 +DIST gentoo-kernel-6.12.46-1.x86.gpkg.tar 77680640 BLAKE2B 4dc63b40925ba4d796bed3a6108884c4c250248f80545e3307a4ba4167024f758e96a8d92265c6d935ff463bfae7f1639afe56b68baad7441282e4069988a46e SHA512 836f7b13957ee0f245decfa6dcf52eafa7e175727bc1af1a1ecaca236a842eb3f7c88769386238204a0688b3e824b4e8b5a237a9ae86fa41a133c4985023fc81 DIST gentoo-kernel-6.16.3-1.amd64.gpkg.tar 329349120 BLAKE2B 12ca116389652a72219a44ae55142a9767e91a0f1704b7dd2792362a5213f67359dcb66b630de19932c891ff506ede136f55d514d9fdbf86fe37bbcfb6d81f22 SHA512 16c47e8aa8ce02b43269a8728d03ee7073ab0d7d752b80b1872ced99162c73c5c27e1111f13d262c47cffac202a22c5296ffd2e6f2bd2cbb5a539fafda89711e DIST gentoo-kernel-6.16.3-1.arm64.gpkg.tar 292956160 BLAKE2B 3ce78fb3836f8f308b786e4cb44679f7beabfe3ace1a0cc0a5fa559bd90e3136d47297243dbf690af6552eaaf2624b7a9aa30cb5fef25598c342aac08333a8e1 SHA512 8e5c7f51def357e08b8fc168358ed2b691e682159a094a2ccd53ce4b841872348c38616b60c0e0d1bff2f438910689021086784d072353875f2e9b614ad31d4f DIST gentoo-kernel-6.16.3-1.ppc64le.gpkg.tar 76072960 BLAKE2B 5acd689cd7145f8e946d3bd7db602c77ef4f8109fd7f058cb06ea560333715c80dbe404e15b3c280eaee7f4728ef8c9d1516e2232cd6c6268ae7ac8f43b089b2 SHA512 8003de48f321c01e21053c2572271f18620ef6b238eb87ba05a0733d0e1baa4eada82e7885a69bb068bfdd74cc161481bf97f7372f636cc543da40ae18bf3872 @@ -138,6 +142,7 @@ DIST linux-gentoo-patches-6.12.43.tar.xz 20956 BLAKE2B 29333fc247ce5a1cc75ff70a2 DIST linux-gentoo-patches-6.12.44.tar.xz 22180 BLAKE2B 97b49825846827d29ca2bb313de8983f3dc3e18cf576a9b5bd5869bc38ebc42c8b61aeb7b6cf068aab918a58b48f024163ee6f3da448a4edbbbb37074a5b1397 SHA512 74292ae4f88746be65096a8c7025577b0d4920751d94f88417429e9aae91247e3aff7ce62b17b62503df8bb501a74c8f4e20c5c7ca5f4314549f21d977c97f44 DIST linux-gentoo-patches-6.12.45.tar.xz 21680 BLAKE2B 4f45815da949c681b4768665629342011910bd949309d643a1e225a035ca2a5d5a90e0ab9133a482f41018e9fbb10b33f145f8039cddbeaf5ba0aa293c6a32b8 SHA512 84f9d56e49ede8cadda0142f9ae23e7cf6b8fab4fdf47ce258d43d99537100c6d1c376a8f15482403b76054cf8d9f86dec126cd0edfd1bbbb0073f58af3b16c6 DIST linux-gentoo-patches-6.12.45_p1.tar.xz 21996 BLAKE2B d0fa141b468267f77d3b0fb331c719277e754390edf343e6687c110a6332b575779d3214b77632c2ba368d254e2063e5c8f4505f1a594aff5041b7074d11a6b5 SHA512 cbe1035826a8f79259295594019c98c275dbbd774c815cd65165ca1d83dfa49e8a35ae568cdd5ff29d19c0e25570c066b5ee7c35221f5fd3e05b8e59896f0005 +DIST linux-gentoo-patches-6.12.46.tar.xz 19724 BLAKE2B edf0bc009a30dcf5d22c517bdfbab4ab7e4df3510e2102071fd24788d5cfc610434da2e92092ca5424e12e1676149b510f2de7e937be1ed96d0db4e2260ad42f SHA512 dd9d7c48767f3db0a8a6a33e8ffa9ecad4345044586d76de65d42e8985ef794bf7ab547852a1653bc1d66dbf4accdfc06cd5e35265cd2d2cccb0aafde21d8950 DIST linux-gentoo-patches-6.16.2.tar.xz 85676 BLAKE2B 31adfc6ebdfe2412c1576734351a6ff5bc0c1cae86e87f3cfbf555d07e8441c64bd0e31f3760674e931a510a9401935dee46689eeff6f5ee5c28029a889a40cf SHA512 aa74585b4c71202176c851cc2b08569a752da58f5a43c5b1fb3dfd59db8ff016907985d448c51f4163b951a5bc500b81eca647e1b6a7c20ab7287292d4c2a3b8 DIST linux-gentoo-patches-6.16.3.tar.xz 90080 BLAKE2B 0fdafabbaf6ebcbb997debdc17b5baec5a7e3154902a9093891e5d839540c55ddcba94ba34af11bbc374badcff67d1e47999bc998e5b21168eb92b332438ea01 SHA512 83de7cefae3d9ad9d47ae49db4a8328725b7b44fbd4e854dfad2a33917eace57958e9e25d275c83a5d026c2391b529015ac840e2fa3f3cf13733e570349d25e0 DIST linux-gentoo-patches-6.16.4.tar.xz 89184 BLAKE2B 57ee7fcbbc519ff327162163b81f910ff90216b19b066acf7c873f69afdcba99f9d38be7c8998522b3870376441d8b3be5c9de7a12f8464bbaf597e18162a966 SHA512 b4c02d84b7023359e0f378459c31a6b0984d743a9415f667824295292f448aae185665c39537ca9fb8bbff3473956dd90419bbf42dce0b9eb3bdd1fa9465a7c5 @@ -161,6 +166,7 @@ DIST patch-6.12.42.xz 2666304 BLAKE2B 7e8cfcb30f98202d7cf9e152be9ff31bb013b358f1 DIST patch-6.12.43.xz 2759136 BLAKE2B a667414254b536de9d0158ceaf1e208241817352f237f914b2e6cb60091fa4db962d1d78b28d7131ffe967c293a06c97a056858b72d7710737d2c7f9fe1505a4 SHA512 44112176409936afbcd29690d4e097dc5a30052b9b6e8d91b293b51bcb5caca5e6f8fe998d3fd3bc9ed8f6ea36bcea05699a82a0bdd7f88e4a9a3907b6ae1d59 DIST patch-6.12.44.xz 2834532 BLAKE2B 812cb9e1a980a0ababa1a8a89e86798674c9fbfac401b1551b59d50f7df949c9ab24014b2d3e06b49f38b8da7af0df7fec112ef5b0765504d646c07bb7cfbede SHA512 ac82bd5ceb75e6e0bccad3faf9f07c2a11415552efb5db40a65b50347974cb39bc4fd9f43afe3f3a5ac475bfcc767735d9e9eebc1def441b6d887269b23b94ec DIST patch-6.12.45.xz 2853180 BLAKE2B 3d07c28085584c1e684680cf59b023293a604dd5e227f01ff02a5bb9026ddc8280701edf6f77b712792a24c5f4b93eae86dcbc8fff53a86496fd307e6f25739f SHA512 1822808c6480bc506b0ea92f1e69ad1e1f2ed7c44865780db20327b6bf629150336a450f6c32fc05256e5d44de6a7430e6f14bbd8afc70e20ff3a871c7a0fb91 +DIST patch-6.12.46.xz 2894304 BLAKE2B 4486d5ed39245d6ff97057f855ee30cb403c2e9321619b834cfb5b829d5446d150cc717c8769bf2cca793abc95f32eba0c4c2a8d2abe0df5c9033fbec1fe2de2 SHA512 1b6faebd78e4b062dca101796ada82a3f9d8697d0d0da1b7826ca377e5467f41c4f19ef5941ed4274e431736a89e7723a7c194e05180c755801385cea8d4a04f DIST patch-6.16.3.xz 404136 BLAKE2B 3b33459a827feb8c31bdc5ef80e0a16d80c8555c8f6482aee2d4965cdf4072f172704498ff9bbc29a20a71400338a001e0fc23ed53691164012120c9200e32ef SHA512 b4ca71e98add9b84a0f3aad3fdc994d225bf051d033290ebbfde208eb8044d5904278871863a3ffe927b6f2b45a82284dfb036b0198bc8d120530a64b4b6844d DIST patch-6.16.4.xz 541776 BLAKE2B f343d8d03d5b09e06fbf906df7ac6175726c5cef8f2b9db2f31f509785d5d6e2a4d6b5573e8f6cce818e08e6a21da19320e2af3b43207fbd549a738ac2455f33 SHA512 b71b17fdc8f25e4e4e05b364c31a66502a3e00e6e3d66808f9726098f1f2e315e3666aa69c6f164a6cf8f1c2c4359fcd620b0dd624a98d007da4bd34310b03f1 DIST patch-6.16.5.xz 593096 BLAKE2B d31bf76e05249e8414b1df045eff96015b6b47b38aa36745fdca1ea3f5f2c6d552cb1a7eb9d57c3234d3ec069333cab5e0b87619232fc850881188c8f0f48465 SHA512 d146208501727047695524cd1e5d6c4b4e008e1d9e354ff49460b972a6dd187f7ce4a6891a7856b4bc31ead63299523253d8b03c6134c4a09373decee74a7e66 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.46.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.46.ebuild new file mode 100644 index 000000000000..7574b97e8828 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.46.ebuild @@ -0,0 +1,229 @@ +# Copyright 2020-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_MODULES_SIGN=1 + +inherit kernel-install toolchain-funcs unpacker verify-sig + +BASE_P=linux-${PV%.*} +PATCH_PV=${PV%_p*} +PATCHSET=linux-gentoo-patches-6.12.46 +BINPKG=${P/-bin}-1 +SHA256SUM_DATE=20250909 + +DESCRIPTION="Pre-built Linux kernel with Gentoo patches" +HOMEPAGE=" + https://wiki.gentoo.org/wiki/Project:Distribution_Kernel + https://www.kernel.org/ +" +SRC_URI+=" + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz + https://dev.gentoo.org/~mgorny/dist/linux/${PATCHSET}.tar.xz + verify-sig? ( + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc + -> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc + ) + amd64? ( + https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar + -> ${BINPKG}.amd64.gpkg.tar + ) + arm64? ( + https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar + -> ${BINPKG}.arm64.gpkg.tar + ) + ppc64? ( + https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar + -> ${BINPKG}.ppc64le.gpkg.tar + ) + x86? ( + https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar + -> ${BINPKG}.x86.gpkg.tar + ) +" +S=${WORKDIR} + +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="debug" + +RDEPEND=" + !sys-kernel/gentoo-kernel:${SLOT} +" +PDEPEND=" + >=virtual/dist-kernel-${PATCH_PV} +" +BDEPEND=" + app-alternatives/bc + app-alternatives/lex + dev-util/pahole + virtual/libelf + app-alternatives/yacc + amd64? ( app-crypt/sbsigntools ) + arm64? ( app-crypt/sbsigntools ) + verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 ) +" + +KV_LOCALVERSION='-gentoo-dist' +KV_FULL=${PV/_p/-p}${KV_LOCALVERSION} + +QA_PREBUILT='*' + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc + +src_unpack() { + if use verify-sig; then + cd "${DISTDIR}" || die + verify-sig_verify_signed_checksums \ + "linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \ + sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz" + cd "${WORKDIR}" || die + fi + + unpacker +} + +src_prepare() { + local patch + cd "${BASE_P}" || die + eapply "${WORKDIR}/patch-${PATCH_PV}" + for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do + eapply "${patch}" + # non-experimental patches always finish with Gentoo Kconfig + # we built -bins without them + if [[ ${patch} == *Add-Gentoo-Linux-support-config-settings* ]] + then + break + fi + done + + default + + # add Gentoo patchset version + local extraversion=${PV#${PATCH_PV}} + sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die +} + +src_configure() { + # force ld.bfd if we can find it easily + local HOSTLD="$(tc-getBUILD_LD)" + if type -P "${HOSTLD}.bfd" &>/dev/null; then + HOSTLD+=.bfd + fi + local LD="$(tc-getLD)" + if type -P "${LD}.bfd" &>/dev/null; then + LD+=.bfd + fi + tc-export_build_env + local makeargs=( + V=1 + WERROR=0 + + HOSTCC="$(tc-getBUILD_CC)" + HOSTCXX="$(tc-getBUILD_CXX)" + HOSTLD="${HOSTLD}" + HOSTAR="$(tc-getBUILD_AR)" + HOSTCFLAGS="${BUILD_CFLAGS}" + HOSTLDFLAGS="${BUILD_LDFLAGS}" + + CROSS_COMPILE=${CHOST}- + AS="$(tc-getAS)" + CC="$(tc-getCC)" + LD="${LD}" + AR="$(tc-getAR)" + NM="$(tc-getNM)" + STRIP="$(tc-getSTRIP)" + OBJCOPY="$(tc-getOBJCOPY)" + OBJDUMP="$(tc-getOBJDUMP)" + READELF="$(tc-getREADELF)" + + # we need to pass it to override colliding Gentoo envvar + ARCH="$(tc-arch-kernel)" + + O="${WORKDIR}"/modprep + ) + + local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + elif use arm64 && use generic-uki; then + die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build" + fi + + local image="${kernel_dir}/$(dist-kernel_get_image_path)" + local uki="${image%/*}/uki.efi" + if [[ -s ${uki} ]]; then + # We need to extract the plain image for the test phase + # and USE=-generic-uki. + kernel-install_extract_from_uki linux "${uki}" "${image}" + fi + + mkdir modprep || die + cp "${kernel_dir}/.config" modprep/ || die + emake -C "${BASE_P}" "${makeargs[@]}" modules_prepare +} + +src_test() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}" + kernel-install_test "${KV_FULL}" \ + "${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \ + "${BINPKG}/image/lib/modules/${KV_FULL}" +} + +src_install() { + local rel_kernel_dir=/usr/src/linux-${KV_FULL} + local kernel_dir="${BINPKG}/image${rel_kernel_dir}" + local image="${kernel_dir}/$(dist-kernel_get_image_path)" + local uki="${image%/*}/uki.efi" + if [[ -s ${uki} ]]; then + # Keep the kernel image type we don't want out of install tree + # Replace back with placeholder + if use generic-uki; then + > "${image}" || die + else + > "${uki}" || die + fi + fi + + # Overwrite the identifier in the prebuilt package + echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die + + mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die + + # FIXME: requires proper mount-boot + if [[ -d ${BINPKG}/image/boot/dtbs ]]; then + mv "${BINPKG}"/image/boot "${ED}"/ || die + fi + + # strip out-of-source build stuffs from modprep + # and then copy built files + find modprep -type f '(' \ + -name Makefile -o \ + -name '*.[ao]' -o \ + '(' -name '.*' -a -not -name '.config' ')' \ + ')' -delete || die + rm modprep/source || die + cp -p -R modprep/. "${ED}${rel_kernel_dir}"/ || die + + # Update timestamps on all modules to ensure cleanup works correctly + # when switching USE=modules-compress. + find "${ED}/lib" -name '*.ko' -exec touch {} + || die + + # Modules were already stripped before signing + dostrip -x /lib/modules + kernel-install_compress_modules + + # Mirror the logic from kernel-build_src_install, for architectures + # where USE=debug is used. + if use ppc64; then + dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)" + elif use debug && { use amd64 || use arm64; }; then + dostrip -x "${rel_kernel_dir}/vmlinux" + dostrip -x "${rel_kernel_dir}/vmlinux.ctfa" + fi +}