commit:     3ac4769a43376fd330b68aa6f8f5c660bedca41a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  4 19:07:06 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep  4 19:09:27 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac4769a

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 41c368ef6344..d1fc9f0eb5db 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -86,6 +86,10 @@ DIST gentoo-kernel-6.6.103-1.amd64.gpkg.tar 274186240 
BLAKE2B d63780720fbad4f9a7
 DIST gentoo-kernel-6.6.103-1.arm64.gpkg.tar 246988800 BLAKE2B 
222357a5dfd09a7d3c304ab7ab269a315d066b964423b015aa582625882f146c40b11452054c57be6dd73b6ab560234f0058c9d294e1b6f40e053d3417b90151
 SHA512 
d7d2697e8c70d7c90701cbc0cd68a86ac0c7ca82429b1e1f291fc3463f6d7a00d3469ef6a9e5e161a01c478b8942c418b62a199cb137b1eed9ba0dbccab170f0
 DIST gentoo-kernel-6.6.103-1.ppc64le.gpkg.tar 64491520 BLAKE2B 
16384853fa373e36f2b32e2e3fbcee80e209a7d41da0ba8ce8ac89c5e37ea7e95870ffeddab673c5acae37ba8f974a1fa908107278595bf0d38c9235c3299b6b
 SHA512 
86259e47edf68d2d14aac5aded3ebfac25e06bec531b5d3d68eb8c02c79b92bd7424ec6615901e07380aaf6874780e5cd9071e6bd3ea123276ee6f53a70bb9b5
 DIST gentoo-kernel-6.6.103-1.x86.gpkg.tar 68679680 BLAKE2B 
a9c9608d1dce1448655c852a3e28f99eaa48db0624b0995d61691c6631fe36bb1312d0cacf26fc3f3fa65476a912dfed84048bc0d87781f2daf2df641796f504
 SHA512 
3380b72da4e3ade25a962800edf2726492b564a42c141b3312d0c7499ca4c62cbfea5a92c0c16e4bf2b0387161c66775f93f3a58a5d2d9802027eceea6573189
+DIST gentoo-kernel-6.6.104-1.amd64.gpkg.tar 274176000 BLAKE2B 
919478e8c70b5dc2b9f39d8da4bd8bc3686eb29b77845fcd88cac3e2df7996179f53071f649a779ef6481ee20864b3b304c723afb72603e5ecfa511558eb8d28
 SHA512 
01eefed78ab605fc69954f7d9f996bbeae8b9be3a6bb9c500767a076a1684aea98607ae68c16591458daad07ffaacaebcf8e9d89d9333dd898aec65d2dc2708a
+DIST gentoo-kernel-6.6.104-1.arm64.gpkg.tar 246999040 BLAKE2B 
c6543ed556f5378c6204d9246d9e8784814f36f25c29504ef6880ef6f8a1b0aeaff5571c83292ff349860ffc67952ef2b273257c3a6faed603fb4655c0bdfa25
 SHA512 
6aeb14215141d3f0668aa84623a824068de9795e1da90262c93fabfdd1438f30bf6ff2a9a7d8464d6530f4486425a637a3f972433673aaabd622a61fb0920661
+DIST gentoo-kernel-6.6.104-1.ppc64le.gpkg.tar 64491520 BLAKE2B 
1498c714beec008e8686f03eb281a25220f1bd26d0e859e6bb348d68b839c74e1bb7f998d7ff63471f36d62c21b44f26853a61f9498cdd85b9c964d24f8ea22d
 SHA512 
67f9799f7eb1f123f430f8766ddd38a8626c612b2e000bb4d3b45eb1043f457ad3ae9f87e46a3b7f6de1fd15e11961fa6dd89b6370939f83113d13edf0c288ed
+DIST gentoo-kernel-6.6.104-1.x86.gpkg.tar 68679680 BLAKE2B 
12b84cc1a28e11e51800bfe535cb9715c83148a4625bcf93dfc269c2a7aea7d96f9aae4dbeef956f856644f312b5b32b59b11d5e404a1accde5ba66a10be7250
 SHA512 
8fdf3dad988984a03c7987c8849e8c743aa8ba72388e196d792dde0d8a161b01e0104e2f1ce2d5cc57146840048b6ae04b5256f691da0147c5f5906df0de5e42
 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-20250717.asc 364595 BLAKE2B 
75abc4c666dede398ee54a7323380496f75cecb9439261305a60200169430544eaec7bc9e6ee3d4b1beb667d51cb6c858ebe109e3a9446667e9b1793298aef08
 SHA512 
1d52b1dfc0da4d287f4d1d02bb05a38c24f5505002c567bedc48b4bfd523a2135bdaa8e103c75e7bf521d356b66e7b36009054a792d8eaf3034ae1ef09fe3ff2
@@ -135,3 +139,4 @@ DIST patch-6.16.5.xz 593096 BLAKE2B 
d31bf76e05249e8414b1df045eff96015b6b47b38aa3
 DIST patch-6.6.101.xz 4660596 BLAKE2B 
3b02a5a37a67113ec35d647bb13f729fa0b883fa59b004e7b19b401bed374b700ef806f27285c0951c2dc8cd3e0af16ae7d9fc3268b4f5020eafb1d0361aaab8
 SHA512 
bcb5671c660a84f34556210dd525c6b38f3a9cf6c78bbc6b7d936f8efeb3170b27bfbf4a343b0ac94659cc63a35c479e1e158ca35043d5937eebbaf4fd8cadb6
 DIST patch-6.6.102.xz 4713208 BLAKE2B 
8790f52d46e96c3e4ac88e883dd9bb1875abef3ca0a860fbd348bd6f6857465f0da53aae376df60b9a0e22451a2303d2ddcccc407322d3cd0659344a5acd589a
 SHA512 
97bb31a9aa4e417145d951bdd95a7c1138ec13e66e0869362f209be13fb638e09afbbdbed4b0dc01c2550d061bf6526ae4123760d9e00d1a464870329456d958
 DIST patch-6.6.103.xz 4835452 BLAKE2B 
477d10f8cc23326a6c6d195529327546d3addf11436c6696ce4f3b1c8bae1622f04da0abb6cd257126db4fe44408466b94a16400ce8b29b98421297cb0e0f91f
 SHA512 
305eb896563c19b6d9cd9a4faddd7b39b41a651f64dfee017364cd18c962f6e1c1840e8350532d13007afbe5d89bdfb8a982c328586ce1d2e7e3f199836654aa
+DIST patch-6.6.104.xz 4851576 BLAKE2B 
80d56cbc928370fc31c79cae2d0d5381fe784df2b08d6ac0c921ca328f81adea365eac545765b8bf69cb92a7d97a398bfc9cb02f1f643689e3f02c541e925d37
 SHA512 
bc16cde26764f633b6053df1d5c569698e41b7afb887a377ca8c935ee4d59e0e800cbb6aa0031ff386afe7f4990de9653aa9c03940425adfdc35600b5715edc5

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.104.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.104.ebuild
new file mode 100644
index 000000000000..e758730f5935
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.104.ebuild
@@ -0,0 +1,229 @@
+# 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.102
+BINPKG=${P/-bin}-1
+SHA256SUM_DATE=20250904
+
+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-${PATCH_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"
+       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