commit:     5b6754a66773beda1d8a0466fa142bf8979c8ddf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  2 06:42:36 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec  2 06:47:33 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b6754a6

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   5 +
 .../gentoo-kernel-bin-6.6.118.ebuild               | 237 +++++++++++++++++++++
 2 files changed, 242 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index b8c8c1975798..2884b41e1225 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -38,6 +38,10 @@ DIST gentoo-kernel-6.6.117-1.amd64.gpkg.tar 277585920 
BLAKE2B 88b2a4a8bd5cd1dabd
 DIST gentoo-kernel-6.6.117-1.arm64.gpkg.tar 247623680 BLAKE2B 
02388db1ae8e02e694cb280ca62d10648f5c72ddaa5d7f5f1ef88ab0fa0f158ce8bd22b1776d7294b6e0b67d4a05412ac43b7f25083667d3d8a08e750da7575c
 SHA512 
924cc6b850f92873515f26be398d17a71d4405fe513875cc2dcc202d8322db9c98819c92d18bac06f83eaceea6b6cae83c0759aa8f4ebe36705903f6b0742fcd
 DIST gentoo-kernel-6.6.117-1.ppc64le.gpkg.tar 64501760 BLAKE2B 
3412afe8c9f3036f42b65051ce2c476bced921b4cf15e63c8456a3f489325986f4c81bbf4fe1c7c1ed89c0762a37a1c2f7221df60754a223f608faaf6962eb2e
 SHA512 
6cd5a8eac39b88ff28a72eb8bd6085bd504a0624221f9e73db26ced7675c718e53b89d2fafb8a8bbdb0cf9148dea91065e67d65d15c05ddb88cb19debdf803b4
 DIST gentoo-kernel-6.6.117-1.x86.gpkg.tar 68700160 BLAKE2B 
6fdb8a3838d2cdda69771de0a3927ccc1e6fd448b3c811fed98a7bceb21b8ffacf0ccba8a8dd98a89ed4a7c6eb9d76818a36a88e8c82f728193f8c074ba2e5d8
 SHA512 
eb64cec4e551a2d0fe9e3ffb1635385c1719f078782079fdd02f9233df61c48a7f28a6090f09a8adc3b58beef10b952cfa2d9059a78495fec358e2a28a40a356
+DIST gentoo-kernel-6.6.118-1.amd64.gpkg.tar 277729280 BLAKE2B 
7e85b683203d99924e98c27619027f7206d46dcc17a1188adbc55f7b85f9a0eee56a8c92676fe47702a4ae2f33257516abc522250768ba82067bff5abcba3180
 SHA512 
a8bee64e4db28d81ebb4116ef0977aec581143ea5c9cb30d54b6c3f4299df44b65e5e38c62c212b8f1301f711686eb71d850398b6c68bf2e359baab084638fae
+DIST gentoo-kernel-6.6.118-1.arm64.gpkg.tar 247746560 BLAKE2B 
50c1bb6df067621e6238e63f1ac637f470f7a2ec7ed7f1fd5d0a7333ecc6b3eba08bccd72a4b7907d287af7215337f38dc6e9567fff2f70386fcc62b64e1bb65
 SHA512 
a82ebf5652e1c7f432161e8e2a5f7bcc247624dd36c932b90326a554ca7adf024c3d24c234faab3c7320fbb9f25d620c100c060b7dcb355b29522c060cf2ecf9
+DIST gentoo-kernel-6.6.118-1.ppc64le.gpkg.tar 64491520 BLAKE2B 
17b72671a7e1f5dba309f68486994dd277a70f7620a9446ef18af8d5c5a2f68319e9861d30eee6286ec8a44230f84d2e2ddec2228d2fd167df699c4011708f2e
 SHA512 
1ded3774083e19053c22fb701462eb267843ab6bc489fe418a83d1d23d491b607a7e82ef3c5aa793eec786aa996bb9f21c90831320440218985eef5992e92dd6
+DIST gentoo-kernel-6.6.118-1.x86.gpkg.tar 68700160 BLAKE2B 
ac22f3c78eaeef5372e215956b79021e0d3445838590e3576c31276a6fee831234114f608d3bacef889bd12f32e347d4880365552dbd9a74362af23a599eb180
 SHA512 
