commit:     460c6ca4e0517cf3fd92afb9141474caf879c71b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 14 18:33:09 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 15 03:48:05 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=460c6ca4

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   5 +
 .../gentoo-kernel-bin-6.6.98.ebuild                | 224 +++++++++++++++++++++
 2 files changed, 229 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index ff768c789ebc..508e5b555b3b 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -104,6 +104,10 @@ DIST gentoo-kernel-6.6.97-1.amd64.gpkg.tar 273029120 
BLAKE2B e36d6ab2d11d3cf96d0
 DIST gentoo-kernel-6.6.97-1.arm64.gpkg.tar 246384640 BLAKE2B 
4046d5ddb48ac681b64cc8344f077a94365320e6d5bd8533265b90dd7dc7cf2ffc7b89e02544fcd1766306c8afaf474e9317f31ddd9a3973699ec94615b808a2
 SHA512 
1a11069441a00246da74ca972111948c5fad45f55d71f77fd72677d716d796113fc540b0fc6340ca1ac2c1d9d94cc4cbb098bc02f41e29f2757e359bbdc3945b
 DIST gentoo-kernel-6.6.97-1.ppc64le.gpkg.tar 64450560 BLAKE2B 
326788d1bd6a7ecb87fb7247f31788e5314184f070515c157da045041f3d75fb876f8adc21384c4c74607eaa9a8cc23d59942e06a7d700bcdbb440a3e724f378
 SHA512 
6e714324bd66e0c01a9773f87b6eaa22faab976963a3702329b165fdb825e6f6bd08f63d4a1747258bd1b9054f4d10278d49657dee008fd650681c8bb88715ae
 DIST gentoo-kernel-6.6.97-1.x86.gpkg.tar 68659200 BLAKE2B 
2780039493f8f9a2794bf91ef5cc130a9fd84099ffd8b8e0aa13ab5fea5e6a13089d95d7076336c4dc115dedcfe56182192c42470dcbc8589bc0a0adbcffc91a
 SHA512 
d781d23c60ee8f558e17fb419a279bf9bf8bbc33fb26256dc659857c15387adbe92611d3b13f53e48276c5c4df83d333252a38dbfcd38ac3138c77f6e5602fd4
+DIST gentoo-kernel-6.6.98-1.amd64.gpkg.tar 273100800 BLAKE2B 
141b6f44e2335261851b29615bc5a707edb5f557320ef7820a1be10fc5b6b01ea6b18ea7c5c91fc02f99e9aef3f58f0f1c112157305397324bf26ba2b6c6d2bf
 SHA512 
551cea147f902b90a723cef511a1509b5de9382a740109b073a6575b2efa04f3b472a0a26a4873ad6cc34f6f2c8663d48e9fa33f138a1d68f4b375c19b755398
+DIST gentoo-kernel-6.6.98-1.arm64.gpkg.tar 246435840 BLAKE2B 
23ce5f6900aea4afe1abdb3dfc7e25a1565187e19bf328e96d92751aeaa479b783f520f1465da28d3029a3e042cbbcffb94b44992235d3317a736eed21e5aef7
 SHA512 
d990d72e8fb581ab693a39496a315edc1f106e5daea76f7a84701aadf48b246c0c9b6bc807be39d95c714505151b6c0c5120e65ecd38657dfbb8f032fbe67389
+DIST gentoo-kernel-6.6.98-1.ppc64le.gpkg.tar 64460800 BLAKE2B 
f4af9f4dedf64e0f31902253a3e86df11ab78e0f0c3758b66c6e79407c17a9e04be6727580ded75c1fabf5b84b86682d633bc81361c41dd20c4471f5b73873ef
 SHA512 
ede04e3e00277024c71765ea4f776fbfc118cd46b4e87840fffdb04d12d1e1d83407c65fee7a2f335ff4bebd0c37f0546fe95b4fda29a68f0663e462c654b849
+DIST gentoo-kernel-6.6.98-1.x86.gpkg.tar 68659200 BLAKE2B 
efcf64d077a2c6e0105476ecd083030a67324dcf30771ce841ae8124dfdafa9fc36d8e3ddae2acfc07b07cae163a8759ac52e7b776d2695d17094ae46d80f6e6
 SHA512 
739fd5cbac0c91a26ea5dd5ceeb7eb3ef30b1b1e140b91b011db15045dd3471d4e0f357c21704cb65db7e31f08d87ba60b63f406558c5fd22d85185d46040596
 DIST linux-5.10.tar.xz 116606704 BLAKE2B 
b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1
 SHA512 
