From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2EB9A158041 for ; Sat, 16 Mar 2024 08:30:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A79A1E2A08; Sat, 16 Mar 2024 08:30:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 pigeon.gentoo.org (Postfix) with ESMTPS id 8BF2CE2A08 for ; Sat, 16 Mar 2024 08:30:14 +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 CD9AC33BE42 for ; Sat, 16 Mar 2024 08:30:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 621481529 for ; Sat, 16 Mar 2024 08:30:10 +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: <1710577744.77596c5d0deab160ce802df2901f8437a4b9f0ac.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.22.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 77596c5d0deab160ce802df2901f8437a4b9f0ac X-VCS-Branch: master Date: Sat, 16 Mar 2024 08:30:10 +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: 79f73c8b-8098-4281-bf01-565fbc5400f5 X-Archives-Hash: 75fc159c5657d21a8585186e251f1f61 commit: 77596c5d0deab160ce802df2901f8437a4b9f0ac Author: Michał Górny gentoo org> AuthorDate: Sat Mar 16 08:22:24 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Mar 16 08:29:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77596c5d sys-kernel/gentoo-kernel-bin: Bump to 6.6.22 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.6.22.ebuild | 161 +++++++++++++++++++++ 2 files changed, 167 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 9f8631384a75..1c3f99033358 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -40,6 +40,8 @@ DIST genpatches-6.6-25.base.tar.xz 1351392 BLAKE2B e1f5df7796f7d50a244c37d2b5e4e DIST genpatches-6.6-25.extras.tar.xz 3704 BLAKE2B e7709d6dc9f02a24a5efff213e4357a25777364cce38387b5a12149915017cf229546993de40b4e2aaa6c107b1930f091e5399c14b660d07f3e73a1a6c4f287f SHA512 babba6d4e397a1594d74dac9e588fe87ebc07523ddb5a8e4b23028043534a965d29a728cf7958da90e6544a3e1d0fc29de65542610f5ad513ca7d7edb5a89c5b DIST genpatches-6.6-27.base.tar.xz 1392292 BLAKE2B 46e3c354f7c27182c2f97bd20c165fa8bb79317bb136afbbe1e0906cd405e7cbcab1293e724cda38491f0d1cd9e9009146f18ad9b5ecf54526e69aae43fbc9e8 SHA512 363d26f9410e2d526f07c0831d36733999ec284ee01d684ad15aa5856b007a2d2a189ca414358da87a479dcbbea7ae24add9d8019b4c41c8bf1aae7b67a3b490 DIST genpatches-6.6-27.extras.tar.xz 3700 BLAKE2B 36a21c970dd2c8f72a4496b9f72faea3e94fba49342e00b7cdfc0ca6d4f3ab14fef161a7d02ad13b1c7db73af3c96b1c145453d0645791b46b34f599b3947582 SHA512 996a1b0a5c625043ececbeacc648f4dd71da2e239482ca515b680b146ba6041feeb0924929b1b2b6ee4f3ecc24c85926e54e28058d9401d4399282151332dfce +DIST genpatches-6.6-28.base.tar.xz 1406852 BLAKE2B 09691b429951a495b8dc0e076930d72f4f5c51c0f41cc0779d7c27bd1c161e007ab6ca9007ef43db4aeed4ead3ba84dcd93ba2b31fdd689c785fc38d0c46425a SHA512 500492b25b5a8eab5781e3c7758fa1685b1050bdf30b0c8fbb306db078de1bf06e0aeea6547fd7fa868dcb84047d9842f37f5851e3637633f693a5b653cfae96 +DIST genpatches-6.6-28.extras.tar.xz 3704 BLAKE2B a1c1a33eee156346766d88b142a1f199f483e3589930537c1329ef2e5946780278e902f2c912a639779ac76c61782b526b3dec8434ff678f30d4a6bbe4b95238 SHA512 f1ca783a6a90bdc40c92f004b01cd9ec4ae13db9b6ed71708c4489155df95c900d395ba3b682e62dcb69d71151f38759cc128b9775e3983d3760c01a1b453ae0 DIST genpatches-6.7-10.base.tar.xz 599552 BLAKE2B 952e3510f0e76381b0028179599e7bc05e6ad6a36a283abd4664cdc24d81d0ab287d6e1c077f489964608a86f3e7d8f4e2b9246bf01538b9d84cb80704f7474b SHA512 ec30398a92414b83d719b9f805edef1a8796e8b988a7384f75454f930a5a31ba05f1ea6ad1f48b2fb6e6d183450cc5ca10cf5c9f5c6bb3c47de27eda668fb76b DIST genpatches-6.7-10.extras.tar.xz 3704 BLAKE2B a5264482e3081f585475897242e27707a0cb5cc838a17b25bf50632625d0bfe983c889603df6aac1ae2f96466d13ded9783d7d8c118c5cb8d6beea132d436d87 SHA512 5656a2daa02ef9148ca22faf9c4e64dd3c79cc4eea9a99c697b5e8de29550e0743782b60c00f2030fe8a7370931d86cd6bfd37339eb272e6dfc70d52ed125951 DIST genpatches-6.7-11.base.tar.xz 699832 BLAKE2B 22ff0e1ae4ab7fe8376b06ded03e482860055afb70b74badac3412376fbc7c8d700e226834f4f966cd187bf0a321a7d194e4d7138ec094188fb4b8ac60e3bb6f SHA512 fbc948c6b7f1e8ce5c7eb3cfcd4ec65f93b20453751abbde0d02464db0ca1b8515aaddc0e61308c93f6726a41724c42db17dd23ffe7ac023ff07b42910d0a89f @@ -132,6 +134,10 @@ DIST gentoo-kernel-6.6.21-1.amd64.gpkg.tar 146585600 BLAKE2B 12d66fe9f0f1cfc00af DIST gentoo-kernel-6.6.21-1.arm64.gpkg.tar 119234560 BLAKE2B 516a6f7c564734b777d0ff3df63b414ff2a1cc1020fa1f5d1c52f7bde26810745a770718c5ecc12ca42c536a7c3efb430fefc5e8b7b091ecdda4edaa866c5a08 SHA512 143880a199dc92a8b1268a15346e3512933d8e8203dd1a981ecae063464a3723557324a2be7310073c3a08cd95fe79d80d28a1898b649481bb836384a8562426 DIST gentoo-kernel-6.6.21-1.ppc64le.gpkg.tar 64399360 BLAKE2B 54573396023eba5487e8d59e18358ad46ac7ae85d5b7482d48961d6da5d54d4c5d6f3ac9e2d685f956dfd90c68cb2a6319bd93492399635a9f197b02cf2cea7e SHA512 d8e4ec6a1944f9bc9dc4c666af6029fd68be78da8717b37d56390721355ad9c4cf2e1b718e17838fb41f1202d46f6f16147c802fcb06aad3b6037e9bdb623690 DIST gentoo-kernel-6.6.21-1.x86.gpkg.tar 68331520 BLAKE2B e0a5c3f316996a02f0bfa97a03bb2470bdc0a40b6649bf38de09ae822016fc7fcb1a2f9b0d4f5ed0f192b85d94f7acb41dbb3c83ce7d0c696261e41cae4e04a4 SHA512 db539299b91800f7a2623b197ca7d593e16eb1fc36adc9dd9744a725ef17a4cf9ad5eeeb1cc294225ffd24a424caaa728eb0cfe879a4e6ad8afe7291452c66af +DIST gentoo-kernel-6.6.22-1.amd64.gpkg.tar 147240960 BLAKE2B bf7141a2e71fbddf528b40e8f67eb3509569a576bfe6febe605642a6b367b330f334953df7081746376fd0a6280f5138350ef6a3dcf23007e7e7b468d0d82457 SHA512 048391d8203aacc38a6357904f99f6babd732eec0cab65f8904e8420b2ec19e88a8f848302ad9a9acf3555d5aa2657d3c1f2ff47b3ac2ece3de7d7c15d7660f5 +DIST gentoo-kernel-6.6.22-1.arm64.gpkg.tar 119234560 BLAKE2B 2c940875e0b75b2ba373de0b334f826c501f0eb572eae3095187c3999cd0f64b749f2e8b64ef06e9804d2d90c67aa418420ba2f88c316ee6680245362cde7beb SHA512 bb2116948b0343f51a380bc7ca4e04e7ad2aed8c89fe178ec1a6074ecfd5861b6c3c2a6990d47d8db503c2a4f4aa4bfe8f4bdeb38f1498d1a9aecdc850cfad44 +DIST gentoo-kernel-6.6.22-1.ppc64le.gpkg.tar 64389120 BLAKE2B 5afff380977b5021f48ca368321d33948144d68b03293b85aaa6ee5ed7d2aad86f62f563b898b7ba341dfef5667c3f9ab8d39dd0d4930193a65107a9331f67b1 SHA512 8d4c1135ec6c9b18752fa45a131f03e01fc5aecee73639f83a1e984cc395afb4c1426eb7d3275450eb15b2774735368e65cb17718258660ed6c9df86e5069217 +DIST gentoo-kernel-6.6.22-1.x86.gpkg.tar 68352000 BLAKE2B 01d9036c758e8cd45c3bd54a9cd88d326e110f8209ca14908723a71e21ce676b392d3343ee5a0ce8a62f5d94bf8ed4967bdf0fcd1947632d5eb0da1bda4c22d7 SHA512 7c344350332e53f2140cff466873f56154b190da38f3fcba35b1ec6bcf451371d22c61ddf4473fc52d4ab905b0188e5d61fcfbb96ab6d8cf847191651d6fa216 DIST gentoo-kernel-6.7.5-1.amd64.gpkg.tar 148234240 BLAKE2B 1501a044d3bed23c6b9ef4088b8c4624c3202fa0f7725bd5f7b7a9ab5a1dddd9d1e971fdece4ccc7ba4f9c27ed171bd969eab2871ffdbd7689c8e23831e78fff SHA512 c8a62137008761faf84e25fa31aa9c6617fe75d104e140f8551d5d91058a7e63e5cc334bb2bbcafb7cd9828f91f79d9c3088d11c05e97fcb53d42b6f000dab52 DIST gentoo-kernel-6.7.5-1.arm64.gpkg.tar 120791040 BLAKE2B 0d5936029886ba799f2f628b15a9fb0e29a132037fee6e4ae61c3eb9ab13608892279009cd6c65ea671bcda2efa922d29a2b4d1b1c689584e960503d47f388e9 SHA512 cc07a66a06388bcf5e777d121fee416c2e6ef85b0bca11d3554a4d74bba00898e08f7c0948696da42f46542d0e4092a8bdcc117404f3d7ab01ccf8bf52c0b671 DIST gentoo-kernel-6.7.5-1.ppc64le.gpkg.tar 65525760 BLAKE2B d33a320750728def46329b189c45ee15836b012616090414946dc6a1e8d676cefa33d094bdbc2c881502b95af9f1d9e0128e530962b855fa89730079272b8e96 SHA512 0320e5a2394d590cb519eb8ea97c2cd89d7eda9a35a1b9b33ee472705d44d60498a4483d20cf5048254e3adccfe77a3934e20e960d49cdc47079f6d7d5359f35 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.22.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.22.ebuild new file mode 100644 index 000000000000..b0e3fe1f8248 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.22.ebuild @@ -0,0 +1,161 @@ +# Copyright 2020-2024 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##*.} + 6 )) +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" + +RDEPEND=" + !sys-kernel/gentoo-kernel:${SLOT} +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" +BDEPEND=" + app-alternatives/bc + app-alternatives/lex + virtual/libelf + app-alternatives/yacc +" + +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 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)" + 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)" + + # 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 + + 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 +}