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 C6EE415820A for ; Sun, 06 Jul 2025 17:50:05 +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 B31D1341EC5 for ; Sun, 06 Jul 2025 17:50:05 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CC181110565; Sun, 06 Jul 2025 17:49:47 +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 C5ED9110565 for ; Sun, 06 Jul 2025 17:49:47 +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 71EAF342009 for ; Sun, 06 Jul 2025 17:49:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 42EE72EDE for ; Sun, 06 Jul 2025 17:49:45 +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: <1751824175.7d5522eae3530c4f2d1235ad063b6a8ade4f45d1.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.15.5.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 7d5522eae3530c4f2d1235ad063b6a8ade4f45d1 X-VCS-Branch: master Date: Sun, 06 Jul 2025 17:49:45 +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: 453fef04-220a-44e2-a55d-3331728b91de X-Archives-Hash: 7831bad24c63df1dddb9cb93ebb2b41c commit: 7d5522eae3530c4f2d1235ad063b6a8ade4f45d1 Author: Michał Górny gentoo org> AuthorDate: Sun Jul 6 16:09:04 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Jul 6 17:49:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d5522ea sys-kernel/gentoo-kernel-bin: Bump to 6.15.5 Sync to the changes in sys-kernel/gentoo-kernel-bin -- notably using upstream patch + Gentoo patchset. Enable verify-sig. Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 7 + .../gentoo-kernel-bin-6.15.5.ebuild | 216 +++++++++++++++++++++ 2 files changed, 223 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index da31ad98b870..cb196b536316 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -56,6 +56,10 @@ DIST gentoo-kernel-6.15.4-1.amd64.gpkg.tar 326184960 BLAKE2B 5108215e610e0233a6d DIST gentoo-kernel-6.15.4-1.arm64.gpkg.tar 289341440 BLAKE2B 70cfc5ba7e94c9c6cf254b2276f60636c77b322fc54296feadc6d71d56b555e452c74bda73f66fefc03d35575be20ec539e5585153c608e551f60c1e3b1560ea SHA512 2a95afe61f6be7ba56f6b01f3404230f8d494843c1c9bd987b791848c524dbf85d23d810ae88f82f83bfc8494a1e1f06a3ccf75da89127ba340cabefa527186e DIST gentoo-kernel-6.15.4-1.ppc64le.gpkg.tar 75223040 BLAKE2B 2453f2bc22b1094d2d22141a12461ba97625db960040d371cbed7997def92c50df4f65796f3640711be0b5ff673bdad2e6a5f3152cdd2cdd523ebe1d9f91c63f SHA512 2cebdd9e12e8ca6c77eaa57ca09f32728f2c6ce3a5be09a9eda3e3f953c44861552fed6ccdeda1611b1ed033bff09df77d894ac0c04c9196b4b5f9f2bb95d131 DIST gentoo-kernel-6.15.4-1.x86.gpkg.tar 81827840 BLAKE2B ba7ce6d13a2b4c3d6a4be97a4b6dedc4579e29576b401037303d753b43be40678df99ecbd30a99a2429e3df535d05d9993e01722943b8f6d276a31438f42978c SHA512 743094e2ad5343b9d2ba209688060076721c0b8017cb6937248b7b542596bdecb9d9deffbf00d804f4f45064120d41e4a7cab435d0176f212833ee240e514d00 +DIST gentoo-kernel-6.15.5-1.amd64.gpkg.tar 326092800 BLAKE2B 413b41db226dd1750dc50f0fb7d0b15ebef887889b2a23ace803e48796c3ae5b650fd3b907fdc5cf37393cd40f82793496992737cbbae69a095ad704555c2fd7 SHA512 7bb8460706c52aebe718a5fb0165e7ee39f54ef2f7b4282115425a7592ae2b8c2005657185f8edb761a24f8f497969c8f4b1318e92c00f25878d6fa765397d0e +DIST gentoo-kernel-6.15.5-1.arm64.gpkg.tar 289474560 BLAKE2B 0f7f5ad0def85fc5749e6c13f03972bb47d7cd0198a30e32d56295e8df64f868addbeaa5bde9cc3452851b23bab0c5ae990bc7c2d243be03bc5c074de48e449d SHA512 9c752d03c551683cb6ecbcf8d466b97e60852490cd0f0505ebfabf94e554f92fcaff52a0ce39e3059f03b7ec6af506267516e0960f8fd2c317c0419969acd8dc +DIST gentoo-kernel-6.15.5-1.ppc64le.gpkg.tar 75233280 BLAKE2B b9d01c54028e742aa481b8fc2b3ae386ab7deb03ca6fd76d6e1b91b37c8e306fd4c4f65f35c48ff80f4e81f4d6cd04f5f096b74650f89af292e7b42246d2b16c SHA512 ee23db323ca752da3c146a869b63d49b2d2536060a985493d06dd1e884e1f64ae1497994ef409e1b227869b0a3938d50f52c1c47182fd552acbb3729845ac2c3 +DIST gentoo-kernel-6.15.5-1.x86.gpkg.tar 81848320 BLAKE2B a014c0834c2deba2a3839e3207e10b690d52268d4869ddad13b9c5031a95e2af4af0f1b981c36c4dae5b05d4c829301a4f37901f5d26efef7825506d59f53f68 SHA512 b7a472f190e54beff4e9026e6356659060786cfc1d8fd36ced061245e8b830bb6dbcebc164bac18d5cd14951d75e477fb7e180ff7a63a8b9b2797281b9418131 DIST gentoo-kernel-6.6.94-1.amd64.gpkg.tar 272906240 BLAKE2B e6b037f7cf591b6ca593a18cd871762d605687a6b5e4151274eda41eacd48c04284a17626b5169c6038df60d46999f45edcfa3f21da46a1074b167411be9ae25 SHA512 ed3fc4913989f82719d4684a3c0f5128930c29a870d3af0827b0fe63d6828442528772313e1c8991ec707027424b40e05bba611cf1af03d22a9649258074b01d DIST gentoo-kernel-6.6.94-1.arm64.gpkg.tar 246282240 BLAKE2B 172a5000488d86f82629a096f9afbbf91493f048838906399076cdc1fc220906cbe330251f9dfbbc7ce0b8a107e5c7a0c439eabce66af31c5396cde14cb625b4 SHA512 df52e7905567df5ddeec5bd28ec0949afd4961e34210f0aaef942b5ac6f635b4d61279450c774906f0a73deac633631c9c9946e06dc13dedba266a701db16a45 DIST gentoo-kernel-6.6.94-1.ppc64le.gpkg.tar 64460800 BLAKE2B 69d9a853f6b530634e01791e420b1d382d63b58c2dbf32c95ea7f3979e77bc1c440bcc53e15b1037bc35ced38a670822c9f0c1cd712f08fe32c1d5e11de0bdde SHA512 fe235f7afc4c5fc7b7a68c99d3531abfa18e04c373e1025ceaf79e509fc238ac1994ed0d5411a6a9d17ea3a01b550b30155b19aed81a2fec6b91090db314782a @@ -70,3 +74,6 @@ DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e SHA512 a37b1823df7b4f72542f689b65882634740ba0401a42fdcf6601d9efd2e132e5a7650e70450ba76f6cd1f13ca31180f2ccee9d54fe4df89bc0000ade4380a548 DIST linux-6.15.tar.xz 151168812 BLAKE2B 465596c6dc053ff3a3966302a906d3edb4f7ee1ef82f8c20b96360196d3414f5b1deeafa67b8340fcdecd3617280ba9b756d7073ad15c707865e256397b4af53 SHA512 d03788ffa8d8ae1b84ef1286bb44a08fc01432e509dfec6cccae5c5a5a47201d378aec2bcd21e6f0bbd1e625b26f47780c06ee9c1cef3775358f98b160923f30 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35 +DIST linux-6.x-sha256sums-20250706.asc 154698 BLAKE2B 8c9f6fce58842bff04a7e67bfa4c526aa4f96e330eb1f340eb4a27255c7c3755143c3bde4b4d4e1a62a73c750bd940ef69902c0da37c8a0a308843bc978dc06d SHA512 4798b646ed4982fb2024f06f346cf0eed66c94dd1ca1972171101b6848a476b85b9deb5937421b643fc760171a246e348b5fb0809317be82f849be4db81fa8eb +DIST linux-gentoo-patches-6.15.5.tar.xz 83692 BLAKE2B 0b0831734f25b00a3523592439625342d12b0361b56e4d8243f94c045a27eeedbc02086032f01240d26807721d55d8a4011513b5610d1bf4889e35b7ac171afb SHA512 876750fbfb36f75ddb69026563a2d43310e116c567491a5428da30383a38d9384b97455c7ea61a1faa949b44dd22f402262c63a3701568ef3f8ab2d5f67f6c0f +DIST patch-6.15.5.xz 538604 BLAKE2B 3771e14cb95010a9e553191af6888fa26dd5f1084c16a1df3aad97ed2a03de97cf1af8562a1b7c0d1977dfba1f3973e03079278b72943ac104c4208e1eeed315 SHA512 ff35f126fc24cd9fc2ba7dafb10e2c4dc4643a2165893d6dd07ce0ab49bf33d4b67ab33b32875b74371749b5e6f93a061114c9837bdb48203d50b5ec55db5a65 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.5.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.5.ebuild new file mode 100644 index 000000000000..8bcdb837287d --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.5.ebuild @@ -0,0 +1,216 @@ +# Copyright 2020-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_EFI_ZBOOT=1 +KERNEL_IUSE_GENERIC_UKI=1 +KERNEL_IUSE_SECUREBOOT=1 + +inherit kernel-install toolchain-funcs unpacker verify-sig + +MY_P=linux-${PV%.*} +PATCHSET=linux-gentoo-patches-${PV} +BINPKG=${PF/-bin}-1 +SHA256SUM_DATE=20250706 + +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}" + 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 +}