95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
 SHA512 
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.x-sha256sums-20250710.asc 363219 BLAKE2B 
fb138d64943a152a066ebba8efd05f189e13596ce6320ea555768778c0e026b5a5996bd6b39e246213d7ae23483f06ef7194bd30dd6df20221d8472740154f8b
 SHA512 
2953049251b0b24edc6dba5aaacb28468704ca0a29330551146d8d5436315295d8b71dcddb1cbe1377379837e523e7b89c3ad6f37fde0179a070951052541863
@@ -129,3 +133,4 @@ DIST patch-6.15.5.xz 538604 BLAKE2B 
3771e14cb95010a9e553191af6888fa26dd5f1084c16
 DIST patch-6.15.6.xz 594816 BLAKE2B 
a77f3b6e07b2ad8cc300b411111aef0d3b3be06e10ef9ca94647c8ddd9c40c519a3c0111101c15da7f1c60d2dcbc39614ba6c479b2d3da084f04e913c9a9b5f2
 SHA512 
ea7ecf23eb43c85c2aaee5431b8ec4c459c42b27d4ce0ec3e4b191c467acac9a4411099d5ce4b653413fae9a2dda785668710057cd815710398ad376fc730810
 DIST patch-6.6.96.xz 4574068 BLAKE2B 
047878c4c04057b9d2f342850cbc41d0dc326dc9ad7421500cefc6e8c32a3a769b0f069f6348d1ea0663cf8274e6048a52d900cf48cd18c5cfe3e9808c5133e8
 SHA512 
dce4c83f605f189c8bf2fe0c96118ed56d5d686a145605d125e532e78417076f84a7d85e7b8bdc71d7b3c0c7594a82403d7a9231e61f88ee61a05b43adfb98ff
 DIST patch-6.6.97.xz 4603752 BLAKE2B 
5562f1de3aa015d670582b22ee3c8767258b28a150180106670993f7c4305293cdb3ad7ba80bc385bd6bffb90d6082ce3309ebc821481433a29809eca0a707a7
 SHA512 
cfdd3ffa11b598278031a62c39462a1a4ce46dd3edc1e104db101ef37f614875408fa89880eb91ddd4c64e63166aba603f25fe2633d297b170881006f56cea64
+DIST patch-6.6.98.xz 4604084 BLAKE2B 
80dfd1d02480b98e00fb49d45c5e1e86216f869608152aa507722b53acec38d9797e1dc8717936616427429410ffff765d69f65799a91ce54e76c7661d11e303
 SHA512 
08fe3ebd2c775cee5a9724448cff73c9358e7a630c45fd88d053e9baea15a5dcf88f6bbc4785b4c2919d1670878b53219d9d50acffe768c15e170aed46773708

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.98.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.98.ebuild
new file mode 100644
index 000000000000..7137a46a3116
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.98.ebuild
@@ -0,0 +1,224 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-install toolchain-funcs unpacker verify-sig
+
+MY_P=linux-${PV%.*}
+PATCHSET=linux-gentoo-patches-6.6.96
+BINPKG=${PF/-bin}-1
+SHA256SUM_DATE=20250714
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="
+       https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+       https://www.kernel.org/
+"
+SRC_URI+="
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PV}.xz
+       https://dev.gentoo.org/~mgorny/dist/linux/${PATCHSET}.tar.xz
+       verify-sig? (
+               https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/sha256sums.asc
+                       -> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+       )
+       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 )
+       verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+QA_PREBUILT='*'
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+       if use verify-sig; then
+               cd "${DISTDIR}" || die
+               verify-sig_verify_signed_checksums \
+                       "linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" 
\
+                       sha256 "${MY_P}.tar.xz patch-${PV}.xz"
+               cd "${WORKDIR}" || die
+       fi
+
+       unpacker
+}
+
+src_prepare() {
+       cd "${MY_P}" || die
+       default
+       eapply "${WORKDIR}/patch-${PV}"
+
+       local patch
+       for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do
+               eapply "${patch}"
+               # non-experimental patches always finish with Gentoo Kconfig
+               # we built -bins without them
+               if [[ ${patch} == *Add-Gentoo-Linux-support-config-settings* ]]
+               then
+                       break
+               fi
+       done
+}
+
+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
+               WERROR=0
+
+               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}"
+
+       # If this is set it will have an effect on the name of the output
+       # image. Set this variable to track this setting.
+       if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then
+               KERNEL_EFI_ZBOOT=1
+       elif use arm64 && use generic-uki; then
+               die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build"
+       fi
+
+       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