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 EF7D9158B20 for ; Sun, 02 Feb 2025 13:29:30 +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 DAD0F343023 for ; Sun, 02 Feb 2025 13:29:30 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 57147110484; Sun, 02 Feb 2025 13:28:54 +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 4C686110484 for ; Sun, 02 Feb 2025 13:28:54 +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 E9092343096 for ; Sun, 02 Feb 2025 13:28:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D49A318F6 for ; Sun, 02 Feb 2025 13:28:50 +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: <1738502925.c8c38a0f038f39a0edaadf43a52d474a86549e61.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.1.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c8c38a0f038f39a0edaadf43a52d474a86549e61 X-VCS-Branch: master Date: Sun, 02 Feb 2025 13:28:50 +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: af9125ca-b4a0-40de-ad24-04b9b4fa65ea X-Archives-Hash: 4a79eabf4cfaa6d1b2bcf6d0279514ce commit: c8c38a0f038f39a0edaadf43a52d474a86549e61 Author: Michał Górny gentoo org> AuthorDate: Sun Feb 2 13:02:36 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Feb 2 13:28:45 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8c38a0f sys-kernel/gentoo-kernel-bin: Bump to 6.13.1 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 7 + .../gentoo-kernel-bin-6.13.1.ebuild | 184 +++++++++++++++++++++ 2 files changed, 191 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 5b7a78f2e9a2..dc35cd50cb0c 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -14,6 +14,8 @@ DIST genpatches-6.12-14.base.tar.xz 846696 BLAKE2B 63f6f0326eedcbc5d44f2320dc0c9 DIST genpatches-6.12-14.extras.tar.xz 4056 BLAKE2B db12618351b80d499fbf9b3f8d0a4ab00639fe1b0c73776e0b038f6f996db29f0890d796effd120c3428a9515771016cd0a23da559c028996b312e75525d78aa SHA512 79a23575135205c33eb07d7026ccd0c38e5223b4b29d7c90002b72074a089fc994c38dd17868e53198fc11d2fc28e229a79ea50d5449261aad9689cd73139003 DIST genpatches-6.12-15.base.tar.xz 856536 BLAKE2B dba6809d63e9ff073b40a08afdeadc173e3ab5d739cb251e4415887815a420ba295fcdb80f53f2601f5274ba206d9f562d3841977391f254ef5783dc5f329010 SHA512 ca9958e76b1c156e7ebad1c14a1f957733a8cd99f9c8e23b82bd06bc4fc982c70685668f5d5dbc251abc4e7ea32a9508b0215babf18511514aa2c159767760f4 DIST genpatches-6.12-15.extras.tar.xz 4056 BLAKE2B f3b21174d15e3ee9f367ddd10745e1812b2a7573dc618f1c42db7afc9794208fdb67f62e2f400a144ad2f6d050b0419d67152c10af83ca263ba210bd8d939972 SHA512 7a5460091350c279519bacbfdcc83ee69d14364c0a8b5c192b244695196f72ec24e27d85d1f87608b1af6e9adcb5089ffb079c3e5190b7580833a438a2672c32 +DIST genpatches-6.13-2.base.tar.xz 15268 BLAKE2B cf7b141b036ce1f324e59a2a159cf031e05242dc82f56f65f280e93650c879c35fad3906b680394741a8582310b7924cd09e0b48887130e39ef713fcf4c513f5 SHA512 058545ff09be7f54889b691abbface6579a3f030830115a06c15182d1a92ff5e566b4989de65ec21c57a233f792b973408f8405fb33d020939b06ab31f3b1449 +DIST genpatches-6.13-2.extras.tar.xz 4056 BLAKE2B 87dabe3972da098d4491f83189fa2cef15d7212800f4daad3bb248a0895112def3ceebe5c6101eea3832eef329827ca53e2c0fbc82febac0158a461ee59a5b51 SHA512 526d45b794e14a6097e25f1a614680a76db07fd6c423362fd38378986f29fc139557573ad61fcd2a2f865cbe2e575528fbf57a04f2b5804f84fe89f284ca8c07 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 @@ -50,6 +52,10 @@ DIST gentoo-kernel-6.12.12-1.amd64.gpkg.tar 301352960 BLAKE2B 0936a4c9395264fb8b DIST gentoo-kernel-6.12.12-1.arm64.gpkg.tar 277350400 BLAKE2B 34c7e77cbcb9fc6ddca038dc01095fd988a741f42283ce9fda78c2c14702785b40d2fef7fd15c4529ab782cc2aa7cc70943a876e715e94217217289dc82b5fde SHA512 df0ecec53c80e42f53177b57a3c24a9f6bdb89cdb566c66aa49611401ce8e005a19ff6740823c4ab301346a9c9ca2057e74c1af208144e6a3abb89af02d7c7dc DIST gentoo-kernel-6.12.12-1.ppc64le.gpkg.tar 73134080 BLAKE2B af4b89a71712d7a119901f23ea7160cac06ef4f0cec3332e5ef510172e662bd4831b3d8a9c68975e9cf6fe4a1a394410f5faf1287fa84d3f494d41e184a7c139 SHA512 cd9591dc748b229063c5a2079acfd29d164ddeab565ddc98cf37d3b4ed014a3171ac6af6ab00aeebbb6dcf2a832335180037eb42691cead49c80ac55a52fb1bd DIST gentoo-kernel-6.12.12-1.x86.gpkg.tar 77414400 BLAKE2B c5ec7fba2cacd3bbc151413fe194c2b47e7d9496478ad2291f96a56fefb9f8e39e0a7daa6cec7cfe7291d54be92c00bebdcd0ceca2a0cb6ab40d9c71e4995e4d SHA512 9b97685266e193b49d2a1047b5ca0b2088016ecbcf16bde6a550417037b0294621b7747caa875a8a1a2bf9f23daaadfaf2f1a2393f5bb6957bbd27cc5a4d2593 +DIST gentoo-kernel-6.13.1-1.amd64.gpkg.tar 302438400 BLAKE2B 9332494e18e9e19df2a0b858e8f20ce2bef78c6dae9c0802464a8ee79281c7ef017655585be72098c9a63e2bb9efc4128e1dcd99ed41470f60346ac7da4c86d6 SHA512 8ecce0a52904a1e4d0335f3ad8c0856d9ff74119299f0b1621e86436d923a434d36b80e1fa626fbb8662af57b1bb8d0c1bbd2f4a4264c37873d9d86891f345e3 +DIST gentoo-kernel-6.13.1-1.arm64.gpkg.tar 278824960 BLAKE2B 9ff3d775aa63dfed2c318ef7bbca39647414ea667cc2b5732efa97900a896b0cc8bb03a0d538eb51ba9bb6a1ef48f6dd2f14590a225715e2a7309f1712b89e9d SHA512 d115eb3738ac79f2227c580affe90c7b0c89b623e2de6e1771cf599825fc650fdade345de794c543e5b96c7c0eb980186551ae1773d0ec396014a8c6f89fbff0 +DIST gentoo-kernel-6.13.1-1.ppc64le.gpkg.tar 73164800 BLAKE2B 3266957def06bafc2b2740c402bd59902731f6a0b173f570eb575fbad33ac6cdd52a35eb6984c99d2e5915934b06626ec07c0e91871e8d913febcf2d0305d049 SHA512 768cdeefa7bbb8bdfdbe1a6c0550beb6a4896688f194bba1a81c319f53bc263136581620ebe43ecd09a83b6a5302fa1e7e2333d6b85c82f73747d221e766d2d8 +DIST gentoo-kernel-6.13.1-1.x86.gpkg.tar 77496320 BLAKE2B 5fe8ee8778390963182575617828b2b3a9f43bab5d8d7ab85afc2b2596db1b4cea5ad23383c45a2eaab3e4b7812fbf28745b316b99a3ed4423ef2e1a557a9a8c SHA512 586085ff0f614b6dd97935c73943c533980de3f9271ef9b3d6c4c2103e816c29ec4b690374099e08973b0b4e3a173911dc96cd4d2cccb410bedf71e00e6313fc 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 @@ -62,4 +68,5 @@ DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a936 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68 DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581b717617c12b000b16f4a4c59ee348ea886b37147f5f70fb9a7a01c1e2c8f19021078f6b23f5bc62d1c48d5e5e SHA512 a37b1823df7b4f72542f689b65882634740ba0401a42fdcf6601d9efd2e132e5a7650e70450ba76f6cd1f13ca31180f2ccee9d54fe4df89bc0000ade4380a548 +DIST linux-6.13.tar.xz 148523052 BLAKE2B 9f617ecb3f2393b57ba03c654fea62a7213f24c835989f333a1ef29492af551bfa7d9ad786d5ef1484854adc77c7c6af38fb09a72d994d305695f512c325e77f SHA512 1137e6440132b0958f89165440e99208f82b204e7245ae69dc9c808df97d13ce8f58136db92407e0e93394fa7f6283ec7a34597c6e92a5b6d9025e0960357957 DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.13.1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.13.1.ebuild new file mode 100644 index 000000000000..c0377f141128 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.13.1.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##*.} + 1 )) +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 +}