commit: 09383b63d26a2cebc0e0220d2dc591e07a97b3aa
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 6 17:05:02 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 6 17:49:36 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09383b63
sys-kernel/gentoo-kernel-bin: Bump to 6.12.36
Sync to the changes in sys-kernel/gentoo-kernel-bin -- notably using
upstream patch + Gentoo patchset. Enable verify-sig.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.12.36.ebuild | 216 +++++++++++++++++++++
2 files changed, 222 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index cb196b536316..7869236a947f 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -52,6 +52,10 @@ DIST gentoo-kernel-6.12.35-1.amd64.gpkg.tar 305459200
BLAKE2B 2420fc0ebe9558a90d
DIST gentoo-kernel-6.12.35-1.arm64.gpkg.tar 279193600 BLAKE2B
65baf787c36490f87e009f0e5fd74ec5c01a9eb511a456bfd4d02d8b3516d1c693b34624091a247a3a48cf9950243165de55299ff6bb07c9618a0c81043821dc
SHA512
9ad3086f37f01aa1f118fcc2ec8e960682c02145de464cc0897725867ef0b7aeb2b8809aa2fe5c3260a771affcf4f4f0dd967c44dd64ebcb4f8311481512559c
DIST gentoo-kernel-6.12.35-1.ppc64le.gpkg.tar 73297920 BLAKE2B
d7098bcda52754ea1755cdd1263b3c50d923c5526afc74409bf557faed1c9a839e7b8a4cd99d13e327d020ff51913d47a262ed28f7e38430f1e58e0731b77e4f
SHA512
fae4598569ea08225f407cd4abdd8a02947c151801ab0e76db88b55b58c1863e4676389c7c45fcfec41542633aea8e5faf17b719c56dfefedf6da30a0c029286
DIST gentoo-kernel-6.12.35-1.x86.gpkg.tar 77639680 BLAKE2B
029640d9f906bdd51b0d0061c250a663cd4492d96ffc292eb76eb234bd5f6bbf099587b1ce2d1580673d08779f513b068ba105d298528eda269b9de74fccc287
SHA512
ee3aea808e9fc0d70ba338d13465688ac9795abe5175ca447f651b03ad6bd10335ee3c0a930f215745ee8f04ad51dfec40f79c8ed29f25752ebe20c99035ff26
+DIST gentoo-kernel-6.12.36-1.amd64.gpkg.tar 305489920 BLAKE2B
29f532bef117311277493fea2d92952b8c447ff301e5ef9a51c378bcf762bf9c0121f63e664fc6595d7019019d23e1c4033d903d04b98afccd325450695b5d9f
SHA512
635632ab851183054c87489611bba8c0310b6a4d62711985957709bdbdbc58ce7f0213f3cb20dbe88434b2909f2727138f4c4837fe288165258dcd3aac23f25c
+DIST gentoo-kernel-6.12.36-1.arm64.gpkg.tar 279275520 BLAKE2B
68eb04c1c7ae6ddcdd2e5562e5b3f136afc0bb3c9f806546799937318f150795a314ce540b84647b669c27b57380620c74fb6481e51d5cf3a572f184059163c3
SHA512
2a2cf4caf3035b74108cd9861edc05edc0bc1c9674afc1af4229870b50f0398d3ed3b06ec9de769e854727d91d23ad9f89e95ab04a450128a3675a41cf18bafa
+DIST gentoo-kernel-6.12.36-1.ppc64le.gpkg.tar 73308160 BLAKE2B
36cf4d36f6c77e623fd5d0d20f7056f3782de7c0d8d601a31b7a130a4f0196899963afcd6e06c2830f9f73d725ce508a77b6a58ac3fa512ddf2a92c2160e485d
SHA512
0c8766c21ef73a2367e177e67ec70c848b68403645b83776f451b307e256c3070098cdbf8c1efea6f335ba94e30a5e302c4069c8efd65e1c8f2b35cf994e4656
+DIST gentoo-kernel-6.12.36-1.x86.gpkg.tar 77619200 BLAKE2B
b7dd0e8fc41ee13026e4b86ebc9c523360572ddbbc98ef9d99d4eb86a1f09e8631afa007514ecc4e18dc299e9c1845bc6be217589fc2ce5d3e7bda10b79eb2f0
SHA512
115d8df750ff7a57d252fc5dc565d467978f3d076754a84a66b33b568e92e6179080d0bd35bea25b617bafec1325868cbb6d7fbae96efd83e14daecc8e5222ba
DIST gentoo-kernel-6.15.4-1.amd64.gpkg.tar 326184960 BLAKE2B
5108215e610e0233a6de4fb05e6c531346cba141b25ae1a4663ccc0d697e4fb6435bb31a676cc9740c4a20fc2e283d9d3aff8f1dead1882077a7ae19c4afa851
SHA512
885152105aeaef86ae36a1979c869c288e062f41dc6b0c3e83111f8dc66cb4337922ab51043dde0d3136a6588d8edc941392795a45f6c0ac9fc597d8ec96b259
DIST gentoo-kernel-6.15.4-1.arm64.gpkg.tar 289341440 BLAKE2B
70cfc5ba7e94c9c6cf254b2276f60636c77b322fc54296feadc6d71d56b555e452c74bda73f66fefc03d35575be20ec539e5585153c608e551f60c1e3b1560ea
SHA512
2a95afe61f6be7ba56f6b01f3404230f8d494843c1c9bd987b791848c524dbf85d23d810ae88f82f83bfc8494a1e1f06a3ccf75da89127ba340cabefa527186e
DIST gentoo-kernel-6.15.4-1.ppc64le.gpkg.tar 75223040 BLAKE2B
2453f2bc22b1094d2d22141a12461ba97625db960040d371cbed7997def92c50df4f65796f3640711be0b5ff673bdad2e6a5f3152cdd2cdd523ebe1d9f91c63f
SHA512
2cebdd9e12e8ca6c77eaa57ca09f32728f2c6ce3a5be09a9eda3e3f953c44861552fed6ccdeda1611b1ed033bff09df77d894ac0c04c9196b4b5f9f2bb95d131
@@ -75,5 +79,7 @@ DIST linux-6.12.tar.xz 147906904 BLAKE2B
b2ec2fc69218cacabbbe49f78384a5d259ca581
DIST linux-6.15.tar.xz 151168812 BLAKE2B
465596c6dc053ff3a3966302a906d3edb4f7ee1ef82f8c20b96360196d3414f5b1deeafa67b8340fcdecd3617280ba9b756d7073ad15c707865e256397b4af53
SHA512
d03788ffa8d8ae1b84ef1286bb44a08fc01432e509dfec6cccae5c5a5a47201d378aec2bcd21e6f0bbd1e625b26f47780c06ee9c1cef3775358f98b160923f30
DIST linux-6.6.tar.xz 140064536 BLAKE2B
5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2
SHA512
458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
DIST linux-6.x-sha256sums-20250706.asc 154698 BLAKE2B
8c9f6fce58842bff04a7e67bfa4c526aa4f96e330eb1f340eb4a27255c7c3755143c3bde4b4d4e1a62a73c750bd940ef69902c0da37c8a0a308843bc978dc06d
SHA512
4798b646ed4982fb2024f06f346cf0eed66c94dd1ca1972171101b6848a476b85b9deb5937421b643fc760171a246e348b5fb0809317be82f849be4db81fa8eb
+DIST linux-gentoo-patches-6.12.36.tar.xz 17848 BLAKE2B
b1257367ba4d02ef5f1bce8846368badd80e27f3eef8bd0c6f906478e0316b29be4b0b8ecafc550cffa82fef78c656672faf74682edb8d6ef92e80ac5e0d8c20
SHA512
c84797f87077964699edb5b7e34682b99d6fa4278d177385a6d78f7de409ec46eeaf40917443003f7bf5453fbfe608e28cbb05553c27656a0267e6421988790c
DIST linux-gentoo-patches-6.15.5.tar.xz 83692 BLAKE2B
0b0831734f25b00a3523592439625342d12b0361b56e4d8243f94c045a27eeedbc02086032f01240d26807721d55d8a4011513b5610d1bf4889e35b7ac171afb
SHA512
876750fbfb36f75ddb69026563a2d43310e116c567491a5428da30383a38d9384b97455c7ea61a1faa949b44dd22f402262c63a3701568ef3f8ab2d5f67f6c0f
+DIST patch-6.12.36.xz 2388056 BLAKE2B
9912220c0126fda1c35446d57376ccca45f12dc894a277feccd181e7bf59cdcdf88e6c5c9276c0e4e7f54cadd17b155a3b1aa77f084a58e1043da9d57b768498
SHA512
4e469962c9516d7614816d9905895b1d249942a77d800506dba2ef0bb5dd56123e72e5e08a2b8396ece9d672b3a16a52b9d8e3af370c631197f0ed85d5d8675f
DIST patch-6.15.5.xz 538604 BLAKE2B
3771e14cb95010a9e553191af6888fa26dd5f1084c16a1df3aad97ed2a03de97cf1af8562a1b7c0d1977dfba1f3973e03079278b72943ac104c4208e1eeed315
SHA512
ff35f126fc24cd9fc2ba7dafb10e2c4dc4643a2165893d6dd07ce0ab49bf33d4b67ab33b32875b74371749b5e6f93a061114c9837bdb48203d50b5ec55db5a65
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.36.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.36.ebuild
new file mode 100644
index 000000000000..8bcdb837287d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.36.ebuild
@@ -0,0 +1,216 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_EFI_ZBOOT=1
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_SECUREBOOT=1
+
+inherit kernel-install toolchain-funcs unpacker verify-sig
+
+MY_P=linux-${PV%.*}
+PATCHSET=linux-gentoo-patches-${PV}
+BINPKG=${PF/-bin}-1
+SHA256SUM_DATE=20250706
+
+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/${MY_P}.tar.xz
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/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'
+KPV=${PV}${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 "${MY_P}.tar.xz patch-${PV}.xz"
+ cd "${WORKDIR}" || die
+ fi
+
+ unpacker
+}
+
+src_prepare() {
+ cd "${MY_P}" || die
+ default
+ eapply "${WORKDIR}/patch-${PV}"
+
+ local patch
+ 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
+}
+
+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-${KPV}"
+ 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 "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+ local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+ kernel-install_test "${KPV}" \
+ "${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+ "${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+ local rel_kernel_dir=/usr/src/linux-${KPV}
+ 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
+}
