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 2F25415807A for ; Thu, 05 Jun 2025 17:28:13 +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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 1A64D3430D7 for ; Thu, 05 Jun 2025 17:28:13 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E76A81104C3; Thu, 05 Jun 2025 17:27:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id E2FA11104C3 for ; Thu, 05 Jun 2025 17:27:35 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 93CB3343183 for ; Thu, 05 Jun 2025 17:27:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 745DC20FB for ; Thu, 05 Jun 2025 17:27:32 +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: <1749144446.1e726dc6f0eeca75cb95804a785d504ef72049ad.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.32.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1e726dc6f0eeca75cb95804a785d504ef72049ad X-VCS-Branch: master Date: Thu, 05 Jun 2025 17:27:32 +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: e3a0472d-76c3-40bb-834b-45e35ee4b7ff X-Archives-Hash: e9cd92a06b935563e12d0ca7cd3a9331 commit: 1e726dc6f0eeca75cb95804a785d504ef72049ad Author: Michał Górny gentoo org> AuthorDate: Thu Jun 5 17:24:42 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jun 5 17:27:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e726dc6 sys-kernel/gentoo-kernel-bin: Bump to 6.12.32 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.12.32.ebuild | 184 +++++++++++++++++++++ 2 files changed, 190 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 7327d32790b1..59b681a8bbb3 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -12,6 +12,8 @@ DIST genpatches-6.1-151.base.tar.xz 7402608 BLAKE2B a7f5f902d84b19d48a26e1c00adb DIST genpatches-6.1-151.extras.tar.xz 4056 BLAKE2B 79dd87d35c27163057edabdd6d605777e2e440aa5e4d4390162e0c3ab2b083848ff7c0cf92ed83c05e752c26ba22e8e0c25fdb3e040ca9c5d38870756094e84c SHA512 28876cc7c53d3eecf2d01840f89501693df6c81c5c139b5c9f6ace64c8e578b1998aca476c55ee44d470de84085e6bd6362c55b60d4fa2721a8046c2512b5ef7 DIST genpatches-6.12-36.base.tar.xz 2240564 BLAKE2B cd68b5d7fff73f5fe0c67a8eb47c2094a0ae57f304b5a4798ccca7410c5f514fc1f9b2fccb65e639886e48950ed24d04ed44ddcdff3d5223e336f573f25a501f SHA512 61796173e1e286c352d3d683be007e4336e646cc1efcde0528b12b38e484d104c9686440aa90d096cb1ebadc715e46899e5bda0f8bd070190ed73e0291401f19 DIST genpatches-6.12-36.extras.tar.xz 4060 BLAKE2B 034e0d065982369815db90efd84209bf88c73d19a1f4fa41b6c4586b0197e1e502df00b63f8d99c7c1eb0e32fbf99c0187b8c304adaa0f2f624a722e50a31b21 SHA512 cfbb8e69bf254088ddee442c6ee1d293406eac106b0c8fb7d926ea2778260664991ca05c5efe6547b4740ada1010057001856c5d6ee864cd73f55cd8ef78d5fa +DIST genpatches-6.12-37.base.tar.xz 2252148 BLAKE2B 31c9167efd052ab1ea08cc37bd8e94b671d17b6f7f7cf2126733af51c3b3a63c3395113d4cd57d1a54e593a7cacb830e36678dd76b37f67c01bf9b91730e0715 SHA512 74accda102db462cae8d9a9ee0514c06c08799e3b35199b9ebfe34ce43001a0383fdbe5d02e0621e861fccf3dd04c6e5fdba1b093686a1bf35c3c7093f574c22 +DIST genpatches-6.12-37.extras.tar.xz 4056 BLAKE2B c8aa66c636b448118cb4fa124a44b78fad799bfb9f69585e8d5afd50592f0fa36986bba428c0831cd996fe9afef675f4168e7c66ab341db88f0e0cecf956e291 SHA512 c7672779883d90ceff6b2a25f3f9851b2abc4ea5093972c6e3c9a6860bb53b08dd2e3c2832983ef17a7bd8e2c8d77b5f2540473b85390619d1547c2c4d25846a 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.6-101.base.tar.xz 5077712 BLAKE2B 42eb11265006d12e5f67d25d58dcd1188ce6c8b7fe5cec8b176030f36910ff77da5a362e1bc41d3e52790c5e77a2a71adc57f5e107a5818651226ed98a27828f SHA512 759cf775322ec77c85c6b4f5441c8a962cb75e13ccc8d73d366cebcfe75d97b688deed9c9c4e47257db349f950f33f5aa2a718fb2bc6a7a7cb7d75afe5b70d12 @@ -46,6 +48,10 @@ DIST gentoo-kernel-6.12.31-1.amd64.gpkg.tar 305612800 BLAKE2B 375bbbabdf3e1ee127 DIST gentoo-kernel-6.12.31-1.arm64.gpkg.tar 279633920 BLAKE2B 94f0478a81733df9ef7897042377843b8a302eed55154383f35ebfc21df0ebe7dd358b56ad53f0e7b22958625d72745d61b8b1a2a6e4b1250206a650f024cc3b SHA512 51ce06ea732273f256bd347f088080af65123cd1be13db7e864332dcfa5e3f1857f39c363a43919676789bed105209fa34942e715a07b7adbf307db49f6a266b DIST gentoo-kernel-6.12.31-1.ppc64le.gpkg.tar 73267200 BLAKE2B e26a7f12f26893cd4a4c836363f2ee52697daef4eef58abd7b431d090fa0cdb50ab6d89cf762eb1bbacc7b685483ec30aa36171f7fcfa57d41966ca565165d10 SHA512 894888156da7a78a1787e544075fa69717fb3d443e0505c2fbd30ae1bf2a2316d8cb4b0883d8edde6704b5b2d0395e438bc7b77a415e05cf1c7cdc4837aecd79 DIST gentoo-kernel-6.12.31-1.x86.gpkg.tar 77619200 BLAKE2B 2381c196272f8a1710136b838c10af838a08c2d3c52c25c10a8f9d633e9642c01998eaf6248a81296ae57a5ca52d920f9a37e7360ca284fb51635cdd11b62487 SHA512 d4302d93bcb84a8876253273b03c5c7c093207b73e9e461483b05245dd9566eeed55453fabe0d1ed9b7c762371669392b283000067c88f2cf1486550979a923d +DIST gentoo-kernel-6.12.32-1.amd64.gpkg.tar 305315840 BLAKE2B bece795931abd33850499a0b6a7571f64b8fe6e5ed7d296838b72b4ebf88176d021ad132fe34facddfda158f922b4fe7a533ef58a0f052a2c0d6f9ddc89f2603 SHA512 0a66fdbe2379dca1ab1f9f11dd546d29b0b335a639eee0c3e4a711110ca3ab878d27dc910666de2244c778de6e5202ac4d7fd44d85bb3283f0827d47d1470878 +DIST gentoo-kernel-6.12.32-1.arm64.gpkg.tar 279111680 BLAKE2B 1ad2efced4087160f8409032341bc575e33a1108601ad08e9c99d74460642cf768806dc3c33105d8b41cb81fb5732d1a302fdb2b3a7cd716de596dac02cb511f SHA512 8db6b02f5252c7241d2ece8b33fd1081c1db2d0745bc21036037ae731c6f92f2d6e6d907361f301c0c7bdca0b3248789d8d46d8d9374b2767271809e025b4228 +DIST gentoo-kernel-6.12.32-1.ppc64le.gpkg.tar 73287680 BLAKE2B 5514f8d9cc15222b41c0cde3343b973eac2581facddc86cc51ec41a71cca7908207504f353c90e53e6fb886e3b78c7209b617bba38214e9b16b532105513905a SHA512 6262f8a7baa6291fe8cac21f5911182956ade2c1ee77d0d557e72dbe0e45611ec21010d1af73586a0357f8c3bf05f8aafe97cf9b1f8fa10678fed98afbbbbbf2 +DIST gentoo-kernel-6.12.32-1.x86.gpkg.tar 77608960 BLAKE2B dd2368020641d9c9a58cb57e0c32a68b6959a95cbd95b1c2cfff4b561ba9d8c64a0630c4e59bc582b15b607977b1bc333e53f94699aa335d2ce51fc332953040 SHA512 fc31e4814345e1b725f4b831e074086410f05a230bc5ae41158ed738a8b1ff06b244a4234e5893ff3e2257499638a2cf855a9f6b1cf4cc8f3131d5d1d3bf2aee DIST gentoo-kernel-6.14.9-1.amd64.gpkg.tar 311388160 BLAKE2B d95992953a8131502240ee572dd7e71b92e286e4711816fbe4044d94d2745eecb01e672e6e115a297ab8caabd40c73e18ea5e1a05e99f6be13c00694961b202d SHA512 de0fccd7d1705ee84b9d1e5a39cb1349933713855012a3f033d799a97b2b777efbe2e9ab77b7714eae125e9465f1b17cbdd1e018e283611f54417f0e6110a7f5 DIST gentoo-kernel-6.14.9-1.arm64.gpkg.tar 284712960 BLAKE2B 18531ae58696704f8536e4803aa5f92f6b0bb9f92d6bd072dc15c9003af1dbf9034bf990a2edb78f778c8954120cae653c4a64d6d4dbc36092cc664a915f2377 SHA512 f2f3cb86c31db71654bfc8094893b3ed5e3a845c341d2f27855f045ce048ff3982ddda847b4a3cfdb2200695b2b230b26c4420cef84c61ca15a19de709d7ba21 DIST gentoo-kernel-6.14.9-1.ppc64le.gpkg.tar 74465280 BLAKE2B e2fd4330b91745c199f24811825bc51e5c0db40925ef76b428239ad9700dd28ddf7e48d861f115e613bc6677aa3183b7c559e2c5ae37aa83e8e1366dc5baddb8 SHA512 4ebeb66b1254ec549f8b7fa47335f1cd468dfab5277cfda818107ff4c3ecce4b4080237a8796b02bad551aec9ceb02c55f721c6602b3d76423ef6ac7d24d24bb diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.32.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.32.ebuild new file mode 100644 index 000000000000..ac7076155097 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.32.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 +}