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 2B20D15806C for ; Thu, 10 Jul 2025 20:13:29 +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 11C003421CE for ; Thu, 10 Jul 2025 20:13:29 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C74E4110561; Thu, 10 Jul 2025 20:13:16 +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 BF5F6110561 for ; Thu, 10 Jul 2025 20:13:16 +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 42F5434219E for ; Thu, 10 Jul 2025 20:13:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A652C2FC3 for ; Thu, 10 Jul 2025 20:13:13 +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: <1752178388.61361db15d03a508721882e68839c30b3b4a5628.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.12.37.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 61361db15d03a508721882e68839c30b3b4a5628 X-VCS-Branch: master Date: Thu, 10 Jul 2025 20:13:13 +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: 917ea6e6-f08f-40dd-9a37-f9a0c64ddc53 X-Archives-Hash: 427018252a58c47fa1d7933b3d1e2faf commit: 61361db15d03a508721882e68839c30b3b4a5628 Author: Michał Górny gentoo org> AuthorDate: Thu Jul 10 19:55:09 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jul 10 20:13:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61361db1 sys-kernel/gentoo-kernel-bin: Bump to 6.12.37 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 5 + .../gentoo-kernel-bin-6.12.37.ebuild | 216 +++++++++++++++++++++ 2 files changed, 221 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 44af35c08287..4f60a783d1f2 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -60,6 +60,10 @@ DIST gentoo-kernel-6.12.36-1.amd64.gpkg.tar 305489920 BLAKE2B 29f532bef117311277 DIST gentoo-kernel-6.12.36-1.arm64.gpkg.tar 279275520 BLAKE2B 68eb04c1c7ae6ddcdd2e5562e5b3f136afc0bb3c9f806546799937318f150795a314ce540b84647b669c27b57380620c74fb6481e51d5cf3a572f184059163c3 SHA512 2a2cf4caf3035b74108cd9861edc05edc0bc1c9674afc1af4229870b50f0398d3ed3b06ec9de769e854727d91d23ad9f89e95ab04a450128a3675a41cf18bafa DIST gentoo-kernel-6.12.36-1.ppc64le.gpkg.tar 73308160 BLAKE2B 36cf4d36f6c77e623fd5d0d20f7056f3782de7c0d8d601a31b7a130a4f0196899963afcd6e06c2830f9f73d725ce508a77b6a58ac3fa512ddf2a92c2160e485d SHA512 0c8766c21ef73a2367e177e67ec70c848b68403645b83776f451b307e256c3070098cdbf8c1efea6f335ba94e30a5e302c4069c8efd65e1c8f2b35cf994e4656 DIST gentoo-kernel-6.12.36-1.x86.gpkg.tar 77619200 BLAKE2B b7dd0e8fc41ee13026e4b86ebc9c523360572ddbbc98ef9d99d4eb86a1f09e8631afa007514ecc4e18dc299e9c1845bc6be217589fc2ce5d3e7bda10b79eb2f0 SHA512 115d8df750ff7a57d252fc5dc565d467978f3d076754a84a66b33b568e92e6179080d0bd35bea25b617bafec1325868cbb6d7fbae96efd83e14daecc8e5222ba +DIST gentoo-kernel-6.12.37-1.amd64.gpkg.tar 305694720 BLAKE2B 6169f419a003b1a228de4d9edef112b32f296713a633435caf716c991b81b01309f72dd528a376dcbfbe37f995bf3570ba32b9443d577ef1dc2c64f56656dc01 SHA512 4fe92df518911dcae50737f4fd36ee29808440f9f2a2aa5f8174ea21e26c25cfa51e9b2bf0e76a70624655349e7a6c44bde4c1322e073ae5bd3e8bfdb388f895 +DIST gentoo-kernel-6.12.37-1.arm64.gpkg.tar 279326720 BLAKE2B 8ef04e762dc8910cb01aa427bc7c6bc80089e629f29c03c247e27ef48c8fe8e60002d714b83c2915e077ad6cf655469d03993ce908b37c16601ed83ba200b660 SHA512 4abbcbcbc727c802d31b2a9be5b5e7631da67a1603f24fc8adb7d8750cac10783c37039ca1ab0bf3c13749a2fc1c238ce723e8889ae2af73b362e7feb6108bfd +DIST gentoo-kernel-6.12.37-1.ppc64le.gpkg.tar 73308160 BLAKE2B 4e94732cf4c7481b4229cc9619c739191eac1e0354376a2133b3248b73e0c7e8be06429b7c229730c43e301bcf2941c254509212ab5d4bed07086fde1599d996 SHA512 762e338ff478e74ca16fc04b3a5796dfed9444ebde9dab185309d634bde9ab6d2c87561e58cfbdfd48f63443795cffae99c6325af92c5c2b8c19ac5fdb6387f0 +DIST gentoo-kernel-6.12.37-1.x86.gpkg.tar 77649920 BLAKE2B affd7e25b199d93cfb9f3283b993cc48d998467e5cb10faa13bb64ba6bb7ebfaaa4e1825c7911314db94ad0de58d261f7624983d2e363e47193751e5852d3772 SHA512 f6298b7d902b13ab436737e683b89768a2ef88f5c4024891d9b6cbd366c96fc5555a5875fb20fc36c394fbed2c3534f611e9605f61751c98dbb866bcc02c12cc DIST gentoo-kernel-6.15.4-1.amd64.gpkg.tar 326184960 BLAKE2B 5108215e610e0233a6de4fb05e6c531346cba141b25ae1a4663ccc0d697e4fb6435bb31a676cc9740c4a20fc2e283d9d3aff8f1dead1882077a7ae19c4afa851 SHA512 885152105aeaef86ae36a1979c869c288e062f41dc6b0c3e83111f8dc66cb4337922ab51043dde0d3136a6588d8edc941392795a45f6c0ac9fc597d8ec96b259 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 @@ -98,6 +102,7 @@ DIST linux-gentoo-patches-6.15.5.tar.xz 83692 BLAKE2B 0b0831734f25b00a3523592439 DIST linux-gentoo-patches-6.6.96.tar.xz 41508 BLAKE2B fd1a612b4376ffc7b916dba5c1f7b7d54a2f7724e96b44fbb1be929ff09868414b2462a37dd57f06960eba3c981088880ce350b1d5a1def225482bbb4f1e6971 SHA512 913ea1723e814930a7f78bf46cfc7d677a4f574f3e1a17b2a2af4075e86ce3d88de59cc1884dd2e8b49975dd293ea190545040b9b1f430bd74d37b88e58b9a21 DIST patch-6.1.143.xz 6273416 BLAKE2B 698b97f20d581e877f9c3c71fcf0bd419c381dd7c30a289d23503ea34d63d1b303087333b31059e908c6afeb3a06febdf1108cc62c52fd6fff0913124b76305c SHA512 5894d379a59d9fbb4138736a27f755ea18f1520e7b3f6329d6cfed7c2df1582c9cedafcefacf3733ee3b6e2de2e32fd940fdf38e6704664e3bc5c8e227547de4 DIST patch-6.12.36.xz 2388056 BLAKE2B 9912220c0126fda1c35446d57376ccca45f12dc894a277feccd181e7bf59cdcdf88e6c5c9276c0e4e7f54cadd17b155a3b1aa77f084a58e1043da9d57b768498 SHA512 4e469962c9516d7614816d9905895b1d249942a77d800506dba2ef0bb5dd56123e72e5e08a2b8396ece9d672b3a16a52b9d8e3af370c631197f0ed85d5d8675f +DIST patch-6.12.37.xz 2489896 BLAKE2B e269f015f0930ab9ab73f3ab5ac6ba5d4b5e240399d613d332207f2c07593d7540faa20c877c0cad9bb3e9870f7b48e17c09190b193cd5241ef7b72cb98ae230 SHA512 a03eb5b8f944faaf3757cc5ea980d8abe5f7442a4ea81d55264cb5fdace735f2377ab99c8d975e8c31bda2a9df63187508166c3dc2d29ad1e95bb30d925f9f01 DIST patch-6.15.5.xz 538604 BLAKE2B 3771e14cb95010a9e553191af6888fa26dd5f1084c16a1df3aad97ed2a03de97cf1af8562a1b7c0d1977dfba1f3973e03079278b72943ac104c4208e1eeed315 SHA512 ff35f126fc24cd9fc2ba7dafb10e2c4dc4643a2165893d6dd07ce0ab49bf33d4b67ab33b32875b74371749b5e6f93a061114c9837bdb48203d50b5ec55db5a65 DIST patch-6.15.6.xz 594816 BLAKE2B a77f3b6e07b2ad8cc300b411111aef0d3b3be06e10ef9ca94647c8ddd9c40c519a3c0111101c15da7f1c60d2dcbc39614ba6c479b2d3da084f04e913c9a9b5f2 SHA512 ea7ecf23eb43c85c2aaee5431b8ec4c459c42b27d4ce0ec3e4b191c467acac9a4411099d5ce4b653413fae9a2dda785668710057cd815710398ad376fc730810 DIST patch-6.6.96.xz 4574068 BLAKE2B 047878c4c04057b9d2f342850cbc41d0dc326dc9ad7421500cefc6e8c32a3a769b0f069f6348d1ea0663cf8274e6048a52d900cf48cd18c5cfe3e9808c5133e8 SHA512 dce4c83f605f189c8bf2fe0c96118ed56d5d686a145605d125e532e78417076f84a7d85e7b8bdc71d7b3c0c7594a82403d7a9231e61f88ee61a05b43adfb98ff diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.37.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.37.ebuild new file mode 100644 index 000000000000..1e8e02a916d5 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.37.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-6.12.36 +BINPKG=${PF/-bin}-1 +SHA256SUM_DATE=20250710 + +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 +}