From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A56C115827B for ; Sat, 23 Aug 2025 14:46:38 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 84032340EAD for ; Sat, 23 Aug 2025 14:46:38 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 8618F110562; Sat, 23 Aug 2025 14:46:30 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 7C0C1110562 for ; Sat, 23 Aug 2025 14:46:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B778340D19 for ; Sat, 23 Aug 2025 14:46:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D55A34CA for ; Sat, 23 Aug 2025 14:46:28 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1755957523.4827561825b1d9b1865052c7c0fc8ad38eea362d.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/gentoo-kernel-bin/Manifest sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.102-r1.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4827561825b1d9b1865052c7c0fc8ad38eea362d X-VCS-Branch: master Date: Sat, 23 Aug 2025 14:46:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 363c051b-3d4f-420e-9ad7-3f1fd3ee56e5 X-Archives-Hash: 9a0c666578e051786bca4102643d8de9 commit: 4827561825b1d9b1865052c7c0fc8ad38eea362d Author: Michał Górny gentoo org> AuthorDate: Sat Aug 23 13:58:43 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Aug 23 13:58:43 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48275618 sys-kernel/gentoo-kernel-bin: Bump to 6.6.102-r1 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 5 + .../gentoo-kernel-bin-6.6.102-r1.ebuild | 224 +++++++++++++++++++++ 2 files changed, 229 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index d43b64034da9..bff07df9427c 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -58,6 +58,10 @@ DIST gentoo-kernel-6.6.102-1.amd64.gpkg.tar 274124800 BLAKE2B 62ceff32edb46be1a0 DIST gentoo-kernel-6.6.102-1.arm64.gpkg.tar 246937600 BLAKE2B bc326975a95eadaa06353ed750fad528d97d65c9700484644f98ddd666d9fd532e355a238282be0c9d5be6eddb720d2942673e74cbfab3115b8d160fe1a0dd75 SHA512 bf6c6b9cf0aeae80e7f876c093cfdd3fdcab675661c2dc7a1fb36bfcdc7614e85c10e67a1f4b31f8c57e9eeec43da016afbd72ac51a612aae91822f008efeba2 DIST gentoo-kernel-6.6.102-1.ppc64le.gpkg.tar 64471040 BLAKE2B 13aebfeff9aac2de0e99126fb9e33c66df9b329d1dfb0ab4c6f43cbc8944fd610e1aef65aae3b5cccbb1777a626b28bb2dca18339b7c0b8c5a8f7c8e8fa6b54d SHA512 437db82026fab4226d98dc57d3aac581f1f1c780379e7a3031405b839feb83976bf7801945d8862ac1e21a3504d665254f55d537a3493aac31b9e75ddd48751c DIST gentoo-kernel-6.6.102-1.x86.gpkg.tar 68669440 BLAKE2B 557240f7f8e6057f5ae4fd120f825621cf3480af3c14879a35560ce77c1986589d5386658aaa8ef526cc88a61b340dbd48bdf57302a91323760eb8f074903100 SHA512 71e069dbd2a171f4f3d273123f4ba17cf4f67e2535fd447ed08df4c6aa13ba3d812144baf81bfc6544dd20c04d5cb94a5f39b60dc3c7b9322b8b2ab86d36eb65 +DIST gentoo-kernel-6.6.102-r1-1.amd64.gpkg.tar 274135040 BLAKE2B bda878ebc196cd6b77890a230953c011392c0abbe9712a1124cdb8b968b3d6ec5665a1a0c834de30f0f687858aef42c3d83f2d3f7722822db59ffac6a468971c SHA512 1964ca63d715dfc3cb15369bdae929dc6779df3e7b963ab125903b9f4df83050740f0eb6a3a7564b25f3e27986105b8e52716743bed0f4bab3b4fc3a4bd9f9da +DIST gentoo-kernel-6.6.102-r1-1.arm64.gpkg.tar 246927360 BLAKE2B 4a056a3c39df9d56709f4a4143d6af6b87f66bf6d9362ba920885a53fd1f57ca355b5c3b55236d4c791a7243b2dd4efca49b0c3b8f100222dcae614d5da56691 SHA512 0558d2f1f118ee2bcc252e254f022082f238d8ebaab412b5597413750236acb157ecb0d392b4d9d44c4cd4e90d803b5e486ea2efa9eaa5f3064db73a13598726 +DIST gentoo-kernel-6.6.102-r1-1.ppc64le.gpkg.tar 64471040 BLAKE2B 2d1e5f18147eb25af496f7dc8115dfbec55e243e7d2fe47072c920a19a8b99b6097a8a37a9ff6971dd66c19e10f478a0c92d984827fc21e2377bd8b744fb3201 SHA512 e5cf96f1d7b2961eefb90a25d8513c3f718c9385765c9d6e1d578c5797b5404f3c7c2f06c0c66650dc07a94f5094866d73fe08814d6440f7c3df271ad6322a18 +DIST gentoo-kernel-6.6.102-r1-1.x86.gpkg.tar 68669440 BLAKE2B 42d6ba9a695ef6fb2111261409668a35c7786638d5357b3c8f75d45e8beafea88d757fa0e788d25c08608b36d76a57a96d4fe354c1c24b59246ae9439eef5ccd SHA512 74259a7ebbb83ba1d9cab5d19473a6820f6fb60b7f9e406a20ff4b42d75a4aa4637279d9e9ca8e7720d47f0a051a7602c1434d20d5d1af5f7c693d933343b1d5 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 @@ -80,6 +84,7 @@ DIST linux-gentoo-patches-6.15.9-r1.tar.xz 87392 BLAKE2B 68051079724733a470bba02 DIST linux-gentoo-patches-6.16.1.tar.xz 87724 BLAKE2B 3137ea2f6b1784ae905d92b4704068764d1424e6ce315deffa4328c74da6e4aa9599074e621a8e2007c019024dc7802a3a1198e13ca1b947ccd20eafc5a6e8f7 SHA512 04268c577718622e1cb5f6154d0c944fef40de9293d4ccc7d9c078ef695f9e51d75d0715fd4b2a8ba2e96b3aa6ce4e86694c61d88b6184bdef65a0aa9033dd50 DIST linux-gentoo-patches-6.16.2.tar.xz 85676 BLAKE2B 31adfc6ebdfe2412c1576734351a6ff5bc0c1cae86e87f3cfbf555d07e8441c64bd0e31f3760674e931a510a9401935dee46689eeff6f5ee5c28029a889a40cf SHA512 aa74585b4c71202176c851cc2b08569a752da58f5a43c5b1fb3dfd59db8ff016907985d448c51f4163b951a5bc500b81eca647e1b6a7c20ab7287292d4c2a3b8 DIST linux-gentoo-patches-6.6.100.tar.xz 42828 BLAKE2B e9d17c21e5355919e30e1a93178d3977d6ca1bf964ba18b601518616f31e098d65cb5008003fb6c8e1a8a5cc3ed803eaef3e1c9af5f1a895d230f172412b1283 SHA512 95c2790a5ebcca9f2b9e1ff098be0bcb9ef60f134a0f955995f27c020cff0d6831fc1af7c159b0bb918d3e3eba351f9428458d6e6964e9e751bd85afd47f7a2b +DIST linux-gentoo-patches-6.6.102.tar.xz 43900 BLAKE2B 119b27bfae8914cc13dcc64203bf4c6f57a6f4713eb84a19980a17be0a121658b5ed4d7ac93ba94e60adf4bc1134c7c1f174b6ade123ece292ef39911afb74f6 SHA512 a5606b750c6018655c7bf6357805afab65e08eb8a9c429cec927b1d79ee6a0ec9faf4734445ff261870953d247920f2bdb5cf199e937a8e272062f6609adad4d DIST patch-5.10.240.xz 6786568 BLAKE2B 1cb287b2c99bb403585cad3500a2de0819db40ea62a72d276c2b53d8637915cfc0350051bfdfc99cbb56a4e839331b7e11cbb2abdf6768a683d44e798ee5862d SHA512 91f059de27701a33e5c4d40f2d3e982dc60d9dc14fa8cb6a0bbd49e4452195715f0093a563e3a1db1efa37b3a1e09e74b0a6d53f77357757ffd29374abcead19 DIST patch-5.15.189.xz 6955776 BLAKE2B bd2bf4ad70014395ffac8874434b2caae7823b1b9999231738552d9f23a53547533c248fdb7fc4b4bdd60dc05e8898a910e3e94e6f5edae7ae96a66937f387a2 SHA512 8ace7d82af676b101ed37c382c9833193ab487cbb15b8444b92ccf8239e2c62bfb70ef7342ef6f694d71e8ac72b7db445d544e4ad285d9bd977365350bf155d3 DIST patch-6.1.147.xz 6320180 BLAKE2B d109214e0682653ead5f62f5699d0bad2764bae1765789720d780e74afefadc39faf8e833df1ee4cc1436e4db5facbfc7f4ba8c3b657fc48aabda3ab84a4b540 SHA512 2cfd04771f982da4b65caf53cb944bf9ae2888a32005428adce383c408c35c72bec5d88e49670deb87011f0d6bc329e0a53adcad065aaa716ad5c8baffb2fddf diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.102-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.102-r1.ebuild new file mode 100644 index 000000000000..784dc0926d7f --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.102-r1.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.102 +BINPKG=${PF/-bin}-1 +SHA256SUM_DATE=20250820 + +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() { + local patch + cd "${MY_P}" || die + eapply "${WORKDIR}/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 +} + +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 +}