From d7cab7329fc875fd93f359a439e0f659dec92303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 11 Sep 2025 22:05:25 +0200 Subject: [PATCH] sys-kernel/gentoo-kernel-bin: Bump to 6.12.47 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-kernel/gentoo-kernel-bin/Manifest | 5 + .../gentoo-kernel-bin-6.12.47.ebuild | 229 ++++++++++++++++++ 2 files changed, 234 insertions(+) create mode 100644 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.47.ebuild diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index bec7502e6595e..6e7b198dd7927 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -82,6 +82,10 @@ DIST gentoo-kernel-6.12.46-1.amd64.gpkg.tar 306810880 BLAKE2B c9cea0a37d5be1a76d 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.12.47-1.amd64.gpkg.tar 306790400 BLAKE2B 0e30fd2faf1d826ce1a728ec2e002ef10a8749704f91dd3bae4495e28d25ab61a520a9a78b98d92d9011a482cb0615982c926b42164ef04f13d4e1d392193ab5 SHA512 b989cba75939c1f56f3b434c3fa004ede924d52ad9f33d617de3610c562537507807a07a4f70cbd49c357d3c0beda78a313572ae93e80126d00ab492547eb4db +DIST gentoo-kernel-6.12.47-1.arm64.gpkg.tar 280064000 BLAKE2B 988628a2a88d0da877a8aef172fb165706d759232648860df835d3891841e3dc1fe4d414b5ccbea94c43c44302e224021c3a970dcd466c11a278976bc99484c9 SHA512 8562863cc2a84e3ef014004d06f4df62066f9a568c84d362ec2434a3202842cd11b3c92aeb4258379567a17bd9746e2d01172453ab568654f9b22832c97c33e1 +DIST gentoo-kernel-6.12.47-1.ppc64le.gpkg.tar 72509440 BLAKE2B dc42b1a113d725d360c94a578ef2e0ec382071a40b067b744b285c0e943576b6b717cf5010201df964bd119f8cdfd9f4909f460c6025f30aefbf653f82990b08 SHA512 82e783a0b94b6acb041a7533967cc50ebe1e9acb5cde775438516f926fa33d63fe7a0526ce6027aaad6a1b89b3bfdf08b851ff84db80523c39956e633fe11e37 +DIST gentoo-kernel-6.12.47-1.x86.gpkg.tar 77701120 BLAKE2B e87ed271b7fd338478ca00f9d9efa2601994023bd9f20267253829680ad1b27b969f1c88ea1dd5ee668754956fa3fd1c4d9996ec7676d4e0255016839695e44c SHA512 3e31616380d5cdb9d526b621761b511bb195058cfc518eac589c3da418286ff7c1c1e6ce863956288c2e9bfa47d9ece109f3e610e861c503eac379d6f08e5af7 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 @@ -194,6 +198,7 @@ DIST patch-6.12.43.xz 2759136 BLAKE2B a667414254b536de9d0158ceaf1e208241817352f2 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.12.47.xz 2896968 BLAKE2B 4064af2ae029d13d63a0a6cfb9e4121266ab33622c03e088ad3544a0f5bf443d75a2ff2f7c35b58d7cc8669acb0eac93165cd3bfe5d8567f332516850bc9f7a4 SHA512 19bb9e9e235fa408e3b37dd6fe475f1dc7690bd09274dcdcb722ccc9733da9169dbaa97dffb15e0b32da6a62cd89b2da8cad32b4d2f16f2fbbd9d023b5ebae9b 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.47.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.47.ebuild new file mode 100644 index 0000000000000..ad029b81761a6 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.47.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=20250911 + +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 +}