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 29B7D15815E for ; Thu, 1 Feb 2024 15:41:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A29FBE2A5B; Thu, 1 Feb 2024 15:41:04 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 7C9A6E2A5A for ; Thu, 1 Feb 2024 15:41:04 +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 BBE04343227 for ; Thu, 1 Feb 2024 15:41:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E982514CB for ; Thu, 1 Feb 2024 15:41:00 +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: <1706802057.588e53dc1a5a30541c37c19a76fcb91ad56ce09c.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.7.3.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 588e53dc1a5a30541c37c19a76fcb91ad56ce09c X-VCS-Branch: master Date: Thu, 1 Feb 2024 15:41:00 +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: 0662d113-43dc-444d-b907-ea042202a3b2 X-Archives-Hash: 0a161bb56ce27631bd4699444b1c1838 commit: 588e53dc1a5a30541c37c19a76fcb91ad56ce09c Author: Michał Górny gentoo org> AuthorDate: Thu Feb 1 15:25:53 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Feb 1 15:40:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=588e53dc sys-kernel/gentoo-kernel-bin: Bump to 6.7.3 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 4 + .../gentoo-kernel-bin-6.7.3.ebuild | 161 +++++++++++++++++++++ 2 files changed, 165 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index d3a887a0fa82..81c245d40f13 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -76,6 +76,10 @@ DIST gentoo-kernel-6.7.2-r1-1.amd64.gpkg.tar 148172800 BLAKE2B 115940819c422ad97 DIST gentoo-kernel-6.7.2-r1-1.arm64.gpkg.tar 120750080 BLAKE2B fed0208b7b8cc75d267cde94b87ddfdb710a0f78a3bfefbd4a21d1bc2b6a4fae0601272e9a3048aee85ae90439504523c21788266da2d76a8ae9d44198e29418 SHA512 6fa187abacae81c8ac48b49cf24f13d00e48ab82f41dc65262d072bc31e8443d49e09c2817dff5b88f6d181b20a66e7a479e05de90e684c7a84753e6c8d7dee9 DIST gentoo-kernel-6.7.2-r1-1.ppc64le.gpkg.tar 65474560 BLAKE2B 4c05b042af87543f8bf3fd36a78f7ca95b478129f10aeb1b0eec1e0340583ece0b06cbf2960f28af173b140b3cf87054d92049449ab62957b4ffb5385af4247d SHA512 4bc5cc3ee50017f50c5a23fd1e823b61108873d579f9036f9b994cae12d81bbdfb4c300286a865b0d4b26e291e0c624f2ade0d3dce67803cea2f1face988985d DIST gentoo-kernel-6.7.2-r1-1.x86.gpkg.tar 69457920 BLAKE2B e1be7f1a47a14d6672fcece12a00b99131be34e19e22bfacb3ef2e56b634115d11c553bdbb0fd0157727aadf9ef2a591f4c430a4698e3c9c127c28e01af992ff SHA512 af52a0c5d6976c42079f6caab2e9ec735824d2d8109b17f55adabfc535fe5661c478e95b88336241ecb6fac93ac3628c257b18ad0bdb5beff4a21f1e9faf86b2 +DIST gentoo-kernel-6.7.3-1.amd64.gpkg.tar 148244480 BLAKE2B 358f16d7bf24604089269040f4ebe95d36d2a262b0ade9bfafd67c9c27b114347fe453372658821ef269054d553e4c10fb4d38ccd9336e165e9e971302371811 SHA512 2848f125607db38b14755d3b6a1b1071dc7ddcc578c08cae51bb6397ca8a1c00691aacb4cb446da84e4a4552a156edb86f197d199b4e472efbb8f64a34a6b4ed +DIST gentoo-kernel-6.7.3-1.arm64.gpkg.tar 120780800 BLAKE2B bf3383944f88535d553c1b9dd143da0c209b96acc7eb95219eba9c7ff08ba4e1602609b958e14fa88f64e4b6e4f23ac3204fab2ff5f3e2cd2a0310a672a6c902 SHA512 834ec10ea9d94083cbba56264f393a190caf3863d7107b5a5bfd67ea3c73ccb09a2b2ea7574a4ea33c65e2d8e8a75cbe67688e8ceccbfce19b624ce9d73a641a +DIST gentoo-kernel-6.7.3-1.ppc64le.gpkg.tar 65495040 BLAKE2B f429cdc3a16f62f700aea29c36a0b6f938effdc918ffc98210a9436e26d1f37ab492b4095ca601b8a40fa14a85a237c034a33710481a143b61d4b5ca645388a7 SHA512 9de8fc66a2d5485b6374c99cf3468756211cb30962c7f1d27552d620321ba05b6ffa776455a755f8b49511cd9b6f5dc6df62e90607397eec4100be39e3c0daff +DIST gentoo-kernel-6.7.3-1.x86.gpkg.tar 69478400 BLAKE2B 9f53e78c084af44389c0b752b90f5872530e62192c2198e76df534278da911322320d97ffc6412e3bdb9a047d5f70913c652abca990d33f89e992752d8979351 SHA512 4a1d8e7d30d87c5b1e0982e769792ea4dbc8e9a945ed57a674def5b78d2ee22c8f3712149887b489089d2c6bf8d930f32b560c3da7e787a7299bd4bd4353932e 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.7.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.3.ebuild new file mode 100644 index 000000000000..44d02e88809f --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.3.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##*.} + 2 )) +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 +}