commit:     d8b575db5511e8e159dc34a063a2498d4ef62ced
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 29 20:13:48 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 29 20:22:47 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b575db

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index d02de6aa14bc..3691923e2bde 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.12-34.base.tar.xz 2001840 BLAKE2B 
0ca0805ebdc332d10ed56cac2d96
 DIST genpatches-6.12-34.extras.tar.xz 4056 BLAKE2B 
282da21aa2dfc4763367910b158acd6d1e8bf3b1c8ccefe6693784709e0e67f35086fc1c3bc96bab88fdd31f54192677d04ad097f6af14560a4898bf377428b4
 SHA512 
2d1780f59bbf46d3d1362474fa43817da901bc3563437598fd22708c74acc1fccccd87447de431ac200dd9c29b2eb5ddc870c4a1c5fdb401b4708e17f47668b8
 DIST genpatches-6.12-35.base.tar.xz 2043972 BLAKE2B 
f14a91324f35ef46571ef78058ca68363ffa3c06c273eaa8ae85c72df84ada62f433e6c9a58098625cf0b8adb25b6a33b48ed1927452853700a58798552f3b46
 SHA512 
c5bc196aebca5ff0e51b8a2e201d14b6a029ab46f1ef8ee2a2c716e78a27b7a529e4f6c416afb898f1ca8faa5eedd1338197a74e84aa278b5c78209e6afe052a
 DIST genpatches-6.12-35.extras.tar.xz 4056 BLAKE2B 
5918c54d7e26e3e2520ff92279da6b5495886432ec9be3247159bd76b40bcd6b2f203da8e7c4410c982e6a040330f0aebea002da551f67e028742db2463a6f89
 SHA512 
871cccac1b4d03ad192759f5a01d7992430e6dee1a983d7e0f952acfb499b740ad3d40e9b5a63b92d2a78aa43edd98b4221711a90b5013569cc1b0f18e50557e
+DIST genpatches-6.12-36.base.tar.xz 2240564 BLAKE2B 
cd68b5d7fff73f5fe0c67a8eb47c2094a0ae57f304b5a4798ccca7410c5f514fc1f9b2fccb65e639886e48950ed24d04ed44ddcdff3d5223e336f573f25a501f
 SHA512 
61796173e1e286c352d3d683be007e4336e646cc1efcde0528b12b38e484d104c9686440aa90d096cb1ebadc715e46899e5bda0f8bd070190ed73e0291401f19
+DIST genpatches-6.12-36.extras.tar.xz 4060 BLAKE2B 
034e0d065982369815db90efd84209bf88c73d19a1f4fa41b6c4586b0197e1e502df00b63f8d99c7c1eb0e32fbf99c0187b8c304adaa0f2f624a722e50a31b21
 SHA512 
cfbb8e69bf254088ddee442c6ee1d293406eac106b0c8fb7d926ea2778260664991ca05c5efe6547b4740ada1010057001856c5d6ee864cd73f55cd8ef78d5fa
 DIST genpatches-6.14-11.base.tar.xz 1058528 BLAKE2B 
276bbd42629f6a305f3170e8560736b6ac25c2afae0f8cb9aa50bb101303308bc3bf7729c95f42fb112cf77318a57aa0df9f2af4d726772d167eaccf78774eae
 SHA512 
a3ce8ff9e14e443df9dbdf0ff081c7e642d9a660583fce303eb76cb1fbd486a3fb61fb9eaabc4e0a5e48514ae224958628e80f88464ef55c09969fc3e4544894
 DIST genpatches-6.14-11.extras.tar.xz 4052 BLAKE2B 
808ddfabf47e276fb302c4a61230d9e42e0a00d52676137537b440b533f1cc4cf76248cfe4dfb31b589b1f45b22c56a8cacc29d59f33c31f8d50239902e82d92
 SHA512 
be2b1261fafee96e99375968b43ab33500622864a6133d773ef88cccab8800d409f783388195ba8993488cfc4259f276c3c9b7c0b7ad432fd1caa69db3a6de03
 DIST genpatches-6.14-7.base.tar.xz 632760 BLAKE2B 
12a26d7a4cd6b24ae3dc36648b0e890ce3ef20b3eba0583cd920ca200ecb92a6405dc79e2a58700e125f7ea2385db8ffa0f7a829e45f1204d19ef41a91a6fc99
 SHA512 
a0a0df6ae8f6c7c26594a55f6b071522b59a5537501ae78b569418a8cbacee5ad02fef705be7eb22468bb288a56de89b51273f1d32e52727de6046d878b28e1d
@@ -64,6 +66,10 @@ DIST gentoo-kernel-6.12.30-1.amd64.gpkg.tar 305633280 
BLAKE2B f0fa7398b81b9173fe
 DIST gentoo-kernel-6.12.30-1.arm64.gpkg.tar 279470080 BLAKE2B 
9f1362b0bb20ea85f9cb3b042da349044d02a71ca78c959648781f16d6f83c99beadc832f88a23b53e57f65ed586283bd8e1ad46aa0f30793180f1d96728af86
 SHA512 