e84a6b1a889069756c6a0ad3b448c9db774c8dbac51ca0027d95b6f0e0c68b66b9bbc1fa8e279826b737b672cf676ae9da3a9fa21c9f0f96db74691e02d3735e
 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-20251029.asc 370785 BLAKE2B 
74fb714578959a8354e296e0c3c633b220f9ff9ca144177cdaee44ea10568d8b4666b917bb57a94b7384ba37b7fdd0d6b4b59ef059886a68c8fba7cf4905c23e
 SHA512 
df71b92fdb5f47bf7d24c228faa567f3a3186aba6b5e31b287578d9d94240aadee60fd37e6d70a17813fa514c481eec6cae71beaddbd71492f9841812ded9765
@@ -68,3 +72,4 @@ DIST patch-6.17.10.xz 806232 BLAKE2B 
49252accd7f37554a2783cfa92523dad3e39f41764e
 DIST patch-6.17.9.xz 764968 BLAKE2B 
a0ce8311be7c251ad21b7cc11be4f30ec5125e3763f97a750afef855be385a3ceae24df3b65b5dd751729575aa0cd254a95cbae0f2e8cc8f95539dcfa2d9d3a1
 SHA512 
35593bc973cc7f626aa7a41cf8b7dea1b46fe8922bd57194db363d26e8854af514d103e39d02c642c26748bd933d5e402ff89d2a20d2da5f8d901e4713eafc46
 DIST patch-6.6.116.xz 5054680 BLAKE2B 
0ff38d6f77204767a2a2f79080405634a53ee304754156fc1c5f0c8aa339b39b2382d3d4e33132a2a5c02d0c2c81ae07e20eb55ef76b62788411321399c49569
 SHA512 
60d1d70b217a4908d3b67b61596013b3ecc06d44ab095ad50accb21a71bb9b3d20128d38cb73790b9999e0e922092c06a414cad0efaab4c1739accc7cf8b5510
 DIST patch-6.6.117.xz 5149968 BLAKE2B 
5557cb9181cb2885ebf7bda52e37c69b91f6be11b8338b8ab5d691d3786a0d1ceac432062a2954256203a63c19277725a915284c520cfd7d1ef72df82ba41ccf
 SHA512 
387d134e42416f90a32b349a5c941ad99d135cd57388fbd90ca0479b0521bb1aff0f3b8f6b8af6f9d73ed0f0f83ded8728300bd99c63473cf62a0f700d03de25
+DIST patch-6.6.118.xz 5155016 BLAKE2B 
3d5ca3e87d1eb8605d3973347e551ba0e3184aaeba6f895872838327cccf7a2046f53f8586db547fc9c2e38586e630db9274a2347d90896f7a15730b247cb3a6
 SHA512 
d692a749b9b7b21a50f6bb404b3da9f77b529e855167f633e4a70e177f358cb1ad072edba6512ed37fd04c0fa986463e5bbb34472555b419ef71fc946a487eff

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.118.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.118.ebuild
new file mode 100644
index 000000000000..0466e12e0fa6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.118.ebuild
@@ -0,0 +1,237 @@
+# 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
+
+BASE_P=linux-${PV%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.6.111
+BINPKG=${P/-bin}-1
+SHA256SUM_DATE=20251202
+
+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/${BASE_P}.tar.xz
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/patch-${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'
+KV_FULL=${PV/_p/-p}${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 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz"
+               cd "${WORKDIR}" || die
+       fi
+
+       unpacker
+}
+
+src_prepare() {
+       local patch
+       cd "${BASE_P}" || die
+       eapply "${WORKDIR}/patch-${PATCH_PV}"
+       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
+
+       default
+
+       # add Gentoo patchset version
+       local extraversion=${PV#${PATCH_PV}}
+       sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || 
die
+}
+
+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-${KV_FULL}"
+
+       # 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"
+
+       # Override user variable with the cert used during build
+       openssl x509 \
+               -inform DER -in "${kernel_dir}/certs/signing_key.x509" \
+               -outform PEM -out "${T}/cert.pem" ||
+                       die "Failed to convert pcrpkey to PEM format"
+       export SECUREBOOT_SIGN_CERT=${T}/cert.pem
+
+       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 "${BASE_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+       local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}"
+       kernel-install_test "${KV_FULL}" \
+               "${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+               "${BINPKG}/image/lib/modules/${KV_FULL}"
+}
+
+src_install() {
+       local rel_kernel_dir=/usr/src/linux-${KV_FULL}
+       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