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 1736B1582EF for ; Mon, 17 Feb 2025 20:48:01 +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 022693431F0 for ; Mon, 17 Feb 2025 20:48:01 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id EAC8D110486; 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 E01BB110485 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 80C06343191 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 45F0227F9 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: <1739825230.47dd18c86dd0199a13e365fa1f9bbc02e1b5ffe4.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.78.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 47dd18c86dd0199a13e365fa1f9bbc02e1b5ffe4 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: 4cdfcd01-c41d-467e-928b-cce10a0370e3 X-Archives-Hash: 05d64fae70fa5f041a25910f566d4d2c commit: 47dd18c86dd0199a13e365fa1f9bbc02e1b5ffe4 Author: Michał Górny gentoo org> AuthorDate: Mon Feb 17 20:20:11 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Feb 17 20:47:10 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47dd18c8 sys-kernel/gentoo-kernel-bin: Bump to 6.6.78 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.6.78.ebuild | 183 +++++++++++++++++++++ 2 files changed, 189 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 6f6edf322d02..e4356a7e345f 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -32,6 +32,8 @@ DIST genpatches-6.6-85.base.tar.xz 4392112 BLAKE2B f373bf5719fe6b1148a1cdb8e38cc DIST genpatches-6.6-85.extras.tar.xz 4056 BLAKE2B fde9e8fb71fa1017338e793487ff7c5b02125b77ec9c8ba9417d23256201c794bff30f681f685ea398fc762711d2e7104f35a0a5a4cbfeb7b13dc894126e78f4 SHA512 7b96d2c7c805a14db1d500e94bb9077eb6826c3f115fa378620b6ad82da98ad3bac377f2a12b17ae6ec2d456abe1faca3088763f03784838d02ec5d33b629dc2 DIST genpatches-6.6-86.base.tar.xz 4392576 BLAKE2B a141cac65c0de51f71210a5f392bc4347647c3935d7fce58b70096e2d0622d9e5d192e2d3518770e3963413f1f46cfa7af8d64823885520128f10cabf76b63aa SHA512 163dd4ff65b3697aa89dee9e3b0a0b481d41da03016f1631fce27bdab31a9f7f1dcea28f025684be881eff8c17c77f5a5a8ab19cbca9cb2e2c99235dc1a3c79a DIST genpatches-6.6-86.extras.tar.xz 4056 BLAKE2B 4c46bc6c6c44cda1bc3efa60f4f20fe54b5fb96a87f607f0f56335f210cce191afbb5a60ce89be0c4bab244677ca411b2de5659e8fd18f6e7a8a6768498e244f SHA512 6901c9d6d1edd3049332f38319dbf390fd9f2429325f0a4d5e01ba60dd140fe952d2543cce3b98f0b95bc8373dc1684fff2e4b0abe535694c018f88fd503fbd5 +DIST genpatches-6.6-87.base.tar.xz 4450476 BLAKE2B af19b06ddf53c5b6a16d0a9fca60cc895a4a7e6a0f5cfd65e291388b66ce2c0c47fdc5e71a7074b1bda5f7957f27c3ccc03fc03a08d7d0782344e6e0bf66beb4 SHA512 a9d2574870f910eaf4ab05f659a95aa14ce920603112aa2d6465ead5053c6a5e9e608041afa12d54c673372cd0dc2ac5c64705347ad88d93cd3a5a0b1132a14e +DIST genpatches-6.6-87.extras.tar.xz 4056 BLAKE2B 264ef764aa9b813fe6877cee3e64b2d88c1166d5a09c7ae25b18f1b860ec5f4a4f80503c39b596bbb3479b83579137389feeaab14bf507d15089d4c1bc62cee3 SHA512 e8c9b76b6c44ba0d847dd9ee82e3dfe48f65d25289fda97d076d624767cc28d9e8ddf119f921d37b4e391116e7b8a03243c02c7be3b7ea8b7533e5c979f39efd 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 @@ -100,6 +102,10 @@ DIST gentoo-kernel-6.6.77-1.amd64.gpkg.tar 270223360 BLAKE2B f533fe9caa1b0d02cdd DIST gentoo-kernel-6.6.77-1.arm64.gpkg.tar 246026240 BLAKE2B 31a3f3ca80108258f676b5b0c494848d2317e23b8086f112d0b4cceb3610f4b81954d9b004add795ef3f63e7693990613f41d44c55e5dea9a686c98a96d34bce SHA512 08ce8be020ecf27f64ba587149c0db6b0ef9389fd8c006bef1f7194d3134358e06de265afecc07695e23690079b7da729d295c4c4d71a49320de3f853af0a069 DIST gentoo-kernel-6.6.77-1.ppc64le.gpkg.tar 64419840 BLAKE2B 25f1013b90af41bd300d5c7a4241eade3ab88352028976eca6fbdd9d694d01b7a5dc15b16ec9e18220fe32024aa18c0a79cd8508c71d879b69034dc5b63e13b0 SHA512 082d26454466a4c9837663b84ec00eb5425b14a88228167781582492ea2e8b991f53a464e907f7957e4cd3b2c5e4ebcb1e5e242ae90f501e095dd1ad342d50f1 DIST gentoo-kernel-6.6.77-1.x86.gpkg.tar 68577280 BLAKE2B 59be0b1e4f3904e068c8c0152fb97c28d14c43570c076e33c05456682cacf49d966e89852a402fea3a587ad8ecf378e006b18a50f0e3cb40cb2e00cc109d0a8b SHA512 97215eeae6d729f1cda0febac602a7f8053fe066ad6b0ec21962c920958cc659c448c58d1b5c5bbdc9359d640ab0c9350941cf1652e3f36ad6a22db98b5315cc +DIST gentoo-kernel-6.6.78-1.amd64.gpkg.tar 273070080 BLAKE2B e3fee5cc9336a3e637cdac151475d2cd3bd3358d46f13e1ec033511007a9818828bb9e6536644fe4d40af27c7736f68871bce1347d2afae73154ca97a71c9bbd SHA512 a33ae35699a8194cae5975e42c3c2716d43f0762f8b41801ea0d79f1efdd4cc3485499b2da3b13328aa43885cc0b4aea98577c895236e6d2d218576d74b7c879 +DIST gentoo-kernel-6.6.78-1.arm64.gpkg.tar 246056960 BLAKE2B eb0f726cd30e3ae9219ee14a745a27ce04244a1c337c360bfed1f5e960d81eb112a8517cbe2d59e25b394971c4955a8f5bd2b5e7633e52517af1281fb4e9c08c SHA512 316da345620b1977503075fcc7fccc22cbc27928a580781e37d72d36e4d43e6f9988016406dd162ef6dbebf86c0f0ab2ad5c8fe09c0d1bd9aac6ef1a4cc1081a +DIST gentoo-kernel-6.6.78-1.ppc64le.gpkg.tar 64409600 BLAKE2B ba45cc0fb27801c8e7da99580304b2104a314ef564ee5ccbe51f532f3494aec184f29d2cfc1e683afd131a70ce64cc5306de2784c9c1d0e2e42b184a08db01a4 SHA512 2986be3aac9de286b8aea944c5e3a556af9ed17bf38ebba5d3cbcbad4a4dc74ece79861b67b4385acc56987c611aab470d0259cdfa87649bef6abcc13c2de9fa +DIST gentoo-kernel-6.6.78-1.x86.gpkg.tar 68567040 BLAKE2B 217ada177376f447cb3bfd04f7c4bc8decc56842d493e8cd9b962d946c69609c06a7d85741bc725cd64980b3505227529036ca9c76aa4e660e9483d5eeed700d SHA512 0284e192a30ea7882c6f34fd01387aac827838f784d5dda98292431043808ad5b5a1581f313d47172ad75e94c03d623cfb4f3de391a8d12a8e96a697638f17c5 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.78.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.78.ebuild new file mode 100644 index 000000000000..7ffb1f6159f9 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.78.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 +}