commit:     97ff460120c65c71311fc7ced3087ef78dce64fc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  7 17:14:53 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  7 18:12:42 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97ff4601

sys-kernel/gentoo-kernel-bin: Bump to 6.12.61

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   5 +
 .../gentoo-kernel-bin-6.12.61.ebuild               | 237 +++++++++++++++++++++
 2 files changed, 242 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 03b1175b9630..103fd4453748 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -22,6 +22,10 @@ DIST gentoo-kernel-6.12.60-1.amd64.gpkg.tar 310855680 
BLAKE2B 7d027eaf3bb7dec43e
 DIST gentoo-kernel-6.12.60-1.arm64.gpkg.tar 280780800 BLAKE2B 
b648d50d5b038549d02c73f532aaefa4b460d6e8736de402f53cf17fa2b18c51ffff87977ae52b7b893f3e3cea11c661efa4f8dd40d56f7e89bb2f931873dbb3
 SHA512 
1757da9dca6469e215e9faab1d39e61041a769fe95a05ff5b619b4c925957ad860268b79321de823d53023364557d540f64e66553e97e324393aa134a9669e71
 DIST gentoo-kernel-6.12.60-1.ppc64le.gpkg.tar 72550400 BLAKE2B 
3516f3427c487478652b46823b2b0d4ae577cdaa7e50a72ccef23bc91a42626dbbd6045e7e4bd52338953e01e83df2b7d1e98a97e3c5191073da53857980b24d
 SHA512 
8e5f68e3f7d94e70702240b1e3d5227887122ca20e2c7e5bea16436b206a36a89f60cba7847497af731881acac652543fd11e0a5aca9edf2723e6310028a9357
 DIST gentoo-kernel-6.12.60-1.x86.gpkg.tar 77701120 BLAKE2B 
8c9bbebeee8bb9f4e357b0051423f8717c48abf13264301c6399d1d74f3b0a8c845c5ca5196734ce5ed8adae282a38d67bb6dccbfc762acb3781d29921499551
 SHA512 
fd15197d2266e62f70dc07a4194f320103d549d6ddff135bef227579e0e6e1b17664f4b844674a853d1c3073b6de4cec57fa6ca2541ff3d5b87dec33c7012a9e
+DIST gentoo-kernel-6.12.61-1.amd64.gpkg.tar 310804480 BLAKE2B 
c956d3859bf4ec8ee2f15932be1dfc4d1b3d0901332cb125aa1301f10352e50c086a546e75c089e334807f1c13a8994af5e1595bcb619eef5d21d8c3c14c03b9
 SHA512 
9150da313598581587772208bc673b266e368fe72fa000e1dd22e0cbced253106371d19064eb74a46d1244c5333a78fbb6151893b853af3dee47511f040fa3e1
+DIST gentoo-kernel-6.12.61-1.arm64.gpkg.tar 280688640 BLAKE2B 
00747edfcdf53c77d527f760a3930bedcb98b1474178f700dcf9bdaec1927fccd83b94006c43a1be05e9c85f3ecfa934fcf96f55cdd4c9f9c360a4a0b6f8f328
 SHA512 
0a3dc955df1f4e3ea5a339a8302400eeb41e99f21c3c42d554f86180c9fa911cabd1a57e3f8c2f9f6386b93a7abf1f100e816a3d6bcd1b7fb7a6ff6b70a57997
+DIST gentoo-kernel-6.12.61-1.ppc64le.gpkg.tar 72458240 BLAKE2B 
1273424d19e0248f0a52f0d6ffeef84b37b5a894e0a9ea9f8761fed132f227b796a3846c81944e4e646f893d26672a6ff80cdc9348169fbbbba2cbaae5b4c1f7
 SHA512 
0ab90608491ab70f4885438489a790699768dd02141d60b012287d049ec61be4e8cfe4ee154f7c2dc2c5c08ed085ab64776dcd345c763630a56cc95f9dfaf35b
+DIST gentoo-kernel-6.12.61-1.x86.gpkg.tar 77639680 BLAKE2B 
aa3f0f70f6ca34d215b1f76893e70581c8caab8f961fcd03d5781d94d9ace69dca68067df063a0ea0be5c95df46c91814c6ecd82b5cdfa5410bbf8961d254754
 SHA512 
0f8ee52413ed7256d6406927ea92bc895ff3d0c91fc7834bed0587aac39ed792e6e1ceb73be872df66459c1fa27cfc83cfa9f9c760ba81940c45dbfda094060f
 DIST gentoo-kernel-6.17.10-1.amd64.gpkg.tar 336916480 BLAKE2B 
d9f289ab3b048ddeaf13a496e0c639861246d158725dc72bc395d91c57a236c0f393c832759278505f2e2b57a2572b96a74b7aa602b41a0d201b7351c29ae2c8
 SHA512 
07bac262288c76793fb1dd06a42aae391b59331a7cdc1934625dacfb5936b47294b0633486348bc17bd5b8c0de0a179f1f8481bd7b73292d3ccaa29a1f6a89df
 DIST gentoo-kernel-6.17.10-1.arm64.gpkg.tar 297717760 BLAKE2B 
436b6f68b96fd2381d9c8be26d7951fb1e1a32be13ca2689121926e869a27c8e67ff5f669839cfb16c9424375aae528b0a3100ec0a13b27431c15e5ee6d4fccf
 SHA512 
