commit: 0ab9bc0da0d50e1016e3ccc4c4d0115d89131b8e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 27 15:51:47 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun 27 16:04:26 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ab9bc0d
sys-kernel/gentoo-kernel-bin: Bump to 6.15.4
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.15.4.ebuild | 184 +++++++++++++++++++++
2 files changed, 190 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 01e496d96746..65fd04fbdb72 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -30,6 +30,8 @@ DIST genpatches-6.15-3.base.tar.xz 29120 BLAKE2B
ca6f4f619fddd98d7c75ef7ad9054c1
DIST genpatches-6.15-3.extras.tar.xz 4060 BLAKE2B
99139d97cbe49b5f8a970818d6c3940718b19f8c5ed9baa8bd6abe1ae6f2c655483e8a32b04a392c1987bd2db1375611ab374d2e8ec3efae60a55b3d32da1a24
SHA512
638f0cc0c89ce67fd3e20b3da25370b6c9c472c52aa4d80cb5f2b4a3aba12a4ea06cc77d478514f32f6d4c379e935e3de983febd5a4b1e446a94c088d3536251
DIST genpatches-6.15-4.base.tar.xz 295212 BLAKE2B
f5cd4f9b45c452c6844c979f3cd028de6d51f365318e817c1abddf46a6628225b182652af05efea080ddd226d706f688437f93de3e39f192b365d02ce645f341
SHA512
e3520743b82fecff56bfa9c230bf03c14b99d49784ce9bcf32adf1a1d45cc355547cd2e45f431330ee0a02a530480288892ef15271b8cfe49dd384c33c17a04a
DIST genpatches-6.15-4.extras.tar.xz 4064 BLAKE2B
77f646e96001a71b350ced4512ee9c6c63f656017fa2a720d11a4777577beb1e081780ed08dc89c5e2ddc4dfae699cc72fb41a7f5309f02737ff47fd11b2587b
SHA512
54284f9d5c506cea47afdf7c387d564085b49e5e4a6a7dc41ca97722ba70f60bfed6ec0f30a7a0f41e340f5af19f4335510e4898bf379f42670926549915a3e9
+DIST genpatches-6.15-5.base.tar.xz 463476 BLAKE2B
49e319e29579d90a8a6848a7fa888b02966029e622eae1fe522be8518344c7bf0b356b21f36b052b5b69d629973b08d706c33cfd66b0707117dc7e39aa8db40e
SHA512
b7165a1f4474d5b67978467de195fef49b950cde46a7e30e936db047f9653cba64382cc90d8a0cdb0621ede37533d5662d01a19cd815b86a87b8cf1eca080dd4
+DIST genpatches-6.15-5.extras.tar.xz 4060 BLAKE2B
3e926d5600eb4f2943336af9be38f2f708dd6cac5ee0da59da7fb058f36ea94fa3091d0ae913a27d94ad652a1310131ed73aea81a2cf5f91cb82337d56d2334f
SHA512
c2aef10c75436d51eaf5d58876930f58d95c7479653da1c8de7eb210b5f15bbcdec0d08fb3456c173cc734a57af986c1485449e1bb3e3908fc173c0aa0bbe4ce
DIST genpatches-6.6-101.base.tar.xz 5077712 BLAKE2B
42eb11265006d12e5f67d25d58dcd1188ce6c8b7fe5cec8b176030f36910ff77da5a362e1bc41d3e52790c5e77a2a71adc57f5e107a5818651226ed98a27828f
SHA512
759cf775322ec77c85c6b4f5441c8a962cb75e13ccc8d73d366cebcfe75d97b688deed9c9c4e47257db349f950f33f5aa2a718fb2bc6a7a7cb7d75afe5b70d12
DIST genpatches-6.6-101.extras.tar.xz 4056 BLAKE2B
d83b765a55f25c4470ab6e5b3e8d2a00ed0a7dde2c5a29f2d68b18e6ae3f084cb653eecc47a9bb372b1ea9a65b727e6d9227f359547ca4a5fd70cc75aec41598
SHA512
516c38a41a9a3116b71729c44b3cdbe3183afb8f061e1b860d11bafa37415663807d470e8a9b4a35366b297a2946143d1393e46c6a2f755de82ef8f769121d1e
DIST genpatches-6.6-102.base.tar.xz 5221156 BLAKE2B
107b3cc31c8566c3ee223b7ef0a491ba3284423b4f374d3b9b90f4fa331a4ba6a4fd19fc3a400a8ae4c31119472c3a27513e62bbf73030a2485e164d9acacc76
SHA512
861d67f58e124dcfc9295bd5119b7d84081351dc1b5a039e568276903914bfdbd5c2cf0bb318042f110221884cd5d635c01415b3f2f0d81313f2221402175fbb
@@ -100,6 +102,10 @@ DIST gentoo-kernel-6.15.3-1.amd64.gpkg.tar 326103040
BLAKE2B 432d7df18175c6e5d56
DIST gentoo-kernel-6.15.3-1.arm64.gpkg.tar 289351680 BLAKE2B
e7dd1a61deaba0535224ff5a33f620eaeff1eee9a5b9ca74345b78b87178189a9cb48a02a3b8c62331852df03a64748cb5b9f5ec4b5832088f1128f24e30c46a
SHA512
f61f6331e07c059521a27bb60e4bb78d85379c9bfa5bf01332ad6c551dfc740aa14291e279e1f8ee56b3966ef82cd02977aa11ab746a4c37bd0b6c640b11a6eb
DIST gentoo-kernel-6.15.3-1.ppc64le.gpkg.tar 75223040 BLAKE2B
aff17159f2966c8c8f1aabdded676f95651fc177f94fffbe9c8c6dc953bbccd1c7aff0bd8308b8e64340dc7951ede5595562f521859311f4b2bef654c4731838
SHA512
295f04e7f9d1334b37d8e1e0f2b92c98fc35de27b1d3530836ed480c96863e8bc0a484c84c486e2b74d36e5c7db98dad6ecec954d7bf82f6aa47d22630fc4fb3
DIST gentoo-kernel-6.15.3-1.x86.gpkg.tar 81827840 BLAKE2B
bdca3fff0b32444cad2a819c4d6b624250e2c0a2422d71990ff2b86610507e2817d6807357bd25764e1c66d6223792ff9e69f5d4194b084ec2744cfa9f2d350d
SHA512
b59534326d769ca6bacf62f0aba9078064f83b608ce004521e54e9c168831448eaa6defbad3439d89282ecc0e8b1763355da61765b5aaaa4e3e867d3cf40e185
+DIST gentoo-kernel-6.15.4-1.amd64.gpkg.tar 326184960 BLAKE2B
5108215e610e0233a6de4fb05e6c531346cba141b25ae1a4663ccc0d697e4fb6435bb31a676cc9740c4a20fc2e283d9d3aff8f1dead1882077a7ae19c4afa851
SHA512
885152105aeaef86ae36a1979c869c288e062f41dc6b0c3e83111f8dc66cb4337922ab51043dde0d3136a6588d8edc941392795a45f6c0ac9fc597d8ec96b259
+DIST gentoo-kernel-6.15.4-1.arm64.gpkg.tar 289341440 BLAKE2B
70cfc5ba7e94c9c6cf254b2276f60636c77b322fc54296feadc6d71d56b555e452c74bda73f66fefc03d35575be20ec539e5585153c608e551f60c1e3b1560ea
SHA512
2a95afe61f6be7ba56f6b01f3404230f8d494843c1c9bd987b791848c524dbf85d23d810ae88f82f83bfc8494a1e1f06a3ccf75da89127ba340cabefa527186e
+DIST gentoo-kernel-6.15.4-1.ppc64le.gpkg.tar 75223040 BLAKE2B
2453f2bc22b1094d2d22141a12461ba97625db960040d371cbed7997def92c50df4f65796f3640711be0b5ff673bdad2e6a5f3152cdd2cdd523ebe1d9f91c63f
SHA512
2cebdd9e12e8ca6c77eaa57ca09f32728f2c6ce3a5be09a9eda3e3f953c44861552fed6ccdeda1611b1ed033bff09df77d894ac0c04c9196b4b5f9f2bb95d131
+DIST gentoo-kernel-6.15.4-1.x86.gpkg.tar 81827840 BLAKE2B
ba7ce6d13a2b4c3d6a4be97a4b6dedc4579e29576b401037303d753b43be40678df99ecbd30a99a2429e3df535d05d9993e01722943b8f6d276a31438f42978c
SHA512
743094e2ad5343b9d2ba209688060076721c0b8017cb6937248b7b542596bdecb9d9deffbf00d804f4f45064120d41e4a7cab435d0176f212833ee240e514d00
DIST gentoo-kernel-6.6.92-1.amd64.gpkg.tar 273070080 BLAKE2B
0399430f27b1633ae1e9d29f4fb38e4683d5fb7bd52cf56ff68b266c7d827acee774ecd8a2383cc498a9f8cb71fc2d6a057a3b969b93823a6c3b291656c8bf2c
SHA512
920930a428ab26e30ab704a514ebc0454dbf9f69abb5b5995a250cda09f31123243a99ce8d40d6233830d87af13cf9cfeef8791ce873e819e8d2e558949071a7
DIST gentoo-kernel-6.6.92-1.arm64.gpkg.tar 246528000 BLAKE2B
ee3bf3803321705b7cbcc65944b43da7013893f36469739e3e5d1b6900279b63aa909677aa1b7fb9fe85f122cfd62b50b1b39351cce747404a82c4b747accdf4
SHA512
8fbee40927783346e7ab27eefa0c4e874e59f7afdda8d96a50544ce1b9216ee2a918bdcf6b7dc07035c2e8371f580f0099ba0b41794dc438e45d5c0a070a8584
DIST gentoo-kernel-6.6.92-1.ppc64le.gpkg.tar 64440320 BLAKE2B
eb86a2311988cea0ad9b1eb880f6d3795e6b698ed7c3f93fb53d2d4c87700ec217ac5c9ae94b7acfdbccb6336fce3b607a926a21c76e0f5844c67f82afa86335
SHA512
f74f018465583c82656f93a5e7d1cb2e1621d82b1e9589a25bfafc775398f534d8d44db53fb50c337b4f99f7de1562211d07161861804570e9d765e0aa3a327a
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.4.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.4.ebuild
new file mode 100644
index 000000000000..c0377f141128
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.4.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##*.} + 1 ))
+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
+}
