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 99C6D1584AD for ; Fri, 09 May 2025 17:40:37 +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 878523431F8 for ; Fri, 09 May 2025 17:40:37 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CCBE31104BB; Fri, 09 May 2025 17:40:12 +0000 (UTC) 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 bobolink.gentoo.org (Postfix) with ESMTPS id BFF7511036F for ; Fri, 09 May 2025 17:40:12 +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 729E23431DD for ; Fri, 09 May 2025 17:40:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA764289D for ; Fri, 09 May 2025 17:40:08 +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: <1746812402.8c319bd9b1825bc4a8448d04d6f8d2effc38480a.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.90.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8c319bd9b1825bc4a8448d04d6f8d2effc38480a X-VCS-Branch: master Date: Fri, 09 May 2025 17:40:08 +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: 8652988d-3335-49ba-b2bc-3d90f4166202 X-Archives-Hash: 78db86d802d46601923c5da586a41e20 commit: 8c319bd9b1825bc4a8448d04d6f8d2effc38480a Author: Michał Górny gentoo org> AuthorDate: Fri May 9 17:05:56 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri May 9 17:40:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c319bd9 sys-kernel/gentoo-kernel-bin: Bump to 6.6.90 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.6.90.ebuild | 183 +++++++++++++++++++++ 2 files changed, 189 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 1203b5d2dcb7..baf3bf594ef6 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -30,6 +30,8 @@ DIST genpatches-6.6-97.base.tar.xz 4911476 BLAKE2B 8bc5c6548182363c183b3fdfbf534 DIST genpatches-6.6-97.extras.tar.xz 4056 BLAKE2B ab29ea3f128eafcd229aa3280ef690e4e5d3f83fd4c85a4118a4c8ba5c1d5f7bd87c30659c972f917d193faa3261f1daa0c5b7144fe4c7be0247e78ab4285d76 SHA512 e586afbab5068e21821a0722f903c232dd36d24aad3e72c451870c52fdd37d5a8b43e2ef818340b8e9f9e49fa5e05684cf28465bb3b6e2a21a49d78b37e50f3f DIST genpatches-6.6-98.base.tar.xz 4964684 BLAKE2B 4e2c5e217bea6bde0ac3d89d09dd656104ca637e2abb69d0d67c217623d79b79c5b8141763c6457f8305434961b4458b53e916cd0526e96c5705e1da34648f32 SHA512 2f34f369038d4b60914728cb01da1a3f63bbcbda9fae46570fd513f589b4c43f53d75442c443ea8757e1b1598a11427695cc0abb6102e52e6d51c851feec9522 DIST genpatches-6.6-98.extras.tar.xz 4056 BLAKE2B feba4afd8a6bea12dff8f919d6f0368b703c1cfc2a123c73f6aa69cc9880bf4a81d8613eee9f5bc143eebac0409556b25f344cc6c6f07d8a4176db48fdb5490c SHA512 682271e16f0ce376353fda33bee558f4e0d1b73878848d79736f12e0783edf9fd456e5db5245936cf6a6eb4a96664f37c8266b900eca59726b8646c7104f5ee1 +DIST genpatches-6.6-99.base.tar.xz 5007676 BLAKE2B 329ad8c5071eafb1bd847d29c25c62d64644ab2c7baaf2d6fda3c6c2b835b909e81ae0521f14e34116417c6f9dd66b0435fadbb48a396da64695e688e8c5283f SHA512 8c86c666fd4dd13145d142a387ebe55ae31a00b1de54a7279a53a3c34eba3b7e11de1244ca96cb27ccaf2b6bde3227992f49b838f31b8216e6b052a99a81dbce +DIST genpatches-6.6-99.extras.tar.xz 4056 BLAKE2B 661e266acc99ed96ec63e0a7ae9cdfbb53fedde5d22907149bc896d5007f308303d1ca702bc0b423876e9b06d4b8d0ca3c6616703b215eb96c3c252cb38439ee SHA512 d0912695029ed341708d692742007ce3b2eeba99c5c9c470c7aa3ef3d3e138b85e29abcb952e01f56d7c35bd521a1be002fda234c2bb3bc32cef4630cb63da7d DIST gentoo-kernel-5.10.236-1.amd64.gpkg.tar 63764480 BLAKE2B 6954cad99d7461935a87b8bdaa441fc0f11c4af6401a819f9b7db6237412faeab2414d3c8eb09e04ae56f1fbda9e4a4197b9483dc241137b3c6032cbeeb592dd SHA512 3ed3f2f34a5f48ec84c462fd7bea4048b4eea76841317ceb7e16369bb3ca98392dd438b56e3b07cfef66d022fbe4d6aa62dd97f81d9cfb594e52b75a7f9c69b2 DIST gentoo-kernel-5.10.236-1.arm64.gpkg.tar 56872960 BLAKE2B 6a993e695e148180c820552a6b28d04556535edb6b48ac94ce7671553a3b53d4479f221a3fbffe93e981c45c1b0113f7aa5531d30193bdecfdaa62f671a3c7a1 SHA512 c13b9609c91587529da63b8e033b12e3b11917f47d7ed87d4356334c4d8c01ddad2b0004b05ddf5a3e97d7b3b0e1e1e9c76b3e6ee64e9d2784cb277ee3f6f71a DIST gentoo-kernel-5.10.236-1.ppc64le.gpkg.tar 52858880 BLAKE2B 36d601fc3c079dfbb97a6b586fd15fed8daab4f765b052072b8be1f4dfbfb05eb235e09e9218b041b0909e9166ad2ccbd3d58311a524e389960a7ba8088ab09e SHA512 84e519da063de8b2145fcbdaecdbb5ec1b959d25e6f1ede8675ace23ee0b9b8661da1396b2821a6f01f45260abf230f4ada67ee160b153ebacb3220e45ee1166 @@ -94,6 +96,10 @@ DIST gentoo-kernel-6.6.89-1.amd64.gpkg.tar 273500160 BLAKE2B 4c7f00c06f069174379 DIST gentoo-kernel-6.6.89-1.arm64.gpkg.tar 246394880 BLAKE2B baab0d68481d25efe6edcb88f2036399daa7f41553fac36a33988d75f1e656aab7bdd834aecbe87919346cbac7b278c7d331033d2ed906a340f93cbe246987a0 SHA512 789ec5a677f5191f2089c221932627e4362421a01740301c8dd22f95f326026243e1c9f67c38738172dd76dc7717d1c26e4bc4b66c5a5c57b45e1bb7172f9bc9 DIST gentoo-kernel-6.6.89-1.ppc64le.gpkg.tar 64440320 BLAKE2B 4e4525664c5787c4435354adfcb64d4f10106fba75db01b1ae0f174658b16d5b50eed6605647dfd4b273cd1583afa9b2e26a42d47f161a9e41fd9741b22747ed SHA512 76c6cfe280802c07a1f524286a298721f8408777fa3a3bbc8021f085732b3d7827c09c113a2fb1ca4a9801b772ee69c11bd654cae431d8cf54d71812bbce343f DIST gentoo-kernel-6.6.89-1.x86.gpkg.tar 68628480 BLAKE2B 9b721fb112a12b9400257b072b09f855f9e5ecfee4c79d2af0dc141e282bb70ee4ad7df8b186849b73d66fe697ad04ed2357b2eae773cd6d0f48f732f0dbb947 SHA512 c584dc744734e963b876e2109b4b8e52e99e2000049cef0f65081e8e00d0f184636105b108917822ec8a6bcee3de4d6395fb57cc80c72658ee4327875d74449e +DIST gentoo-kernel-6.6.90-1.amd64.gpkg.tar 273561600 BLAKE2B f902eae3f4c3b8ebc307aa2398ee899de7593c94ca1a7991f6953876c80fd9d70c29bf8e1a5a4d26464ba7ff3d9bf8d5e15a39d582438fc35078a00b5f30a951 SHA512 4a2a2267ad4cfe9c29754d9907f6f3330344f4c630ed175fa8006c07ba012d7012c5dd71aa29733f171503ace0ecdcfd1826654432ce649681a395e28afc8e32 +DIST gentoo-kernel-6.6.90-1.arm64.gpkg.tar 246435840 BLAKE2B 49b63384c8cea2208b938923cf8299eb94a2de0cc40b0a5c45680ca39235da2658d73cd7e461eaf46750734fea5cde8d61ac44053cab1240dbb84e081ef07b87 SHA512 272fdbf09180b4e7e86ccc5be88f67731522e5661beadac15dcd2f796dd512cdd5574cd412c5889225c83c3e1ccb0328ce022f0d06303021ac4f133dc11396ab +DIST gentoo-kernel-6.6.90-1.ppc64le.gpkg.tar 64440320 BLAKE2B 3fc6cb6ed60f94a440563ac99c1333be5f66cfef8964f913d6515693b0b6d5fc3d3a3a50df3f29789bed5e9096ce253d0aec03e20876079b8c0d97972693aa36 SHA512 ed81315e3968bfd7409471e222b09196e4fb9c0cb1f3d5ecad9227ebe1b24d59db51feb751b4d3babde00623eb5b696e202d5739638fd0da500302522ddae8cc +DIST gentoo-kernel-6.6.90-1.x86.gpkg.tar 68638720 BLAKE2B 06fc2f3a7a3a7de7ffcce4c944bef17255ed1edf615e8b5679d13236b1b4e769a86c406b7ce91ea96a8e83cbe696dd6061b776afd3e0485b507ce99d71ebcf13 SHA512 95616f2214b0eb93aae4d279eb8c8cfb3eb5a720fe8e4c268361a7c8e400fff1a6517deec08cf7831c455f127328f66ccb7067b530941b1656c04ddab6f85386 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.90.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.90.ebuild new file mode 100644 index 000000000000..7ffb1f6159f9 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.90.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 +}