10d834bd486e83cab59fe795cc34e313fdab77d23694993469161bc3138e6651979182046ee2ead01d83b777e6cc3c67a865e2a70568e9ff7f3357108cb76d88
 DIST gentoo-kernel-6.17.10-1.ppc64le.gpkg.tar 75581440 BLAKE2B 
74f89f8b0b92c97ec3267c87cf2f23ee05e0aeeb4f63397832196cee86c30c7030b812e8bf9097f0ef175df4b5cfe67ef4b029fcc7bbaae756262415d3432c3d
 SHA512 
46e9d6da54ae35eac6e7501da4bd6d3b329be41dd107f266b6350178b32c4a4053d85f3662ab693e0d39ba6eb3c32348d57726e20610ba3d136db29bd940bf2f
@@ -73,6 +77,7 @@ DIST patch-6.1.158.xz 6613684 BLAKE2B 
51ff33497e42b9803545b0d848abc125dfdc439ba1
 DIST patch-6.12.58.xz 3286180 BLAKE2B 
6a96368f7c0db35442897ef811f2601c985e61d87928be77c84dd460dd935cfc0562239ab88341877535a25e84d571fd50641560b2f9b496905c1f22403af183
 SHA512 
dcbe11090c4c2020b05ad3930cad292191608b953676158255679f56075639baf666eed7421f775218d06798dbc99a9816ccf31cdaf6ab09cdc9b022527ed79c
 DIST patch-6.12.59.xz 3325064 BLAKE2B 
9bd2f598b2884592a47fc021966c3c4bf2310d3cf2ccd6c730d4f4186d51676ae7a4363a48f0a0f59bb163ae374de620a0c0a7bfe0fd016f7a5774f7c9d44e19
 SHA512 
a97bba0f85260aedba917b43be968a36e594f9d9b8fea6b6eb7d72f0349e1329f0d9b18ba46d6f183f28d0f644040e1f82f78c3f5fe22b8e15aa49f22046b01d
 DIST patch-6.12.60.xz 3340176 BLAKE2B 
4bba3b136922e2e60bc7565112938abef76e18c84729969f2868caf43bf3afaf8c20d2e600a1e2cf987551c83a233367dca6a0254cf8637cc134960ba2618a4f
 SHA512 
fdd7dce9736c87bb25b966091c133ef37bf257ffc34c1909e6809fa674b2047cba801f8b6430b3087a1569326e9d8d9b41bda914ee186f5d8d65c3df4d8f3777
+DIST patch-6.12.61.xz 3501360 BLAKE2B 
4863a9677f889e9cfb200617299e3016d24000c383300e6d6382c0e190f5eb12ec4d3523a229086ccde13c0e36b4e6bdd972bdd94d238e7cd8e2a0d4b98a09ac
 SHA512 
c13f0b5e6c5591582187b54236cf981a5214904ccbc309e94e996b048283d7f301f2ab38fc9c584ad6c2c9ec0dd94f73bb099d64c4e31514787fec975dc0818a
 DIST patch-6.17.10.xz 806232 BLAKE2B 
49252accd7f37554a2783cfa92523dad3e39f41764e0aa6b07daf312463f73abdd8a5fd83062bb90c28dfcfbc06d11a34eb746d09f08895dc2b786393a5b47f9
 SHA512 
801f3371149ebf80ee125e4264ec262fbe9b90b703a77bc56a90740bc3d00c792fcd6675a7bf26fd881939f1e2e0e1cc66518c18ec0c1091133089bb7ed5bce8
 DIST patch-6.17.11.xz 844648 BLAKE2B 
4adf688aadee196cd4afe94eb05d9e98b0e844d7ee4148c25bed76a47b1c06f665dc9587cc5f7f4f340fac1d0ebac32ee8cacdc0eca9c2850ccce670d9cb00a3
 SHA512 
dba734bb5b76ee7fb829b299f65efd9575b01a1dbf2e172a50f7d42ecdc75adfa6c99f66b2bfda68b889d6565591d2b01af5fd236abc6e2313baa9f47c7f5208
 DIST patch-6.17.9.xz 764968 BLAKE2B 
a0ce8311be7c251ad21b7cc11be4f30ec5125e3763f97a750afef855be385a3ceae24df3b65b5dd751729575aa0cd254a95cbae0f2e8cc8f95539dcfa2d9d3a1
 SHA512 
35593bc973cc7f626aa7a41cf8b7dea1b46fe8922bd57194db363d26e8854af514d103e39d02c642c26748bd933d5e402ff89d2a20d2da5f8d901e4713eafc46

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.61.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.61.ebuild
new file mode 100644
index 000000000000..06640aba20e7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.61.ebuild
@@ -0,0 +1,237 @@
+# 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.52
+BINPKG=${P/-bin}-1
+SHA256SUM_DATE=20251207
+
+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-${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"
+
+       # Override user variable with the cert used during build
+       openssl x509 \
+               -inform DER -in "${kernel_dir}/certs/signing_key.x509" \
+               -outform PEM -out "${T}/cert.pem" ||
+                       die "Failed to convert pcrpkey to PEM format"
+       export SECUREBOOT_SIGN_CERT=${T}/cert.pem
+
+       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
+}

Reply via email to