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 598BD158074 for ; Fri, 27 Jun 2025 16:04:45 +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 4471434150E for ; Fri, 27 Jun 2025 16:04:45 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C208C11055F; Fri, 27 Jun 2025 16:04:34 +0000 (UTC) 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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id A98FA110560 for ; Fri, 27 Jun 2025 16:04:34 +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 4EAEA340E5D for ; Fri, 27 Jun 2025 16:04:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FBB52AA4 for ; Fri, 27 Jun 2025 16:04:31 +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: <1751040265.a7fadbfee72dbf1e3c9c171b34e93feae6785ef2.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.35.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a7fadbfee72dbf1e3c9c171b34e93feae6785ef2 X-VCS-Branch: master Date: Fri, 27 Jun 2025 16:04:31 +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: 86bd5968-5a72-4f13-bde7-c90008489aa0 X-Archives-Hash: b3dd1cc85d5dcdd14035b1666725931d commit: a7fadbfee72dbf1e3c9c171b34e93feae6785ef2 Author: Michał Górny gentoo org> AuthorDate: Fri Jun 27 15:51:33 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Jun 27 16:04:25 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7fadbfe sys-kernel/gentoo-kernel-bin: Bump to 6.12.35 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.12.35.ebuild | 184 +++++++++++++++++++++ 2 files changed, 190 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 8c46e4ccfd82..01e496d96746 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -18,6 +18,8 @@ DIST genpatches-6.12-38.base.tar.xz 2258220 BLAKE2B 895781baf7994e8807b5a4d5fbf4 DIST genpatches-6.12-38.extras.tar.xz 4060 BLAKE2B af38e7a68725e201c8055257cc4356597a97a912809002d538fa82f2ffc1d5ae080aa864aed083b7c53a1920aa9330764c30d6b86d81907ca8ffa4deb798ced3 SHA512 190cbf611dde4e209be6725522a6434e011beee7efc8d6381701199e38e0ba695deffeb863c850f7646275a01160b292187f92a97b00b34343620f927e23381a DIST genpatches-6.12-39.base.tar.xz 2390316 BLAKE2B 3b07dcc9458af7027a585c71470238e46fe379331a6994e7194c01560aaffd32f213ab1777ff71c230e7caf69b084e2ac468a6785ea0fb82b5ec3e5b175815a8 SHA512 d40db7ef2c18bc8dfe7f33d6a692ed5ed5511bfd50af57caf7ca9d15585adb040a32a75567d0535c092a52a28adb7241722dab4f0c3aac75e14851839c9db135 DIST genpatches-6.12-39.extras.tar.xz 4060 BLAKE2B ace9b2e02b8af5c89b48e81251ad5715208ffa05e978ee0ac84ad322cab3120546f1b574546bbcd5ed7d316ee3ae0f0702ad6f21f7d361697ca2c4c3b81a435b SHA512 aa1286baffea47325aa972cb3893ad28f2371cb24c5339558990bd6b30d2867eab67c5ddbb53e4957ea56f2f4bec65268038964da01297ad227b281dfad74dd2 +DIST genpatches-6.12-40.base.tar.xz 2486500 BLAKE2B c12d0807f88668ae7a8894ad07e7edcf2ceba1f7e4f562371db098d4cb45941ace8b28c521268d6fca1b4edfffa3edba4e31d9c1c3d58cd128b26e13353ef5d3 SHA512 8792775ee312107299ac6f275dea9fd30c774f8387ea93f24f54df890e86bfdc9477b5a81ff35bdd9b4e26669a3619941508cf13c1c78e0b470996d58856d532 +DIST genpatches-6.12-40.extras.tar.xz 4056 BLAKE2B a63023f77bb82b3d0c1ccbc07bf1257f3a9bf3514b1e47326f337ba4a447ed10e0a2bb3ec1423638ea466edf1a9ef61b6e48dbe161996c85c5947bd1ed3c6dcc SHA512 a63d5503df9d71fc8aba67347953133bd17fb4300f1b98fc2cf8d1772ec3a433e22c40438795acf8e4c9ebce7348712b61c2659e5b179a9cd7e116423235b8f7 DIST genpatches-6.14-11.base.tar.xz 1058528 BLAKE2B 276bbd42629f6a305f3170e8560736b6ac25c2afae0f8cb9aa50bb101303308bc3bf7729c95f42fb112cf77318a57aa0df9f2af4d726772d167eaccf78774eae SHA512 a3ce8ff9e14e443df9dbdf0ff081c7e642d9a660583fce303eb76cb1fbd486a3fb61fb9eaabc4e0a5e48514ae224958628e80f88464ef55c09969fc3e4544894 DIST genpatches-6.14-11.extras.tar.xz 4052 BLAKE2B 808ddfabf47e276fb302c4a61230d9e42e0a00d52676137537b440b533f1cc4cf76248cfe4dfb31b589b1f45b22c56a8cacc29d59f33c31f8d50239902e82d92 SHA512 be2b1261fafee96e99375968b43ab33500622864a6133d773ef88cccab8800d409f783388195ba8993488cfc4259f276c3c9b7c0b7ad432fd1caa69db3a6de03 DIST genpatches-6.14-12.base.tar.xz 1074176 BLAKE2B 0079cfe4b65b5642db14c4de52ad136b749613f423f32352d8ed9a4b6b40b07cca3aecc87aa30b06ba464c01b4ccd50761f15b2374b8c61a043243a6385154cb SHA512 f4a6eb437d0b57ce2447749e6d1b3e9d09b424f67675aa4b0e33c36809b3c21629849988df095f54b2b20555cf56350e5d60be7808189001992fcc4e718f40d8 @@ -74,6 +76,10 @@ DIST gentoo-kernel-6.12.34-1.amd64.gpkg.tar 305428480 BLAKE2B 7f747ef559f4dd3088 DIST gentoo-kernel-6.12.34-1.arm64.gpkg.tar 279224320 BLAKE2B a43b356d7c11672aad6dac3ab5bb45a1870962fabf6dd8240756b76b32698c1a06af0c373b3e58221f2f0322afcc6240616ec3cd5848525d0d204f39540b7428 SHA512 b76ba73225a736a667821a4acd8013031b4f3761c530c3efb677d2d61e44c1c3ac7ff934c722b5d8cf2dba626227436f21e8fa749d0fc4d2939bed6baa39aa6e DIST gentoo-kernel-6.12.34-1.ppc64le.gpkg.tar 73287680 BLAKE2B d7eae22a48735fdb9af95dd7610fa1986953e77891300e71be54729b212b4aeb7a4edeea9d1585d6fe1b9fabb4dba6df646860629248662d4f4ac38db47fecd5 SHA512 cb99c7bc9820cda5e6d6afa64458990ae6b8c096e10b99a931e0234871ef552c824ba413bcdcd42d48ff97b013b5b6047f3eba35b97c520e8fe23bf4025abf20 DIST gentoo-kernel-6.12.34-1.x86.gpkg.tar 77670400 BLAKE2B 4dcae2cd1d59f5c7ae73dc71e6dc0cb584ce0b29d69d74bb5d593df15ab4d97b12b7479994688c02e97cafadb3df01ff62e04134e37f1d1eac943be7e6029fc9 SHA512 c174df8529ef9297cf75c468e184b5ddf2e760b496452b8d64e45a72c193246ca40cd2647e9aa8fc7880d5793e98a823eed98453ab09b01ece5b50e3749ca49d +DIST gentoo-kernel-6.12.35-1.amd64.gpkg.tar 305459200 BLAKE2B 2420fc0ebe9558a90df2db0f719790d8dd9fd796bfd03eed66d182d41fa2d48d18d77c94260149dd0092e0468b6c3e93eaf09de9342dd52922c80c70f612857b SHA512 0dfb4ac1df6322746269c4d2d14eb88cb7c5f495e346e7c3452236e8e98e41f94f87684c3cc516ee8c695d29b2e034666c5d77f5596fd6021e683a5a2e4daf09 +DIST gentoo-kernel-6.12.35-1.arm64.gpkg.tar 279193600 BLAKE2B 65baf787c36490f87e009f0e5fd74ec5c01a9eb511a456bfd4d02d8b3516d1c693b34624091a247a3a48cf9950243165de55299ff6bb07c9618a0c81043821dc SHA512 9ad3086f37f01aa1f118fcc2ec8e960682c02145de464cc0897725867ef0b7aeb2b8809aa2fe5c3260a771affcf4f4f0dd967c44dd64ebcb4f8311481512559c +DIST gentoo-kernel-6.12.35-1.ppc64le.gpkg.tar 73297920 BLAKE2B d7098bcda52754ea1755cdd1263b3c50d923c5526afc74409bf557faed1c9a839e7b8a4cd99d13e327d020ff51913d47a262ed28f7e38430f1e58e0731b77e4f SHA512 fae4598569ea08225f407cd4abdd8a02947c151801ab0e76db88b55b58c1863e4676389c7c45fcfec41542633aea8e5faf17b719c56dfefedf6da30a0c029286 +DIST gentoo-kernel-6.12.35-1.x86.gpkg.tar 77639680 BLAKE2B 029640d9f906bdd51b0d0061c250a663cd4492d96ffc292eb76eb234bd5f6bbf099587b1ce2d1580673d08779f513b068ba105d298528eda269b9de74fccc287 SHA512 ee3aea808e9fc0d70ba338d13465688ac9795abe5175ca447f651b03ad6bd10335ee3c0a930f215745ee8f04ad51dfec40f79c8ed29f25752ebe20c99035ff26 DIST gentoo-kernel-6.14.10-1.amd64.gpkg.tar 311316480 BLAKE2B f3428bcce7a65302236a1c2b1145343f379afc940d3621baab4802f229937c441965b6878f2cc6bc4a42260241e3db1678f980e41013943e7396af8046c1d9fe SHA512 cefbbb009f417507e7a51de71ef37586220b12fead0d2cb4176d5319a85b827048d67f12e3d8acfd4ecfbfcb1b51a95b2a2bd052e634dd81a430f54c09441547 DIST gentoo-kernel-6.14.10-1.arm64.gpkg.tar 284590080 BLAKE2B 4425ebec7e267ecc8199537d378f070866f70e0f965c782416382aa2f55167ccc362565ba59e49c05789edd9fa7147786051153911662d487a1285a178339f21 SHA512 aff7643ece722a7eab7db8c81ba9ef349955ca599db4ff87f0d3db13214e549689c77c337ec1d13daa1716f0c131eccecf00a867d06dda556e6f056d84cc893b DIST gentoo-kernel-6.14.10-1.ppc64le.gpkg.tar 74485760 BLAKE2B 4818aadddb1392524a7620860ad5e1463a3380ba4a19c823e35116fc255e90acf603cb9987b910fcb66985c1846d9c6e2783b78ace3ecf1f15d82ddc81aa1e24 SHA512 ac12ca5c172a1a8c3193e614e6ea5389be87fb4b0166dee5b6ad5e8dad1de3bb3166a273eedda6caa32e2b6d689e48bef2c00b0c8401c9b7f8f481190f3263ef diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.35.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.35.ebuild new file mode 100644 index 000000000000..ac7076155097 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.35.ebuild @@ -0,0 +1,184 @@ +# 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 + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 )) +BINPKG=${PF/-bin}-1 + +DESCRIPTION="Pre-built Linux kernel with Gentoo patches" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz + 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 ) +" + +QA_PREBUILT='*' + +KV_LOCALVERSION='-gentoo-dist' +KPV=${PV}${KV_LOCALVERSION} + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + cd "${MY_P}" || die + 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 + + 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 +}