commit: ea537dcc293535fe86122232e51c4da54c5e0180
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 17:47:18 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 18:21:29 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea537dcc
sys-kernel/gentoo-kernel-bin: Bump to 6.12.24
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.12.24.ebuild | 184 +++++++++++++++++++++
2 files changed, 190 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 6de3ff87ba18..fbbd9271d02d 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-6.12-26.base.tar.xz 1534560 BLAKE2B
ab84c4f747924c39727b9340bb19
DIST genpatches-6.12-26.extras.tar.xz 4056 BLAKE2B
3577c7e25edc04baf51a2ec2d36394b5d42d04f3749802d2e3a7dcb57c14aac8217dc243a93232d639a8758b71671e3134c8c1e2f8daa7f6770e40851d7fe0e9
SHA512
2d9581bd5fad5ac13189409c0c5512320c5b5897359d49a044beab3e47c37d027f12c196ff98175f10dab26523d778fa01ebbfaa60c6b8a99e31355864e0f0e8
DIST genpatches-6.12-27.base.tar.xz 1638184 BLAKE2B
9a0597a4a2d2a8ed3233216e2c926f6ec13810638d6cbd429e193676ad11acb340866496c6b2d492203241da1c54b252ef0f866725e704aae51fe26ffa55bfa7
SHA512
4e00921422e6d28940d3bbfb32d3f41b9f0a02f4e0367fbf4cf55634009326fc1755c5bddb53ae8c20c5161cf0950f71be637490315a24b40b472f364d7e76ed
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.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
@@ -90,6 +92,10 @@ DIST gentoo-kernel-6.12.23-1.amd64.gpkg.tar 306063360
BLAKE2B 96da93d1e61979f7dd
DIST gentoo-kernel-6.12.23-1.arm64.gpkg.tar 279214080 BLAKE2B
03f3b47e25281af81a4df4390f42aaa1f889fa9c00f1b6308ead4b728119c03b41a06cd0b1ff0a99a92d6b3202c760d752a392204b772659c749cd43b6615da2
SHA512
1455de7b6da439f59587bd1de1b9fea2e415110d68b9bb3da7ffb679fc99f401ff4c916a41624209c9632173e6b150d4f2b7b5ced713735863abe73d73273498
DIST gentoo-kernel-6.12.23-1.ppc64le.gpkg.tar 73246720 BLAKE2B
d27169673d18a6cb2394404338a37ea2fa38aa568e4fab8ea2182040078701e7576475305482ee5e93ce4b9870d28a7af913fda817d1038ecf806c7f01dcbb75
SHA512
fd9c27e1f1a4081686635b8c9b4a9491b0a00f0553b9fd140a4af36580849a946a2e3ac4ad6b1182719887ddcf3aa10d523610b881f694bf86e4efac10ca9596
DIST gentoo-kernel-6.12.23-1.x86.gpkg.tar 77598720 BLAKE2B
934d32e9293db2caae6caf42896a8bf6e0239a20cb19b77b654837cc89ca8b47d1ff9997f68badfda26c59729f70151308980c1b462464c238ffd9b1e381357e
SHA512
a011e9376eb9427d675e9e0a78bfdd5faea13698512f7fc383b8b4c130bc7ecd1fd833f83d929f1a8aa2fb7984f4eee3301cef4320193a80aea46419cfe8cc8b
+DIST gentoo-kernel-6.12.24-1.amd64.gpkg.tar 306114560 BLAKE2B
e7b42091494dca4d3f0fea9fc5408896ae08fe533ac10100aa77dbfa66961137ef2ce51e60085e9d37dbd31223dbf1d7a98a561da40eac8e433ab07eab2b8e68
SHA512
12bc18589b5de09f129e3f8f386d74dc6b6e2e966b2a60a2fa2049d58dd09c679e07be9ed8c56ad6368bcc106a2b67e549321977d7be5b1d8dbf0bb540561867
+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.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.24.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.24.ebuild
new file mode 100644
index 000000000000..08897ff35647
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.24.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
+}
