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 036FE158091 for ; Thu, 19 Jun 2025 19:47:13 +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) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id E2B06341F5F for ; Thu, 19 Jun 2025 19:47:12 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 126FF11050C; Thu, 19 Jun 2025 19:46:54 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 0899C11050C for ; Thu, 19 Jun 2025 19:46:54 +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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 89A57341CFE for ; Thu, 19 Jun 2025 19:46:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C6C22A18 for ; Thu, 19 Jun 2025 19:46:51 +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: <1750362404.d55cd1c08b9ead63f3242b9368545f1b3b0a3699.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.15.3.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: d55cd1c08b9ead63f3242b9368545f1b3b0a3699 X-VCS-Branch: master Date: Thu, 19 Jun 2025 19:46:51 +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: 1c8cc13d-05c1-4072-9406-647bf2fd8b3c X-Archives-Hash: 301aaf9fa6b3b027eea5c140511c0cfa commit: d55cd1c08b9ead63f3242b9368545f1b3b0a3699 Author: Michał Górny gentoo org> AuthorDate: Thu Jun 19 19:41:38 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jun 19 19:46:44 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d55cd1c0 sys-kernel/gentoo-kernel-bin: Bump to 6.15.3 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.15.3.ebuild | 184 +++++++++++++++++++++ 2 files changed, 190 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 2e0a4c2570a8..2558c9334b12 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -24,6 +24,8 @@ DIST genpatches-6.14-13.base.tar.xz 1078940 BLAKE2B f72a720249e1af5c22857137f372 DIST genpatches-6.14-13.extras.tar.xz 4052 BLAKE2B 54aa7ccfa296c21e1d058f364b5ad492cdc150f17d2a7d274b47d79ddea2aa64d955a3a8ca64e7ee4e641d1cd0d49fe1c3b83a5fc6dbba177ed679f269dd744e SHA512 07dc4bf9a76b88157465fce38bf66c20906d03e55d00f41ed62dc9bf56efd3d69a1791c1b0b192842365808e063d3042680146ec638f18641cfb0d117584dff8 DIST genpatches-6.15-3.base.tar.xz 29120 BLAKE2B ca6f4f619fddd98d7c75ef7ad9054c1b392b3fb2b83c3a70e1d6f34d07157a7410c67bc17793fb9aa69a5736b9a68983db19a5f41eb4c3ac910d4ce6e29b75de SHA512 b0495ebd54fb95f9f93b5fca1959840ad2a1cc3d6219f7de24b2f1e82c3459927fa0a2a2dd14f9c90540ce89934715aee1dc406ce227c8869c8c65791f73883e DIST genpatches-6.15-3.extras.tar.xz 4060 BLAKE2B 99139d97cbe49b5f8a970818d6c3940718b19f8c5ed9baa8bd6abe1ae6f2c655483e8a32b04a392c1987bd2db1375611ab374d2e8ec3efae60a55b3d32da1a24 SHA512 638f0cc0c89ce67fd3e20b3da25370b6c9c472c52aa4d80cb5f2b4a3aba12a4ea06cc77d478514f32f6d4c379e935e3de983febd5a4b1e446a94c088d3536251 +DIST genpatches-6.15-4.base.tar.xz 295212 BLAKE2B f5cd4f9b45c452c6844c979f3cd028de6d51f365318e817c1abddf46a6628225b182652af05efea080ddd226d706f688437f93de3e39f192b365d02ce645f341 SHA512 e3520743b82fecff56bfa9c230bf03c14b99d49784ce9bcf32adf1a1d45cc355547cd2e45f431330ee0a02a530480288892ef15271b8cfe49dd384c33c17a04a +DIST genpatches-6.15-4.extras.tar.xz 4064 BLAKE2B 77f646e96001a71b350ced4512ee9c6c63f656017fa2a720d11a4777577beb1e081780ed08dc89c5e2ddc4dfae699cc72fb41a7f5309f02737ff47fd11b2587b SHA512 54284f9d5c506cea47afdf7c387d564085b49e5e4a6a7dc41ca97722ba70f60bfed6ec0f30a7a0f41e340f5af19f4335510e4898bf379f42670926549915a3e9 DIST genpatches-6.6-101.base.tar.xz 5077712 BLAKE2B 42eb11265006d12e5f67d25d58dcd1188ce6c8b7fe5cec8b176030f36910ff77da5a362e1bc41d3e52790c5e77a2a71adc57f5e107a5818651226ed98a27828f SHA512 759cf775322ec77c85c6b4f5441c8a962cb75e13ccc8d73d366cebcfe75d97b688deed9c9c4e47257db349f950f33f5aa2a718fb2bc6a7a7cb7d75afe5b70d12 DIST genpatches-6.6-101.extras.tar.xz 4056 BLAKE2B d83b765a55f25c4470ab6e5b3e8d2a00ed0a7dde2c5a29f2d68b18e6ae3f084cb653eecc47a9bb372b1ea9a65b727e6d9227f359547ca4a5fd70cc75aec41598 SHA512 516c38a41a9a3116b71729c44b3cdbe3183afb8f061e1b860d11bafa37415663807d470e8a9b4a35366b297a2946143d1393e46c6a2f755de82ef8f769121d1e DIST genpatches-6.6-102.base.tar.xz 5221156 BLAKE2B 107b3cc31c8566c3ee223b7ef0a491ba3284423b4f374d3b9b90f4fa331a4ba6a4fd19fc3a400a8ae4c31119472c3a27513e62bbf73030a2485e164d9acacc76 SHA512 861d67f58e124dcfc9295bd5119b7d84081351dc1b5a039e568276903914bfdbd5c2cf0bb318042f110221884cd5d635c01415b3f2f0d81313f2221402175fbb @@ -80,6 +82,10 @@ DIST gentoo-kernel-6.15.2-1.amd64.gpkg.tar 325980160 BLAKE2B 8ab654f37810beae8d4 DIST gentoo-kernel-6.15.2-1.arm64.gpkg.tar 289116160 BLAKE2B d712bd7909bb3bbeec833841a083551993ed64a1f671a1fc7bcd4fdb26899fc5906da84f669067dc0525fcf868539c28dd6d6ab1068ea02b8f555e2a993acff8 SHA512 393707f738069a5fadcb43c77ab057955958bbf63dbc2a5c652fdaffe6c6d3c7a6a147f82a3c4972bedefd1abe2a0349eec7d3e7f348315415c163ddffdc5aec DIST gentoo-kernel-6.15.2-1.ppc64le.gpkg.tar 75202560 BLAKE2B 34e456bf444b4e9b5ae3ce4ad2bba026f092a4b271d883f2ed8a10d7d0e7ad46499b167ed101eea38baee107868e3712ed828c59d7a794c12446440f179169ef SHA512 7ebb901434fc339addd1ac88e1793b1fc67944d2f57c1e0d566a934193572cf1462c9e517b9c2467c8cbf24aa0c6557e0972706fbec7b8f2526b984788ab96e1 DIST gentoo-kernel-6.15.2-1.x86.gpkg.tar 81827840 BLAKE2B 869e6033b05b9bdea20c5503b6465b3dfa247595851c547292d295ca497d50888e5dee3361a2355af67826d4a73c7dd0cbf73e2cccf8faa09025ce03cd5ff87c SHA512 a5159fbb4a71016339ebd5663200e60f86e3be573d368a09147776155cd0ea6f8b355e9dd5072f2d29d70e91a79ea2047ce3300b6f5166d0a130a8fb99b93605 +DIST gentoo-kernel-6.15.3-1.amd64.gpkg.tar 326103040 BLAKE2B 432d7df18175c6e5d5648ae978a449ac84795be280c2712c23ba965c0ab58a4e324cd60c7cde2f8adfe796ddf96775c80cdfad65a812d1abc6c1fdcc174ce9b4 SHA512 5b7830fc5d8a96602df99999d7bb63c198ccc686fe5692abc4c3022c7c5c8a32f43ec3ea826d607e68012559245bb7aef1255b79dc9037b8e59c7fb5d8b7a27e +DIST gentoo-kernel-6.15.3-1.arm64.gpkg.tar 289351680 BLAKE2B e7dd1a61deaba0535224ff5a33f620eaeff1eee9a5b9ca74345b78b87178189a9cb48a02a3b8c62331852df03a64748cb5b9f5ec4b5832088f1128f24e30c46a SHA512 f61f6331e07c059521a27bb60e4bb78d85379c9bfa5bf01332ad6c551dfc740aa14291e279e1f8ee56b3966ef82cd02977aa11ab746a4c37bd0b6c640b11a6eb +DIST gentoo-kernel-6.15.3-1.ppc64le.gpkg.tar 75223040 BLAKE2B aff17159f2966c8c8f1aabdded676f95651fc177f94fffbe9c8c6dc953bbccd1c7aff0bd8308b8e64340dc7951ede5595562f521859311f4b2bef654c4731838 SHA512 295f04e7f9d1334b37d8e1e0f2b92c98fc35de27b1d3530836ed480c96863e8bc0a484c84c486e2b74d36e5c7db98dad6ecec954d7bf82f6aa47d22630fc4fb3 +DIST gentoo-kernel-6.15.3-1.x86.gpkg.tar 81827840 BLAKE2B bdca3fff0b32444cad2a819c4d6b624250e2c0a2422d71990ff2b86610507e2817d6807357bd25764e1c66d6223792ff9e69f5d4194b084ec2744cfa9f2d350d SHA512 b59534326d769ca6bacf62f0aba9078064f83b608ce004521e54e9c168831448eaa6defbad3439d89282ecc0e8b1763355da61765b5aaaa4e3e867d3cf40e185 DIST gentoo-kernel-6.6.92-1.amd64.gpkg.tar 273070080 BLAKE2B 0399430f27b1633ae1e9d29f4fb38e4683d5fb7bd52cf56ff68b266c7d827acee774ecd8a2383cc498a9f8cb71fc2d6a057a3b969b93823a6c3b291656c8bf2c SHA512 920930a428ab26e30ab704a514ebc0454dbf9f69abb5b5995a250cda09f31123243a99ce8d40d6233830d87af13cf9cfeef8791ce873e819e8d2e558949071a7 DIST gentoo-kernel-6.6.92-1.arm64.gpkg.tar 246528000 BLAKE2B ee3bf3803321705b7cbcc65944b43da7013893f36469739e3e5d1b6900279b63aa909677aa1b7fb9fe85f122cfd62b50b1b39351cce747404a82c4b747accdf4 SHA512 8fbee40927783346e7ab27eefa0c4e874e59f7afdda8d96a50544ce1b9216ee2a918bdcf6b7dc07035c2e8371f580f0099ba0b41794dc438e45d5c0a070a8584 DIST gentoo-kernel-6.6.92-1.ppc64le.gpkg.tar 64440320 BLAKE2B eb86a2311988cea0ad9b1eb880f6d3795e6b698ed7c3f93fb53d2d4c87700ec217ac5c9ae94b7acfdbccb6336fce3b607a926a21c76e0f5844c67f82afa86335 SHA512 f74f018465583c82656f93a5e7d1cb2e1621d82b1e9589a25bfafc775398f534d8d44db53fb50c337b4f99f7de1562211d07161861804570e9d765e0aa3a327a diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.3.ebuild new file mode 100644 index 000000000000..c0377f141128 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.15.3.ebuild @@ -0,0 +1,184 @@ +# 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##*.} + 1 )) +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 rel_kernel_dir=/usr/src/linux-${KPV} + local kernel_dir="${BINPKG}/image${rel_kernel_dir}" + 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}${rel_kernel_dir}"/ || 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 +}