0ecccf659ca3be840e7bf2ee500a81e7dfb83064e87cd9e9199f82196cc0dc4d309c54e84598d69732bdb43a4b2a203f4aa4192b2ebf15713c0113f33363508e
 DIST gentoo-kernel-6.12.30-1.ppc64le.gpkg.tar 73267200 BLAKE2B 
5e86ddf48669ac501fc38ccb6461f375f08a36ccce13c25d077158c2073b178293dfe297d6105e38361aa3dc63e3915eba88859f561159d06a28ad3b22f776e6
 SHA512 
6ee19ed07477c37731d0f526eb9e79c0247076fb3c8eed9132d9e4ab56867e3809a5c895201b5f630aec434eeb889e3ae717ec3e7ab3f64f3ebc353ada124547
 DIST gentoo-kernel-6.12.30-1.x86.gpkg.tar 77619200 BLAKE2B 
5c5cff15261dab31236b8237cea8380ffc2f094879637f3cd973ba3e8e557cd678ef55a8acaccfb9b9fba1161fba6495bde3fcff2087c5e4859d7f2f05a4bdad
 SHA512 
3f0412592484c437000686a98bb871bba58de5d5e8e48285474b2585549515840e31da1789f541e5d74359bf4e4f1accdafe675134ab3fb1c471f68f97d6fae8
+DIST gentoo-kernel-6.12.31-1.amd64.gpkg.tar 305612800 BLAKE2B 
375bbbabdf3e1ee1273263791e6d72da202547a897b7210ccf1be0c93e347dd1bec888ebe4e61cd08daf983cd931f3b6284b627412ae716e0fdb92d7c7ca1f4a
 SHA512 
45011984da1836b4a89e4a7942a867fe3b686d78846afd06098ee2e548667684d9b44e6e671524b9a0f1755b0d38a8497cd8abc6b0c6a2f956104b8bd56641e6
+DIST gentoo-kernel-6.12.31-1.arm64.gpkg.tar 279633920 BLAKE2B 
94f0478a81733df9ef7897042377843b8a302eed55154383f35ebfc21df0ebe7dd358b56ad53f0e7b22958625d72745d61b8b1a2a6e4b1250206a650f024cc3b
 SHA512 
51ce06ea732273f256bd347f088080af65123cd1be13db7e864332dcfa5e3f1857f39c363a43919676789bed105209fa34942e715a07b7adbf307db49f6a266b
+DIST gentoo-kernel-6.12.31-1.ppc64le.gpkg.tar 73267200 BLAKE2B 
e26a7f12f26893cd4a4c836363f2ee52697daef4eef58abd7b431d090fa0cdb50ab6d89cf762eb1bbacc7b685483ec30aa36171f7fcfa57d41966ca565165d10
 SHA512 
894888156da7a78a1787e544075fa69717fb3d443e0505c2fbd30ae1bf2a2316d8cb4b0883d8edde6704b5b2d0395e438bc7b77a415e05cf1c7cdc4837aecd79
+DIST gentoo-kernel-6.12.31-1.x86.gpkg.tar 77619200 BLAKE2B 
2381c196272f8a1710136b838c10af838a08c2d3c52c25c10a8f9d633e9642c01998eaf6248a81296ae57a5ca52d920f9a37e7360ca284fb51635cdd11b62487
 SHA512 
d4302d93bcb84a8876253273b03c5c7c093207b73e9e461483b05245dd9566eeed55453fabe0d1ed9b7c762371669392b283000067c88f2cf1486550979a923d
 DIST gentoo-kernel-6.14.6-1.amd64.gpkg.tar 311961600 BLAKE2B 
78918dc0b22babd8f471f72e7b742fc53134aeddb04ffc609b8795fd905d3a144e6565f1ff3fe3b95cb86e940ec369102510094d9b27dbaadbf098f6a5d510c7
 SHA512 
98a167ab644c1cd9ccb80b1f559f0641bc883264cfd20401de2090e2500fc4afc6799fe8e496f00b7ecb07fd877d84483b441d762516b15a363cd743c4d8bf8a
 DIST gentoo-kernel-6.14.6-1.arm64.gpkg.tar 284528640 BLAKE2B 
d413a8e573c7edb8bd70002f1216ffe3146f08f53831942d1897ce8e9e1d07d6de4d8e813bfe027b33e5d17d75fb02acc138f5bc92e36d3acef61a5907549cc0
 SHA512 
f307fb51f99f80c3984cf78a1113a86148cc31f67c2abc405622da8260b26d500f644eaaff8726ea8fc2b7be03e3f7c2a265fc2050e3057ff328e7938cff0a6d
 DIST gentoo-kernel-6.14.6-1.ppc64le.gpkg.tar 74444800 BLAKE2B 
34b1085a03e47f3f4254ce0ce64352eff4cca30abaa638f7da014149862d0ce28ed1fa738a57d4379103d828a765f226a37cf6081d49f0eae583b807b2570de4
 SHA512 
5d55c8cf4dd1223bcb145f27fc24d6ee1339bc14ef12de27eb5037dccee00d833dc18191d48ea893d68892005097cd04f769f376218d4c44b35fb51ada73f2c8

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.31.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.31.ebuild
new file mode 100644
index 000000000000..ac7076155097
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.31.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##*.} + 5 ))
+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