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 46F051582EF for ; Sat, 08 Feb 2025 18:35:42 +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 31D94335C36 for ; Sat, 08 Feb 2025 18:35:42 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id A0360110483; Sat, 08 Feb 2025 18:35:09 +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 8ABD8110482 for ; Sat, 08 Feb 2025 18:35:09 +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 00456335DEB for ; Sat, 08 Feb 2025 18:35:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 955B82765 for ; Sat, 08 Feb 2025 18:35:05 +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: <1739039700.827b92a02d77bd7e149c128e73315547ca45312a.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.6.76.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 827b92a02d77bd7e149c128e73315547ca45312a X-VCS-Branch: master Date: Sat, 08 Feb 2025 18:35:05 +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: d093e051-cea3-4755-b877-0a4e55ce9b2e X-Archives-Hash: 1b6772c91ba130ad7b1c6c90cc3f3edd commit: 827b92a02d77bd7e149c128e73315547ca45312a Author: Michał Górny gentoo org> AuthorDate: Sat Feb 8 17:34:53 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Feb 8 18:35:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=827b92a0 sys-kernel/gentoo-kernel-bin: Bump to 6.6.76 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.6.76.ebuild | 183 +++++++++++++++++++++ 2 files changed, 189 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index f85aa20bb078..fed56c595e16 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -24,6 +24,8 @@ DIST genpatches-6.6-83.base.tar.xz 4270596 BLAKE2B f94c4d0387957b4384a893f37bd23 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 DIST genpatches-6.6-84.extras.tar.xz 4052 BLAKE2B df83469e572dd8c8df747a546649ef6daf570c064d5a8b8c75823a9eb86564e93742d468d76c1a1d50fe1269c1f77be0d52e6a3e0259fc96d5b0d4e340d4b157 SHA512 06ca529e5ce3fca530e0708c198fee3764bf0b79d361b0aa6f0bb4153f3dfb018fca2d63c749093347ae625f26204e28f50d3b74d91d4d6158ef055dc18c47f0 +DIST genpatches-6.6-85.base.tar.xz 4392112 BLAKE2B f373bf5719fe6b1148a1cdb8e38cc5a0efd60d78353c2a79b562f26c4156cd94eaf60e2534c2b9b6bac655ed6a58d294d1afc7961607aa1f505925d3cd49840b SHA512 95bd5611ee602478b46711653d022b0252027b101ac4fa6a6b6332308f6c6ed3f211b4abc858052d00eda6e3ca14a772ff45b0d4009f9b975abf2219049c201b +DIST genpatches-6.6-85.extras.tar.xz 4056 BLAKE2B fde9e8fb71fa1017338e793487ff7c5b02125b77ec9c8ba9417d23256201c794bff30f681f685ea398fc762711d2e7104f35a0a5a4cbfeb7b13dc894126e78f4 SHA512 7b96d2c7c805a14db1d500e94bb9077eb6826c3f115fa378620b6ad82da98ad3bac377f2a12b17ae6ec2d456abe1faca3088763f03784838d02ec5d33b629dc2 DIST gentoo-kernel-5.10.233-1.amd64.gpkg.tar 63692800 BLAKE2B b1807bcd074455292610a08353a8cbd329c9c8eddc09bae9bc089d6c1dc099a3937a98017f577d5d90cf7b7ca15c92845d16af7a124d08b9057a56c5fcc13a6d SHA512 95889f3754ea1601e063866a59599389229346b195b5247151dd34f6fcd397424d9d504a5aefe7d8424e62a4a043e9d9c82fcd32e633928e3905c89baef6e608 DIST gentoo-kernel-5.10.233-1.arm64.gpkg.tar 56842240 BLAKE2B 80650d6155278c12120fcd831018b565bafcbfa34f782c9a0038d5cf950d975c9eb66754cef37a72379813241359582f1746066dbffd34d11be5b35c64591412 SHA512 c74297b9035a0f74e98ef609a7bf81017f78cec0e1759c278f6f18504f9ae1a2f1609d6286530ceb19ce90c713f7af39abf531b7b3d4ccf5ad2390c207ffae3a DIST gentoo-kernel-5.10.233-1.ppc64le.gpkg.tar 52828160 BLAKE2B e7297dfab0cc9303c31f97772c0f91bd47f5e15c7b618b86d701b399cffdf06b58519381be73c6e0c67e8848929a1e058757e82e8653eb90b04e1d5e31e5277b SHA512 1aaf95701bd26cb16a65d9436fb7f6b0a62d74fab6d30bb1cc87b24be91b2149b265411053b14d31d4ff7b4f61c08ef53a589fc9934700a7326bb0cc18603e3b @@ -76,6 +78,10 @@ DIST gentoo-kernel-6.6.75-1.amd64.gpkg.tar 270049280 BLAKE2B 240f983b90ec46f3be9 DIST gentoo-kernel-6.6.75-1.arm64.gpkg.tar 245934080 BLAKE2B 44a5131716d725b733075cc7f689f184820ef7e8a95ab2fc810e4f1ac3f4f5689c01e6a91a51eb329926dafe706061bbc6d64927981b7c427f07141eda0eb687 SHA512 acd42c8a4ab5f035a6612e7006f9d5a71c416e5d42fdfc3946fb3cdec210cd0a311b091ce407396ac0966cfd603b83d17475019d03355095b99b7a1c2e829bf0 DIST gentoo-kernel-6.6.75-1.ppc64le.gpkg.tar 64409600 BLAKE2B 264a885622bcc9f84d82f4b8091eedf8545a3c58722668cff6d1a5421246a3f35b342c7d2f58fd5f631323ce787f712a275b9d492c965fa948b907f588588ca7 SHA512 06ab51df6df9c24f138b19f735f09ca237b1548a74882fde2ce0fe2654c70241c62ad4ace8bb114ff6640e51ab71d223965cce9c70740f1367dc5f8cb8e30f8b DIST gentoo-kernel-6.6.75-1.x86.gpkg.tar 68556800 BLAKE2B aabb3f526874dd0177c54a7500a9a6ce90caba168281dcd6a8ea30c35f771166b84af150e6536b25cf1476f7757bb1c449309b0c271ceb2f1024d7232e22731b SHA512 bbccd51d501355425aa7ddd44c37fcf61e627c1bce1ceee568fda9d8effb424b373d4de9d3ad87f5522a7c40682b9d119008bd81902b99b46c8d949c122387cc +DIST gentoo-kernel-6.6.76-1.amd64.gpkg.tar 269987840 BLAKE2B b446aaa0789bfcab7e1d9f43123368a3ff30a3a9bd007bbbe24cccf708345168adc8cfab5fddf5e014afcbb04896faddbce1309312b49636e25d07b28bad526b SHA512 180cb1a5c0f38edd618a5000e9bb8b968819fbd1056c9fbb774a87f93d3b87fc6fc0bd488aca27c1dfcdd33838586c086d603e84639595cc3774839b15aca621 +DIST gentoo-kernel-6.6.76-1.arm64.gpkg.tar 245903360 BLAKE2B 02ef5017a9fb10e6fc16ab32db54bc0d3f1545910a57fb9b3b0f464dbe94ced67c45ecf1ae944c854e2a30742d829f5b77e3ed65299c0af659a4fb861c774833 SHA512 2280b9e1a9b84464bd8f9be21f89e46cbaf5b88c812c61bd0afeea1cf8480a3f5f0a7995f0339bea95abac1f398b47ff90bde6a32f06a89114b5fd1735971ae5 +DIST gentoo-kernel-6.6.76-1.ppc64le.gpkg.tar 64409600 BLAKE2B 5dd98062e64856483dcf2144bd526f8b2f3d92361e2616328e356d1ba70f9731c58d3be7c3928b5d72b1b2330876609884ce905baad2bcd2e20d97db0fc3aa4e SHA512 ea35133f8d7a37dc690825f2428d77d930079a9d58cdfea4ae1aaae251ae092fcaeb20b6519b5c6732593fe55c027b87cb391e394d27489d162f55ca8c446e82 +DIST gentoo-kernel-6.6.76-1.x86.gpkg.tar 68567040 BLAKE2B c54b2326a264181845a982a16ea522e3ae640524da1d84828bb53bf0f1209d78ecc36e0df7a7bdbb18197d18139b0898f44ac64e949f80d0b8b3e8f6195d4c71 SHA512 3bed7e115daa8a3554c91adf80ca330fbdf4425ea033a1c87f82a37051df75760467aba6ddad0d6e7337ac7b75ad32346086771ec858f0ac85c1e4d49aae391a DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.76.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.76.ebuild new file mode 100644 index 000000000000..7ffb1f6159f9 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.76.ebuild @@ -0,0 +1,183 @@ +# 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##*.} + 9 )) +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 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 + # 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}/usr/src/linux-${KPV}"/ || 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 +}