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 7E5251581B9 for ; Thu, 02 Oct 2025 19:28: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 6A3B2340EE5 for ; Thu, 02 Oct 2025 19:28:38 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 24C9911057A; Thu, 02 Oct 2025 19:28:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 14AEF110579 for ; Thu, 02 Oct 2025 19:28:22 +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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B65A7340F38 for ; Thu, 02 Oct 2025 19:28:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FB913A93 for ; Thu, 02 Oct 2025 19:28:19 +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: <1759433293.02c546334f4a35195dbd2bf7f81a90b6aeec9643.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.109.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 02c546334f4a35195dbd2bf7f81a90b6aeec9643 X-VCS-Branch: master Date: Thu, 02 Oct 2025 19:28:19 +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: c73aeba5-1d35-4951-a257-b6b42483d763 X-Archives-Hash: 64323ce27aba3c6f168dada6b2ec52a0 commit: 02c546334f4a35195dbd2bf7f81a90b6aeec9643 Author: Michał Górny gentoo org> AuthorDate: Thu Oct 2 19:18:08 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Oct 2 19:28:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c54633 sys-kernel/gentoo-kernel-bin: Bump to 6.6.109 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 5 + .../gentoo-kernel-bin-6.6.109.ebuild | 237 +++++++++++++++++++++ 2 files changed, 242 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 49ace6438536..ecb9802c3482 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -86,6 +86,10 @@ DIST gentoo-kernel-6.6.108-1.amd64.gpkg.tar 274493440 BLAKE2B be7230240e5b433732 DIST gentoo-kernel-6.6.108-1.arm64.gpkg.tar 247388160 BLAKE2B 337077a2c515f12f37947c7da20d35f543d8cc90448cb61ebc3527a7da3fce61f5742079b2e4c345837de9548194bef2a4e027b042cea4ae5b3cb226942fbfef SHA512 3da3e63923cd4c54b808c3853991d7c8740eff0a9ec4a9bc3ae5f8deed6cbe458f1c8250b2ffbc517336c1e8b9f11e793ec26aaf7458d891f034cd8fa0684bee DIST gentoo-kernel-6.6.108-1.ppc64le.gpkg.tar 64471040 BLAKE2B 3be32ea299b4089a623fc9bc1b539fe8ac1e28a7ac8840a958d733d9ea3ec437e98dd0f031c5271eaa68d053eeaf6fe96c5f5d5c639d3cb547b0080bebfbae7f SHA512 c4ce2595110fe4f345b62ada94413e39f16043323ff61535ed3358c7dad78ee51956145ad405a64b38cd8bf536b61cb66f6666d623facf2c79e12d9c223d01f8 DIST gentoo-kernel-6.6.108-1.x86.gpkg.tar 68720640 BLAKE2B 526e55dccb44c293f9352c65f217d0467f2c48d9ba20b434341f23011656bc61d87ca8dd926d2a25bd0848b94f8c4debe0bef4a3db5d9267d7be652e87e360fb SHA512 0374b748de402b98cf2be016e44b110bf4644361c5f00822b58656fdde09654bef8ac538dfaea101acc019a0e47cb41b232b6dd2840dcfc6bf4e3ac5f6cecf99 +DIST gentoo-kernel-6.6.109-1.amd64.gpkg.tar 274708480 BLAKE2B bec77256b0fce8e340606bfc56c42d2d0d7496b3cff63a323fdc05cdc2266b0a8487318a80232fb143a7743f62adee5b44ec1c5935fb501e38066e3c085ba670 SHA512 c8dc7bf956f16efb030eb789f39825c198d7f1e187c4f5ef749ba39e6a91c64446e0bce217b5df6556beafc7b091c6bfdbb7d4039eee063ae1e995bf06972450 +DIST gentoo-kernel-6.6.109-1.arm64.gpkg.tar 247623680 BLAKE2B 72d6541f6676e50169c8a909a67e7b5d6668cfbb35159ecc1d413df3139e78402512021bcd0aa5c93a5c6595218900ab5fcd6d2a3d037a54009959188e73cd10 SHA512 730d05e0abf82cb917d18c6a4e402f91d558c751db6a066b0b4c195c38a22bd4f7095baa2b9abfb48507ea18cad6b961d94d89c5d1fe6b49ecb9895329796940 +DIST gentoo-kernel-6.6.109-1.ppc64le.gpkg.tar 64471040 BLAKE2B bffec7401535107c7c124dc46d9a25e7f5871950e0d18a8377c20af8917b27eb100fc00a447033f802294f4afc0a5dca08a712db03b2990c555bca9c93f3279b SHA512 7775d9469625d4ee6e11188847b41d7ddce84ff5e4c625915c9cb693c15e06b879e5c96fa059c2151576e0464f3f790a5152b4d1e7d6e835842ee7d76a5fe5c2 +DIST gentoo-kernel-6.6.109-1.x86.gpkg.tar 68700160 BLAKE2B 3bf02bdc6c0ca2ee6776bcb07c27056e87958c827151cff23000185a005a1d8d25e23e8d3733a18f7fd6897e23513b2a2d6619c4c80a42d2e0c675645e793844 SHA512 81d514b00f05e2b2429f5ecd8d0523fa5a6c641b15ad18a4ba76b4c7bf863bb408ec9fb522abf38dd210b47de3513375c460139e7701eca203eaf115a744ca7e 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 @@ -138,3 +142,4 @@ DIST patch-6.6.101.xz 4660596 BLAKE2B 3b02a5a37a67113ec35d647bb13f729fa0b883fa59 DIST patch-6.6.106.xz 4880660 BLAKE2B 3205119e8c10be006eb9f5c455a6fd2cec6b98f351e5e9983c6303f11b5f8822f73ede0dbc95c390736ddbd90bd2ca6383e3737618d108ffe3637d38dafad762 SHA512 e4a2bbd7c0f6a5a875fe4bdb1fbc82ff54a7d8a37f0c8cf04e6222a2be3d4579458bcbd87736b9fc95058f79a5181a381d40dc4d5b69761378eae29dc30349bc DIST patch-6.6.107.xz 4898532 BLAKE2B 5be64e27df6d78bd192913d6196a75530fc21fd9863426e08fc09e968679921eb706703bc159ddf57bc4c6aa4240a77b9b4eb626569c84c7a97ab834df76ada4 SHA512 84c59a8d255e91f0ba1356ea16e16e9a29e078ecdd7ef368fcd501679e2edb17e8b41ef42feb7f28a32b7b02fc63427d7f96594ca22e0ee0306d02054e173fcb DIST patch-6.6.108.xz 4910552 BLAKE2B 6d482fe76be8b11fc931087537872b2a5b2ef862c8654be312d8531cc6bb4508a85fbd3a91c67f17190a42f0c6e0a540f27391aec3b4b81308c2ead7c43e2ab7 SHA512 fa31c0f6c378d80723c8acecf2e7dcd49028136d21be0596679d4797efcdc257a0c8994b91ab428934678626d14a01a27648aba48e643ad179cf2ac0b4220335 +DIST patch-6.6.109.xz 4925652 BLAKE2B 1eea77c0d6966963fa61546aa5a2e4deff3145a61e0b3ddc2a179222aa736f7f65d8581ce4e549bf2d0a76b679dda6c0a2970e49036b8a6be8c9104a390d9fd6 SHA512 a3c9fadf8d6c55c569fc388c3585ef571a958eee3736cddc900beaec14c3b59e78ad3e38493177d35322f3f840f6f372c231bdf5272243e6d831590499d8c6bc diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.109.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.109.ebuild new file mode 100644 index 000000000000..1d8b79879fb4 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.109.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.107 +BINPKG=${P/-bin}-1 +SHA256SUM_DATE=20251002 + +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 +}