commit:     ec64920db1eaee64a5d86f24527261047bb2a3b6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 25 18:32:33 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 18:34:41 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec64920d

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.12.25.ebuild               | 184 +++++++++++++++++++++
 2 files changed, 190 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index f0d894ed47fc..b09d015d4644 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-6.12-27.base.tar.xz 1638184 BLAKE2B 
9a0597a4a2d2a8ed3233216e2c92
 DIST genpatches-6.12-27.extras.tar.xz 4056 BLAKE2B 
11700c29ff308a39c89ea581f7523e90e4041f64607f2db8bc98a3652a34456dd6e32fe821d0e4f2639d390eaa06d4db61fa8526a719948626fce6bd1667885a
 SHA512 
badf2c1beddc71da479d507c211a6fe4ecbb03caa511f2be013b319d0c27b63f8dfcc79ea2a4aa9960c0cb25caf9a8a126980c078bb4c862c37787b9c9eccae0
 DIST genpatches-6.12-28.base.tar.xz 1749152 BLAKE2B 
2a454052384b5e03757221a8207308d156b253f7a04d28d9279c354e1d83cd0d9526def4ac474790ea50300cfa04050d4e9b062427e1c320db4962c73717df62
 SHA512 
d25962b2dc938ac534ac95fc064c08977ec8882e6c9fe1d14a55a1f36f06612feb5bf082a380c1a96e58eb1e29cc017bf71a148188e1e937d45ebc23a1f985f6
 DIST genpatches-6.12-28.extras.tar.xz 4056 BLAKE2B 
1a468f5acc34bd688a26e3a24d9dcc39099014bb8bf0674b491c02f0cbc60b70ce8956c53577dad309823fe957067caa81480b623e0d8b8a17069f73c6fda272
 SHA512 
c7e64882aa38916b4017632d676e2a8885093840c40221e400cc61666d82258658558e6e59bc7eb0d90ae93bb88ccaf015233cd7f28c3796fed09b6ac89363cb
+DIST genpatches-6.12-29.base.tar.xz 1803156 BLAKE2B 
5db87d06800e230ab09e6f085126163fb4c3ad98b4261c988563436c9e5ab9c3783152c135ddec11012c3e6f1f9922782e9355416424af47074af5b352e3463e
 SHA512 
4a98527730e096a1eea0d16faf88604d0db359b1ded00cab1417e4b6e2ba4f2fd9ef1a1739480895720ef63d80b753dd8752cc81592949d24e3dc678e4b6ea95
+DIST genpatches-6.12-29.extras.tar.xz 4052 BLAKE2B 
f65d1d41d35679a525c1b92f26194c48dc757abb18b37793b69d5b5a49f312be091682f19ade2215319f4f45e46517e2e1fd54090df5c405f962d8cb228aa689
 SHA512 
7f81c3da7d277c141b00a0e39840dbfaa6348ce45d87cf35ec94997958fa2cc0b8341352b90cb7accd2b3b216e85b8d756f7c13471686afca6acc7d12a5164e2
 DIST genpatches-6.13-11.base.tar.xz 696060 BLAKE2B 
1d90850c681688f299e6d66c6ab2a9f3d9a45ec516d2b727adb9dd7c71d33c452303190e2e0e3b2e5bbd779b1be22683d70e53e84324f1c3c545d942ff15fc44
 SHA512 
453db7b734144101cd3096fd1d0880700816ff1b8bf60b71436ac51eada5af8c74329ee288b302b5850231002bab5b8c3a737d4908ac09d05e32e9a5fb752603
 DIST genpatches-6.13-11.extras.tar.xz 4052 BLAKE2B 
a40b3c65ed30aa17797727e8df0efc37ea23639c965fe8acaa17f9315029ecf7603071f74d96a1623bc84f4d6d80f62f5119f85e714f32403bac6b300304a7d9
 SHA512 
a5953975b5e88bef1a8e8aa73f343343816db4e6731d5376dba6a3cc65e15b19e00e38817b5a5dfc5374ab9138ec1416a1d14143cdd41a52ba284ba506896bf3
 DIST genpatches-6.13-12.base.tar.xz 703484 BLAKE2B 
5b00c4e4f5791de684731bee535312f42c9f7a0ffb57c25c262025542b5380e6c55877526ac71c5d1293831d69f84a74a65c8df47eedfc14b91f166b51d0ddb7
 SHA512 
cca66b71c217cee7b2723a63e2085fa5e041ed8a226e9563704016e37fb46221a941cea22581652bdeab2333ebe74e6858232283e3071240a9587eb86adc7e1a
@@ -104,6 +106,10 @@ DIST gentoo-kernel-6.12.24-1.amd64.gpkg.tar 306114560 
BLAKE2B e7b42091494dca4d3f
 DIST gentoo-kernel-6.12.24-1.arm64.gpkg.tar 279255040 BLAKE2B 
4e240c796cafa48cf0d6500d3b6f9b011a86dcf63d0470a00fe8f79fbf69cfba732969ee327e87c54bc0d18785038ec3fcd0cd843df5979db54583621e8f3e2b
 SHA512 
c78cfdb9bb862b0e3a7f556e8692c6720dea2897fd65aac12b76562b44d2d712794d589e4bdc969a29f88788840ebf47a6e32b613387329afae7984dcb797043
 DIST gentoo-kernel-6.12.24-1.ppc64le.gpkg.tar 73246720 BLAKE2B 
