commit: ed972f523293d400ce840a5f8e92dafd5ab6581f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 29 13:48:24 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 29 14:04:20 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed972f52
sys-kernel/gentoo-kernel-bin: Bump to 6.12.21
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.12.21.ebuild | 184 +++++++++++++++++++++
2 files changed, 190 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 50618b114692..8f9347db3501 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -24,6 +24,8 @@ DIST genpatches-6.12-23.base.tar.xz 1435492 BLAKE2B
ca65b4ead188bb8c561e47dd7aca
DIST genpatches-6.12-23.extras.tar.xz 4056 BLAKE2B
dc27e7f57ea95e678f08d3b6f791a26cec5b51e2204f3d527538f3c54333c8f25194981cdc68b7812973ee8baa95e0d5c575be26e918b25c160178d3bcf80769
SHA512
c7d92cc303dde284b5c1f31b87081167a1a8645e5611a65780d09ebc49f9cc2ded94007d10e1764d90e0d25e31fa73095227d381977c1ba13714654a328ac77f
DIST genpatches-6.12-24.base.tar.xz 1500152 BLAKE2B
634de57b5d91cdc4ff2c221f036ec11d36db1396be3d3f7e3967f2d9ec78335fe9fdbf84d582978147535fb287238ac7d18f5763beb4efb8cf0430b547b76fe8
SHA512
aa9663fe8226793e138d24f48f66bd4dbe113ee9cc04111707e652e0d104cb861eeb40caaf7b6aecd0a56770086211612d08e4c58abe38e75b36b92ce031cc9d
DIST genpatches-6.12-24.extras.tar.xz 4056 BLAKE2B
21881a1d1182e60063e65132935e59a0ab66b3d6568b1ce4105df04f819bbb92a21422788ebf5ba763f09bd1341be2a5cd64d15f48684fcb3bac655b6d01e40c
SHA512
d2ddbcc2944196f0e7e22367951246467acb1fa6623413c1889fd3e52fcd3be855f5c793fbad8537353cacbea262b1eef664c60b39715470603a82bb41930623
+DIST genpatches-6.12-25.base.tar.xz 1528212 BLAKE2B
818643d9f5ec5f4edc3cf2360f75bcf213ca99846e2bb96721933fa1785624aef8ae5c3ecd3af4f2e13e0cc44fed86e2d1cad8b53ed45acddcb9d91fc483c20b
SHA512
746f4b5523fc3ebb3c59211c7fb4a80714e6068ab769a001c044ad300621b5a4a7a0b0b06c5a689bbf382cb27098f36725962bafb4d6e4489ab44cdb19b6ed1d
+DIST genpatches-6.12-25.extras.tar.xz 4056 BLAKE2B
2244be3d7b4121232106ee8110cb12ab75c8ae1a15377dc87598e25a287b8ce48577945a1677b944ff5fb5ce31e7309121181effe3814d2a522250fdaf8bcaa1
SHA512
d4fffa688883298c41f0c0ceae9ebdc234ec615945165fd74f67d31ececb23a2c905c106aa63ff16ce28bab31b1e08660002b68df0e27e0b54682b2a4981bb92
DIST genpatches-6.13-10.base.tar.xz 663656 BLAKE2B
57d077fdb9f2550bb7f71386c65e1c39abc1e0e90ba16fa36010b4e731a554c24354a28c5b61fc1e7fe5bba187b0b0f96271d73cf5e6931b0c4df631c7c454d8
SHA512
67f1d1564e1c3f7debb7e8f8ed163f46a8b36c2d84179c97579df45cffcf70cc4c4d888380644c4df88aac8956439200e1cd467efdcf8cf1e6c9b405564052c6
DIST genpatches-6.13-10.extras.tar.xz 4056 BLAKE2B
0b1f54fde344f439375673cc8bb7c076f9809dafd46769897875e59fa8a27c0aafed7cc3b1137cc67fa906e874e052da67c37184a1e3fd343e8d60f53c8f1aa5
SHA512
9b5d3a03583c9312d309c67cae347957fc0739ce722c0f7e901e2a5812de392207a7f2126106c741966c4c3a9c7d0a5b01e39dd8deeda495b07cc85728992130
DIST genpatches-6.13-11.base.tar.xz 696060 BLAKE2B
1d90850c681688f299e6d66c6ab2a9f3d9a45ec516d2b727adb9dd7c71d33c452303190e2e0e3b2e5bbd779b1be22683d70e53e84324f1c3c545d942ff15fc44
SHA512
453db7b734144101cd3096fd1d0880700816ff1b8bf60b71436ac51eada5af8c74329ee288b302b5850231002bab5b8c3a737d4908ac09d05e32e9a5fb752603
@@ -102,6 +104,10 @@ DIST gentoo-kernel-6.12.20-1.amd64.gpkg.tar 304865280
BLAKE2B e51641efadcecd7836
DIST gentoo-kernel-6.12.20-1.arm64.gpkg.tar 278108160 BLAKE2B
b97a72a1246c4831fc3a596488f16e34729ff8570ed0e08c878b0054aa5ff4609a7cadf07fae4de8fb88c62841265d212fe2d0d170e0440662f7fa2c588240a6
SHA512
76822341d67051270f369ebecb28869f79bad6dc072bae1431aefa41d08c4b4ceb32df253e082f5f81dce25fb05bc704afe70751eec05d7405acda60ce9c29d0
DIST gentoo-kernel-6.12.20-1.ppc64le.gpkg.tar 73175040 BLAKE2B
f8ef88f6d36b95e15bd1dfe1ffec44365154f59af0265a0e89a55f7900e8408948d38c57917e4c3104422677c1029b633b5377ac79526ed67270554b5b94baeb
SHA512
1be934d3ee698d0f37f44c13f996a1d69e36d34b951dc1e1b2fe15a2f8b3be6edd8ee68decca69799f4694d909b318c4114001bf488e935a2aa71dae32de402c
DIST gentoo-kernel-6.12.20-1.x86.gpkg.tar 77434880 BLAKE2B
4042a499859968d9b90a6172355737a20afef711dfc50042e8a0d2e76907d273de00f34f40ef448696736bc71ff578bab8b8e3644a3c36cfcce53e2333449fbc
SHA512
07cf45b4a364e76080fa1fe6c70fd807ca5a4bd8a74c7d98a7cca5fe10a69c6a5182a5b065a13bed704bc71042ec8eb3c9e71437bf33097fb12578bf100f7e1f
+DIST gentoo-kernel-6.12.21-1.amd64.gpkg.tar 304855040 BLAKE2B
d43746e112926756c536be6971955214777d781f75a6e4bc99a9d4e5d4c4ef6dea2df0afae8965b3dc654c1f567efd4bec5c354cdcc34b4cecd48e008dae2173
SHA512
cbef002d22654723886a95c7369e40fc6fe601068298a042a8db53fc4e7d56987698883cfd35d39a6cbeeaa58ee025d96f8a768015ae49d03ca33dcfd8e99ed4
+DIST gentoo-kernel-6.12.21-1.arm64.gpkg.tar 278108160 BLAKE2B
1089ad29939cbe0b0713f77d14d18ccfa4b3b5bb0aa700fed7c7b5d2195d19f2712df889b1c39b25788a89b66789c6db61e26325ec75ce9aa67b50aca9ec968d
SHA512
d8dd98383400905c1623cc7d56b66b445493e78c7e9834717b6e3aad16586f220b49d8cdfc2b23da89b4ca26a0b5272f78e05b02cc63d470e9cf20489e39deb8
+DIST gentoo-kernel-6.12.21-1.ppc64le.gpkg.tar 73123840 BLAKE2B
72f57d3076e6d3e7a86e5983a626b4a0295aee5e5031101c44f9749441fca8334b350cdc99260d6ca86d6f880f645e79258b2e95d5c554a314f72ca67ca8195d
SHA512
2992adb4590698f0b33eda4390f65266b2e2c6be873abfa5a3e95d493991d50ae31d8842df9a5282d5c83e405cd2f56334e63b4fd2c93ae1451f7b1443d0d97d
+DIST gentoo-kernel-6.12.21-1.x86.gpkg.tar 77445120 BLAKE2B
5965512eac98419cef8ec9347e2b2c75637b5956249025c70e07bea97a677409e94b9050730ea71da628773f682477c1a8bc0322a6f0cdd48fde1d5dc21784aa
SHA512
fe8120a3c12487d9738d1948a43ecb2cff467abde3578e502e2cc8574eff5b9dbee3b58422a653671a7f26e908df842d7a8304a9570824c4121b08da993d9aff
DIST gentoo-kernel-6.13.4-1.amd64.gpkg.tar 305807360 BLAKE2B
bfa6617fb9fa1cc5cd4c94f0d00eaa9e5e5ca4906ff2fa59fc01cab8c5767fabc3491b4a964c611f031ef9d6f070a2454c18252b5c87d58a403aaf7aeb1ab148
SHA512
212ba9f66a569c6f99978397ba5469858447a5525b3128d2d884e99dbd795e7f3532203979575912c4977a333dc3fd84d93a1d7eb4ef1ab961877e79bf4ab269
DIST gentoo-kernel-6.13.4-1.arm64.gpkg.tar 279511040 BLAKE2B
2845f71188b6feb068caef78e9b58d9818738ed23af2583e4ba164edd4d5ae108ff396d4be15dda6f5375c4d606450ff80009fc3078637fc52673ea1c07644ef
SHA512
575bc231f15a1e84c615ff03e0b3ed6497ddc7382428cb193446406485e81fd487e55e03aec71a7abeaec472f25d45ad8e9449c7711e4ac1ee5e26eea276ac93
DIST gentoo-kernel-6.13.4-1.ppc64le.gpkg.tar 73236480 BLAKE2B
36a298b8dbb2c581218d5534e1ae389e0494f46712cbe288e44845ab84bd167d667e3c2ce93ed9e3feba764de854bb97d7f77c2c8897164dd19f7f4a5686eeba
SHA512
9fda52f55185eccc0ad85d05c4d47db242cea84f6c6bd7910cf2a7a388a6d23d2129584f1936a7d01d502e027fcfeb0dd0ddb41e46ecccc38d563a43be6e63b6
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.21.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.21.ebuild
new file mode 100644
index 000000000000..08897ff35647
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.21.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
+}
