commit: 7ebd95f2575fd861d1bc831e38339f4b4b3a3cee
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 7 18:54:43 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Apr 7 18:57:00 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ebd95f2
sys-kernel/gentoo-kernel-bin: Bump to 6.12.22
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.12.22.ebuild | 184 +++++++++++++++++++++
2 files changed, 190 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 8d002d650ac4..6bbf5bec4664 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-143.base.tar.xz 7071932 BLAKE2B
6a9c6027e0f0ae2ea5c900749965
DIST genpatches-6.1-143.extras.tar.xz 4056 BLAKE2B
e8ae9ec53201bd29d6d834e8b5f866ce60c2287bf1475e4024c5d56ee57ca485174c9a9207d31d57eb473c4d04fb1b12be9f78b85aacb2902ac71d1b645fc598
SHA512
3bad66ad2e88767ec61a743fb3257c567f83314e6bcb74627ae69e97f65429f82d84f986e50aa6a939b15a7f797f62d87537fc59aba511e155090d2c90968b54
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.12-26.base.tar.xz 1534560 BLAKE2B
ab84c4f747924c39727b9340bb1974df4c547891e7551685bca0b85c65318f146bbedc44e7b66c56154d0aa64d50f3918f96e5eec84ff40201a52edd99414e41
SHA512
34bf25e6c0b706dfb8848d69969ad10c2532d2c5ee3e24e6ec9b11f3e347624dd6e9e129e77596c2971ede310ec8f2e743d3a4793e4b42ed1651e14f963e78a4
+DIST genpatches-6.12-26.extras.tar.xz 4056 BLAKE2B
3577c7e25edc04baf51a2ec2d36394b5d42d04f3749802d2e3a7dcb57c14aac8217dc243a93232d639a8758b71671e3134c8c1e2f8daa7f6770e40851d7fe0e9
SHA512
2d9581bd5fad5ac13189409c0c5512320c5b5897359d49a044beab3e47c37d027f12c196ff98175f10dab26523d778fa01ebbfaa60c6b8a99e31355864e0f0e8
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.6-94.base.tar.xz 4728588 BLAKE2B
63e287cf4973aa3808673a8069572ff79ca0efda0c7711df217fa44ba1d8179f355ba4f1145be2a81974922eb17b2110f31ed091fd1aa2609d2432995df9ba53
SHA512
9cd910058edb7e36a8621eb1f2d8493ad4c3db2551e3073683557be9a73b20cdf4647d7beedd2ac93b84fa126b816485372f1d8c5901bddbb83f6896dbe9a22b
@@ -46,6 +48,10 @@ DIST gentoo-kernel-6.12.21-1.amd64.gpkg.tar 304855040
BLAKE2B d43746e112926756c5
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.12.22-1.amd64.gpkg.tar 304926720 BLAKE2B
b010a6c341c70da15e6306dac2d4aacc4bba4e11ea05d1585f7df484d88f00405c3e135fb848ac7a3bec36b83ec577eb04ee33413595bceddccdd8a013f2497b
SHA512
f38af2c1c943aa1da4b321d9b6e8afb09129fddac97168ba9c80cfa482a36243bf65fea2b3c15d3d4c72f01cd0d5dd50f8db1ca143ac9cf818618ceccbc9989c
+DIST gentoo-kernel-6.12.22-1.arm64.gpkg.tar 278046720 BLAKE2B
8e97731f8c50437efae706fdbc53aa109f154ae1f5b09752348dd0e0a694f5b4726fa616db65a76cf1e08f9140c4beb3e176cd80133d260544d585c691391f35
SHA512
735a590324e7dde3a397bf1db8f042b14abbe30d929a31f786c4141a58beb8c31365c5cd3b6538067b8e2f7daee937bc917451246a0fe14022281b1611cc3a3a
+DIST gentoo-kernel-6.12.22-1.ppc64le.gpkg.tar 73134080 BLAKE2B
d5371cf76c25810c7aed74b905c8b5bd595376cf9614b7e9391352815b893cf1c13d5d94854cf6f8a1086b1f506e7ef385e690cc08ce6f27c57d4974ea4de945
SHA512
ddb59c6f37fedad2105032c0b48d138a0e6a5ad2cd21ee2be7a492f465adcedb114caa01779fd0d57af22be54d85282858f1047b5aeead8f891b5f74d8a28a79
+DIST gentoo-kernel-6.12.22-1.x86.gpkg.tar 77434880 BLAKE2B
60d68a4430a0ef955023484b6da7dc7da099a05b0184097cdcc5792d30297f9462f26e33d77faaf78ebd005612b66da9387f33f3c3f5c08dc63095933c030f11
SHA512
48d040c627702a4cbda51af56361ae430d82c72c0894aa418c683a8a781112f69440a1b218321334d1ec2c68977f7976c845f42febb67394cf51da9370c6ff7a
DIST gentoo-kernel-6.13.9-1.amd64.gpkg.tar 307558400 BLAKE2B
2756328b6b737ffbbe0fece8ad3ff01fef8c0b9d355c27b54b31e06c8e90bef9109d1949fcaba5d5a513ce084ff6513fc0ae0bfc5dfbe97364bc190d0ffc5e12
SHA512
b0a61b486cc5c0ffe32f3ea7b11d9ba021cd74bdc8ae5a60dcbb94f14750840d07e0f6dd2a1eaa3ae0f373ace0dccbd6a88e2a1b2205ca6875fbf6af28e4d01c
DIST gentoo-kernel-6.13.9-1.arm64.gpkg.tar 279808000 BLAKE2B
10ac44ee1770d9d347caa74a3283fa6fbd280bb9ccb6bd28d0916edab58cad1fb34d97dadcbeb46423b6f140f727f5a2a3c8b1b67aa45d52cd4c5ad517a297e4
SHA512
93b3b1a034c71285320922ffbb32c365e8f4076865db0c1a0afa0c777e5e8882052b6b1f44cb176bf4eda071f225693f8c52a2f87d5cc45793b60718dd3b1e60
DIST gentoo-kernel-6.13.9-1.ppc64le.gpkg.tar 73799680 BLAKE2B
acf59ecbeb82a34dc1a6f0c138019c0164e4548b3a6b5048ca4a6cd6f0314fd3d7a48a3cda731f9d1a8692b61a5ec7ca7157bad41e58dc06ba7aad17dd8be456
SHA512
0c7d1496cded5053e9736a193687c47d6d520872a460000c17a93c7bde208b693dd019d4fbd5615df5accc0a86a40f113aa19f63e15e9255173d12f4eb0f0e35
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.22.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.22.ebuild
new file mode 100644
index 000000000000..08897ff35647
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.22.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
+}