f5874b34c69277ab9fd6aee00afb4ef36d6687939c7729a0446a4511addb5346af52f81512754c42f427663c021cfa7f756fe7cb9e922f8d6239bdc0d904b820
 SHA512 
6794c33a15dcdee4cfbdcaf4653a8ad2df5780b67b7fcfe81e0f31c1e4ea81c71f9955064d219b2e45d1d7796556ea2bd370e033c2655c49ac0a4a3bce2205ac
 DIST gentoo-kernel-6.12.24-1.x86.gpkg.tar 77639680 BLAKE2B 
e4f9de5ab09901350728edf2697c13b15464d0aca55e2c4041fd74c821152621729e1d16a8114f3b62db9bb613e21ec5bade50c4be99d8e43791df3996082294
 SHA512 
a8c81f4c890c47c97ba6723d9c7300ef2cf96b1a34a7d1b6f3f5ac3a667db46f1010f67de1c033e94ca547daebc5e585af25f4024459842b01e30192e382e1c9
+DIST gentoo-kernel-6.12.25-1.amd64.gpkg.tar 306196480 BLAKE2B 
8a46ce621ae3f6cee554ace5e585fbae9d3ab6d486d042e06de08b7978ee2ba16559412322fc0676ab6f206b5992d519632ecec8cf3b6be6b481b6680de17ac3
 SHA512 
298ff10613dac1b8f070a4d4ecb17918fc57827eacf51a5723d318c9ff5c0030b77b2d09c57ae54af0ad911044b18f1289e5c4c8509f7401174ced130b08e284
+DIST gentoo-kernel-6.12.25-1.arm64.gpkg.tar 279316480 BLAKE2B 
683200fdb8b77fd3ac4f1a7c7372550b652bd2de89aa9aed4890933b4bd2d70d608fe89c0ad168649ea780456acc90562eb531c7c15f14cf2da38840234ef23d
 SHA512 
ac3574d4cdc96d7c49d4f6c46edcd401641af9715522bf5894f3915be297d9659830a777e5b7a39efd85186019703a92c183c060e11e0b34a61f6e42c5359431
+DIST gentoo-kernel-6.12.25-1.ppc64le.gpkg.tar 73256960 BLAKE2B 
bd50bef58cbf3689a0186c0fb18501d28a94b01951855436a18328c7ffb6c4a0ffb980651b517a059e8f8adae29f59f9099467a899a7860e2829bcf6376a28a6
 SHA512 
40dfad33904018cf4ea8cba9d76909f2b41c4e9890f1d7538a91f3affeffde062f4048116bc883f4e21c5de79e359fed157167b4af388c3147884f8f6fb61747
+DIST gentoo-kernel-6.12.25-1.x86.gpkg.tar 77629440 BLAKE2B 
26e481230cb90541a55c009eb1d373c100b1b4fbe5ace2ee4a878f79a4d7b1b5afeaefb801d7691d9f9aeaef1e2eb051555ac146b918c297472f3fa9ccad06c8
 SHA512 
b14398572c0b8451db2777c58785dffb90ce632cce726fdaaf9029de1cabf99dec2c0487dbae168ac4feb64f612eb4ae5dad665098a466e6b34c690e81635a18
 DIST gentoo-kernel-6.13.10-1.amd64.gpkg.tar 307619840 BLAKE2B 
0e56565f1722db409ba212ad6d508ead2858ef5a9d0555c0b0dc72095a13a86c32e8e1d8267b93d1b385d00b27aa4c504b5f80cc2c0d95eba542ff07b72ca67e
 SHA512 
6eec123ec7acf18f9dc23c1606bc11974e2148a764d0bc77d5309b5d8d9903d102421312dcd20a19c874b780d18b05b6264eca61881311af4b287b81f29143e6
 DIST gentoo-kernel-6.13.10-1.arm64.gpkg.tar 279797760 BLAKE2B 
b55f3fa7e2dd2f6c1f5d7930a1decb622b147169ade8511c15b5cdf7c4f7405dfecc33825c49fc5d639bf6e4fd7cf443d48243a4a5f841999d9e4a3efd0f54ac
 SHA512 
ae0cb20311a86cb008d6775e3ccf91d80cb1f9620447f9150ec7a9dd13cd94d09417de295ff4ea206bcf4ce3850cb31282bd1240b9ae59a68ee4c1f95087f491
 DIST gentoo-kernel-6.13.10-1.ppc64le.gpkg.tar 73809920 BLAKE2B 
bf3d1973d6d8d80096de04e5cbe56efb6b40ece400c3ea5afb01c86c2f688c722f21ba7d4b2ee6cc4a3f6cb3df6c90f1d6a4f7b5bad029b39bd5ce0e88d2989f
 SHA512 
f03bb0dcf02405ab612a6e9370c6a79032536d70f190bd511365fad50017ca2810ce540db9a67f20461bb2b1d3fb143b32909db07221ad4f388de0c3d1d1d6a6

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.25.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.25.ebuild
new file mode 100644
index 000000000000..08897ff35647
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.25.ebuild
@@ -0,0 +1,184 @@
+# 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
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${PF/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI+="
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+       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 )
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       cd "${MY_P}" || die
+       default
+}
+
+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
+
+               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
+}

Reply via email to