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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C420E15812D for ; Mon, 30 Dec 2024 14:49:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D1EBBE076B; Mon, 30 Dec 2024 14:49:00 +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 AFF6CE076B for ; Mon, 30 Dec 2024 14:49:00 +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 E8048335D2B for ; Mon, 30 Dec 2024 14:48:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7A5B2126A for ; Mon, 30 Dec 2024 14:48:58 +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: <1735570134.22e513c204fc1697084868aa0a8f55797e8f9cdc.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.68-r1.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 22e513c204fc1697084868aa0a8f55797e8f9cdc X-VCS-Branch: master Date: Mon, 30 Dec 2024 14:48:58 +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: 6bd25728-0eb0-4336-bfd0-a740ea825b4c X-Archives-Hash: 01a511b21c78e9d94ed6055386fb32e1 commit: 22e513c204fc1697084868aa0a8f55797e8f9cdc Author: Michał Górny gentoo org> AuthorDate: Mon Dec 30 14:47:23 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Dec 30 14:48:54 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e513c2 sys-kernel/gentoo-kernel-bin: Bump to 6.6.68-r1 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.6.68-r1.ebuild | 181 +++++++++++++++++++++ 2 files changed, 187 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 69a9ed5b4981..ae6c21322ba7 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -12,6 +12,8 @@ DIST genpatches-6.6-75.base.tar.xz 4089936 BLAKE2B f88b0f84e3d73f87025389a3a66ed DIST genpatches-6.6-75.extras.tar.xz 4056 BLAKE2B 6e2e14f16a7ebc675e84b180a8f26f485aece3f22de1d27bef60b414deea8f3744cbd95536b58722d793aee320b505d5ca3c0af0b1e20f238b02c29a12abada9 SHA512 c8030df10b17675adf3c48931f04c59d1795598c955eef39c7b3dd4f36c1af1d79e8d7405004952cfe4922cf100aa95d2fe3d7c6f6e0d683276d5382bebce399 DIST genpatches-6.6-76.base.tar.xz 4119292 BLAKE2B 643510f5f01b8b7ac5c24098cd65b21ef02fd75b2682b371b00e8be48c6c335e7135569c58ad91ab6549e298b1dca15b83806143bf260a9e594feeffb2178fc5 SHA512 1345c21e33f3f0433691e03921c7b3d47bfdaad47376c06610170cf82214e3648cbbd2cb250ea4877d5c238f324f499b52e50dd2e5b51b4e336f2a1a5a431a1e DIST genpatches-6.6-76.extras.tar.xz 4056 BLAKE2B 51631e3f138ac1f5146bc8d70f3381ad64e8341336cb1d706b2b3f838c6b5e884a1c60745bebf73ea25ae7ec26ec049d76db7e260593b3e7a4795b98d4488734 SHA512 fdff2ce695891603f3b9bd6b3a44df526559f454edde20e5159c9e53d73fc9820eba1836ef81b22da9d3adf7906fda16e9b6e6a3df65bff56519c40dad56ccc5 +DIST genpatches-6.6-77.base.tar.xz 4120472 BLAKE2B 99c511e049d8b375eb54c8c00688e695d22629a758234fa47e11222b5ab2a448c22e2fc29bff59c95e1c39992e38a22286e791a9dab16b0e3acf59f1681c6adf SHA512 1626b4b76bfe3ae1c6c01d11909fb65fbec2e570d987268aefdcad5558aaf2a3a95f3f159b73e1eeef4d66abc5f42b965d3c9200224433b788fc1a3400a3b9bc +DIST genpatches-6.6-77.extras.tar.xz 4056 BLAKE2B 72ee0f92105f7e24d08e54614b5fa1514ee8ff75de5781474f56a3655665c5d3152771e3379bb431fb73ce19780620de72858cf64585109033c851be05efb0f0 SHA512 afd1947987efc0268727e6019910aff4f8860ab60707a32a289a454253519137dd7e8da92ea2743706b124ef873f854ff8ed6b3eac719523ca5ff94f466b261e DIST gentoo-kernel-5.10.232-1.amd64.gpkg.tar 63672320 BLAKE2B 43d75308443842d0dbc65d355c09ae0806c187c4ea3e9c87d5322a236081aefa6a1af8661ae1d6203fef60b574996b0dd53699bfe07eb67b08b58f1aa20c3995 SHA512 f5838299ec65113eeabd7e516375641857de9512e9b6bc4e85ecffffb91519baeea4b0eb2769d5e675740620e431fc9955d76fa04524c50f1c292518e8c42d33 DIST gentoo-kernel-5.10.232-1.arm64.gpkg.tar 56852480 BLAKE2B 6f628a7d0b7feb82c903e2814b2f02ceac867270356ffd3d06ad5bf03a55da340e089739fac83ef727fa03148a7adcef5f00e295a26f7f88ea46cdecb7183b94 SHA512 dc06388259a4d5878c7045eeece9393edbd0981538ae9b7208e3dd4aedc49d9b5f71178812765242cd0383145529af4a273de165c15c1d72f2e852a18620227c DIST gentoo-kernel-5.10.232-1.ppc64le.gpkg.tar 52828160 BLAKE2B 1a77533dc0bd3072311120b62246fe8ed2ee57c06354cdd1aa3657ef2aa21f3adaa780910a3f357804fedd6d65006bcb5ba29d5786d291f51acd1142c706118e SHA512 de8aa68bc5960b5dcca618641fdb570dbb77b83f4f02a28f0522f491af0a7d83795879d9b50a1a19c780ef6d4b941019d9cc945af31b8eac7219f5647ede6440 @@ -40,6 +42,10 @@ DIST gentoo-kernel-6.6.68-1.amd64.gpkg.tar 267837440 BLAKE2B 739f981f2d04c9ee5c7 DIST gentoo-kernel-6.6.68-1.arm64.gpkg.tar 242391040 BLAKE2B afa95daf6586db7aaca1f76c8db57590b6046edd3f130f4b5ff56d87b6f5e63a8487969f46e3c6caf03d655332e7f547a9c38cbf0d26f92d8901e2c243017d84 SHA512 1bcd6e1b868fff20f4c85658b683796573f8c33b1cddeb367456cb1f6ffa38cc1c03a025ae078031f3768ac6158029aa8971aced6345089b4070064b4ba0d7d9 DIST gentoo-kernel-6.6.68-1.ppc64le.gpkg.tar 64399360 BLAKE2B 89f8c4095d6348058c03675b905b1484ddb058e6f8329b9b06fb9c9e3082fb5f48f0d32d1618a3c591d1ac0f81cb135139314f9797a9b19d8d93f0ed30dbc8f0 SHA512 0fce07afd3d590d63e54cb2adac5ffbce6d7053c2339245ff85b8e1efa5008094cad896b946a8b39f49d9dc1a5346a60ceea23128170d1562ddc3a5c12d63560 DIST gentoo-kernel-6.6.68-1.x86.gpkg.tar 68546560 BLAKE2B 632080048137222a79feb436ba8d82e0ac94d8c2d9d5e60c44fc3e68e53ab1e42c1e6d3f8858688e9b72824eb76e24ff1f8b1d1b119c78678a9264819c29d07d SHA512 ee350fd348a4493200ce61567b8dca79bc4ddfca8292d794e7429c26620f08ac66f7fc06145becab5fb0d32415aba1b10f3c19d3046b024d1785b1cd62485346 +DIST gentoo-kernel-6.6.68-r1-1.amd64.gpkg.tar 267929600 BLAKE2B 0c528d6ce1ac12f1c0f18de8ab0d472f49c074135255a185c4a59c9549fa96dddefb2a72cf260e6990441066c84a8efd248bf0d87099a0aeb581e18a29b8713a SHA512 eb370c828792c50426a72b356ebac609f1f941fdded9063861a678efbed4d31cb022cdf9554439e99726e347adf49a90ac874ee0c7f08df731a6cc726bb75eb0 +DIST gentoo-kernel-6.6.68-r1-1.arm64.gpkg.tar 242442240 BLAKE2B 16b23d8610329efded5161e971373ea6d79235dd15f09f4f07b2b9f4bd6259762e13d379c861660813313c0f478ccf56e74b70a2003739108f3baa9c940c214e SHA512 5d657ef9cf777957566ee55e480b10e420dc0fb310594e3457a37c4736a9ff283ba7a1156aa07adf4193862eac4ed4c1739f10dd9ff61737618b49290d5b5d4c +DIST gentoo-kernel-6.6.68-r1-1.ppc64le.gpkg.tar 64389120 BLAKE2B 93e588eebbad6af84c947b6466397a17df1a0ff1d4d0bf98fe4ee777b87556e4994c8053ac8ae146898e7a0f909734797cb964d4dfeb7f2917e22e51908ece94 SHA512 19313998663719837d05c3a0140c0a93ca5ed9d134e7d324e7416fdbda00957954c817897750a71c1568f00bc8482c6f2d0f7555e528731553aa66726f998145 +DIST gentoo-kernel-6.6.68-r1-1.x86.gpkg.tar 68546560 BLAKE2B 52f703001f82e8ad0e4cc6b93ef6ee9e8869ec5addaf2901b41471a92c6764c2f7c3911542ad325f0803a4327860d90f8fdc2eb2f2bfa8e8a75b39e33fc9b8c5 SHA512 c3df574696f672c04e89478905fed5be470b8881090ab3b665a22a377ff4847da311d27190b6b4ad13cdd83d73f63a0907582c786c4280a9930cf3c03ceefa0e 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.68-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.68-r1.ebuild new file mode 100644 index 000000000000..dbe800373773 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.68-r1.ebuild @@ -0,0 +1,181 @@ +# 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##*.} + 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 +" + +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 +}