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 0545E1582EF for ; Mon, 17 Feb 2025 20:47:55 +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 E6347343188 for ; Mon, 17 Feb 2025 20:47:54 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CF678110484; Mon, 17 Feb 2025 20:47:20 +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 C715F110482 for ; Mon, 17 Feb 2025 20:47:20 +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 7811A343188 for ; Mon, 17 Feb 2025 20:47:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C7A727F6 for ; Mon, 17 Feb 2025 20:47:17 +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: <1739825228.26aa3d0ec1c5890fc3438b306d9e49b9a094688e.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.13.3.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 26aa3d0ec1c5890fc3438b306d9e49b9a094688e X-VCS-Branch: master Date: Mon, 17 Feb 2025 20:47:17 +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: 9815c763-5d08-40f6-ba6e-e89ed3bac2fc X-Archives-Hash: 7d438dca9123ee8e93dff6c6a665f312 commit: 26aa3d0ec1c5890fc3438b306d9e49b9a094688e Author: Michał Górny gentoo org> AuthorDate: Mon Feb 17 20:19:41 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Feb 17 20:47:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26aa3d0e sys-kernel/gentoo-kernel-bin: Bump to 6.13.3 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.13.3.ebuild | 184 +++++++++++++++++++++ 2 files changed, 190 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 3311f5b4ee93..a7d051e82bef 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -20,6 +20,8 @@ DIST genpatches-6.13-2.base.tar.xz 15268 BLAKE2B cf7b141b036ce1f324e59a2a159cf03 DIST genpatches-6.13-2.extras.tar.xz 4056 BLAKE2B 87dabe3972da098d4491f83189fa2cef15d7212800f4daad3bb248a0895112def3ceebe5c6101eea3832eef329827ca53e2c0fbc82febac0158a461ee59a5b51 SHA512 526d45b794e14a6097e25f1a614680a76db07fd6c423362fd38378986f29fc139557573ad61fcd2a2f865cbe2e575528fbf57a04f2b5804f84fe89f284ca8c07 DIST genpatches-6.13-3.base.tar.xz 206716 BLAKE2B 8e5b254c09e81896cf6228cda82228d055ed3b6c2ff27db2af4c0c1abca6dbbfffad64a52e864ee5aed5244979dfe4ec5c27916c62021816cc25cd966f1c843b SHA512 913f79df9a918146d447a7862d52ce14102a66b9c3112780e182de61ae45b867fca25c4e286dbe1d9e8b6922fda07e724d8784b47d378015998dcb42ae55c88f DIST genpatches-6.13-3.extras.tar.xz 4056 BLAKE2B cd43af52aff7f3b5bfb46f3b2f2df0b421bcd33aa478993115e9fe58205f4b347e722bc5f14e9c8b1a2a563db987d335a993dc5293fcd972b78a5a258c819b24 SHA512 1f2968091cba801465a74c58f0d265ae7c53d4f4e03c0369ddb4d9c855783255a404d4677c9a3fd06a8a820717562e2f2ec3ff31d126b0243909c29a3175995f +DIST genpatches-6.13-5.base.tar.xz 335748 BLAKE2B 167f3f37113e64882ac841e16344ff25a96e614d3a29ebb96b5a21ddf7496386ea4f2397d5a5df0e6ce1e98348934befad7cecae6e947ba94ce1551ff837043e SHA512 1b6d3777fc25d24d31ccf33edbca65b09a5b0f3f48d8af5058b4c8de7b32830bf6fcff330e64ef2b9220cd4a117cc571bc3f900b52e68d4a9277c2a7d1f1ef32 +DIST genpatches-6.13-5.extras.tar.xz 4056 BLAKE2B 452b32878514cf29e43de6103b298c41150b888bd78509e26211c7d39e6b8f23acff0f4a5c906e1b0a8cbbb939f0fc6a106085542d4f92bc1e6f2f85580df7f2 SHA512 688fbea8a74987de17fa4afa84a6f3904b39518db971d7ccea13d4fb4f6e7df8031c940e31c2297cf7b15c7d3ec49941232b8d9d352c69e8ca6233bf7b846779 DIST genpatches-6.6-83.base.tar.xz 4270596 BLAKE2B f94c4d0387957b4384a893f37bd232eba24dac57fa73297f4c25822c2aaaf6e9616c402624e43daab655c31677a59129dc853914fe9817125281ed40139b0bc9 SHA512 7479e6ffc5e736cd36df2a3f66079514b016059a273ef92d2e120f8da050c0383f8249dbd9f45daa1ee192117942d339b0bbe1a6afb1eae6e118b483fddbb8a2 DIST genpatches-6.6-83.extras.tar.xz 4056 BLAKE2B 5b28f9a1750f3aa6dd30c976f1ae8431a93d44967c52dab2bce6b3cc17c75c063ef675765da94a212eab94dc64d144283049570d413b5d7acffa7be207249557 SHA512 27a91748aa74628c3fdb78709e39166858280a4cd80f4d3241e96158d1267b79c0a6a3cbc9b70fb7ec9069e6c8c7f7210efa174ffca4aaf3234ec34083fdd61d DIST genpatches-6.6-84.base.tar.xz 4282452 BLAKE2B 86b6018d06d2d16087af80a717b1b4240fc422dcbe9e96bc76c8ce98de21f1520e652051d4821abb7985df9ad5b760bf9ee2d2b00fb91736912e85d8d457b4a7 SHA512 8f2b431877399295b43af5b0c8b314dd9b00dcc3e62585da4c05a048118393e65933063c49e6d346a550e7aeaff49a841a4ee8378266b03b0c880f41319c9b5d @@ -72,6 +74,10 @@ DIST gentoo-kernel-6.13.2-1.amd64.gpkg.tar 302581760 BLAKE2B c871add0ebfc7cbec4f DIST gentoo-kernel-6.13.2-1.arm64.gpkg.tar 279203840 BLAKE2B 4ab544f394a5ac5ab448dd4208d2ee793645b1f5889a5251296845f13bb6abe2ea89d36016c4309d3c58ec985768de5f51712cbed82f5bc12f87aab38663e4a9 SHA512 a14b7264c45078331d89ce8b56b8ba9b8a1e97ceb4481fcab269b53688d6252849575cd9ddf3bbe82999f79b3844cee7e241ae8047af5a534bd788ea29665216 DIST gentoo-kernel-6.13.2-1.ppc64le.gpkg.tar 73236480 BLAKE2B e8d8bc694a6c645572a964769e784a5251e273379c19b68c0c36e7fb32a789c0a48f55d60706998b4481838070ff5ee85ceb545867217210385a220ac4baf721 SHA512 988fee69f31246692a92f13696e2fccf09f9bbf1b6866b224d78116d0d5956c2f2eee0d31020bf573412dcd3c943056fb3299a65f02fa743a888058543cfe933 DIST gentoo-kernel-6.13.2-1.x86.gpkg.tar 77619200 BLAKE2B 99a98bd8ebe2882b95463e04270951680b0392d455ec7781774d456e0307bc6ba761500e09ff96ebc109ed6c29bcdb019b283062bb27dbeda4472dc7d2fd24b0 SHA512 c5d5ed7cbd48357a1e8b2a19f448b37f71e7756ea71832beec4a093821370654033a5122ffbe968810ef7e4141cd038a89b9c06e5ed6677ff13740af7b1666e2 +DIST gentoo-kernel-6.13.3-2.amd64.gpkg.tar 305725440 BLAKE2B ee907a898b8a59001bb22fa1e9e79e3276782d2d850925945fdcb8c92473be3f00f96b87bbfd3d7fa945602b19b131b4a83ee0a6db300480bcb3e12691fc605c SHA512 09c3ca9554e89ede41579a1c01c4913455ff24019883203e31e77ea51790fb931ba0fe7d00eb6baa07bb30c638fb9b41b817979fc8ed5862c16105c782f818cc +DIST gentoo-kernel-6.13.3-2.arm64.gpkg.tar 279480320 BLAKE2B 36c36710d724c5362492ac3610ca5d58076cf8901268c4259285106abc8d12cc901b986deb401f7329459374f13f11f0288e2994a50d55bdc0c725698bd866de SHA512 1c50734a3bb42b3a5fe7aaa049f2d7ad76a2d15f6b9bf01e9972dacafa0d317f8e2eb56ac1dc5b0d57a04babfee7a55d9cd16dfbb6e01c8eada3eeb3ebca0773 +DIST gentoo-kernel-6.13.3-2.ppc64le.gpkg.tar 73226240 BLAKE2B f8dea1b39aa2b3cd4c432147ffbc33436c13460f2358445cd4c52bf52fda3a6776381d3399fb484c408284cb20cbbab92defe82514dd0f5487ddc455f0d563a0 SHA512 823377b0b8becebd70ddb7b7bfba6b20518b97508817c69b9f9021f13d760996fdd9c062902ff38af9d9997993b97b7c36d988dfe7135194e7611f8213ba5faa +DIST gentoo-kernel-6.13.3-2.x86.gpkg.tar 77639680 BLAKE2B e3a9ba2e9f93c10ccd11157fff3cbd53cafd6b215b0b48d1db78bba75893c40b5132e4c919418a835609a67dd31fa5f477d8af694b1da1115133ee549e4d9f3b SHA512 24c733067b7ec9388360beb928a29ab55cccdd191048a2fd413e76a017d7e827c4294c44da4a4ac59ea6c55e6ede22956bbb97a7daa67ee32c3cca55aa0fb9bc DIST gentoo-kernel-6.6.74-1.amd64.gpkg.tar 270028800 BLAKE2B e74b3ccc5ba74a5138536eeaffb699cd7130b6e05fedeb4e85464def2eca67e153ddcc61a43be9eb6c46b402024411578b3abdebba26d4cca3444d1e84e7fdd6 SHA512 7dd5bdc97bfb69ab6d859d52823f737430d4cb5d16f20dac7c081706ea49b05de6dc4f17d79a87666133c45220e5d02f82255e7e469feffe0aeb3b7775257ed3 DIST gentoo-kernel-6.6.74-1.arm64.gpkg.tar 245944320 BLAKE2B d113815afd6a696630525b13775d625c33f087c5c6fa817149b478b94153414eab8f413b236144b3989a043329b82c0f79f38679e1e6d65fab7c8fa4fb15ba43 SHA512 9f855f1882e40a1b596041c1370500baa1119ec3e4987ef500487dd87f62c1b6527eca4b23df4001cfc167f9375101ec938f783d717460ecff8fb218c371bbc6 DIST gentoo-kernel-6.6.74-1.ppc64le.gpkg.tar 64409600 BLAKE2B 439c66dfb35eaf37b5f21d7a36f728230861cbf1fd3e4e7420af87ca2d8b45fbbf0b730ca17670c513b4a7bc060d5e13b3f99db35df4e8ad619940bcb4886ee5 SHA512 673bc0a287737dca8079466e1fe2fb1f07d19ca15f05aa4c5537f49dfd486d7ec73172025f43d8474707e48814407980b0b842ec410257241b5710bc169074e6 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.13.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.13.3.ebuild new file mode 100644 index 000000000000..6e62cdf43b14 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.13.3.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##*.} + 2 )) +BINPKG=${PF/-bin}-2 + +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 +}