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 80E461582EF for ; Sat, 08 Mar 2025 08:58:50 +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 6DAFF342FEA for ; Sat, 08 Mar 2025 08:58:50 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E723311047C; Sat, 08 Mar 2025 08:58:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 bobolink.gentoo.org (Postfix) with ESMTPS id D8C45110479 for ; Sat, 08 Mar 2025 08:58:13 +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 8A6CB342FEA for ; Sat, 08 Mar 2025 08:58:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7F57E2893 for ; Sat, 08 Mar 2025 08:58: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: <1741424285.8cc4baf9b6da874e8797b3d621d44b9e640f195f.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.81.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8cc4baf9b6da874e8797b3d621d44b9e640f195f X-VCS-Branch: master Date: Sat, 08 Mar 2025 08:58: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: dbfc4468-1f78-4196-97c4-3d0298441246 X-Archives-Hash: 285aed00b7610bc3708ed26a1a7cee88 commit: 8cc4baf9b6da874e8797b3d621d44b9e640f195f Author: Michał Górny gentoo org> AuthorDate: Sat Mar 8 08:53:34 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Mar 8 08:58:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cc4baf9 sys-kernel/gentoo-kernel-bin: Bump to 6.6.81 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 5 + .../gentoo-kernel-bin-6.6.81.ebuild | 179 +++++++++++++++++++++ 2 files changed, 184 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 2cef979cc691..3065ccb4f185 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -22,6 +22,8 @@ DIST genpatches-6.6-88.base.tar.xz 4497952 BLAKE2B 65f393c767bd4edda1954fc15c90e DIST genpatches-6.6-88.extras.tar.xz 4056 BLAKE2B 9dce8d9362ca0e3548e31392659afb0b475eb0ee03bb71c51cac40411f35ba8ffe519c3e8438a05dfd140a8032321b8936df4f48cc8eb87f8fd6ce0635249da6 SHA512 02e4cd170b09901dc9bf2655065a8eb44e2330375fbbb2c3aa81d3f8c2bf6854403b4d7b412fa3d6bb377ec3e39f5091355a0b649f6a69282123e3d710464845 DIST genpatches-6.6-89.base.tar.xz 4537568 BLAKE2B 9778c7c5767689142745d1d3d18dba49cbbdee9ed4baf64553c76acc962c8edd2a5b1e23c39c39c5e6b3988dd410b480359f7630aadc2983c9128fd28960d419 SHA512 c33a6996dd54955bbe3a63fa1bf8536dfc8e96a8ef0c00a4bb12feb3d2d0a251744ce15efcbf7c756af564528c66406df02e30008259398bdea959d06e79c9fd DIST genpatches-6.6-89.extras.tar.xz 4056 BLAKE2B 4b99db4ff4597f9e5298dd9399d266284d685b09c6ca40461f547781f2e90c339332ce681b10827dc06eb7eb437ee929782f8894ba5148c8bbd1cc1bd59e86ac SHA512 261266e9f0287a0e92b047a6f829cde05d7226c1e4b4a1952bf46c565385f34879ded18d43bdd83a4233d08bcfabd9f8c9fdb86b4dd8c43e2de88719bb1734fb +DIST genpatches-6.6-90.base.tar.xz 4599636 BLAKE2B b2edd0cbe2165fd57f89e2677cd705a89223a5a2960a2963d3e5023dd244f6e3c5fc57eabf22310ea8b7bcc19f8a18d4264c464b3b3309a921903b7ed0743a3b SHA512 3e857ef3240e19263609603b145f7407777a75c4e747556c1756076cf4c88a07b83531679de65e783f35bd7dbf883b3a284092a7e12c983bb3a5cecadf43f7be +DIST genpatches-6.6-90.extras.tar.xz 4056 BLAKE2B 7340bb8da2740eb61379ef3e4b41833222bf03cf77b43af7783165c4bb1cd62933f7a79d8f206192498c16a5b44152c59f6301a9db3b211d1e8d40747ccfd5f1 SHA512 a96b38962664b6c21afb64e764d17720d52b04ad4e17c1d9862ed136ce93c272e593dad46a30c532784a2eabfc90519614ccf1cf27bf6480a70b2443668a8d05 DIST gentoo-kernel-5.10.234-1.amd64.gpkg.tar 63662080 BLAKE2B 08da5926b5b7ed9a6963584c2e157725f3de773435cfc5beb50b54b477ce6b45a05d8c95fae62ea8a057516ea74bd86332566287f1e94abe09676cb1de3da76c SHA512 8e32408115186ced223719eac7304f3d180ddf44a87bc95118d876353fe2a24b0ab2497a12396ecfcde1608891f6dc4c52d9056aa87e9b3ad0325ea451a84bd2 DIST gentoo-kernel-5.10.234-1.arm64.gpkg.tar 56842240 BLAKE2B 5fd1f3f0959afb2edc6c3a6038b10b1930726ac177dadbe50c8034ba6dc2ee830307985e4634fc4881a8f03a6c268d20ae0730ae9e3edaa902d8997b93c66323 SHA512 a0930aaa5f4107b0e87e62a4f569c74ebe2a96e6c8f7947d7cbfceae9ace9b9ab287bf984ec07a0e99c13db65f703279cfbde61b94036b28cfa473c6f318649f DIST gentoo-kernel-5.10.234-1.ppc64le.gpkg.tar 52838400 BLAKE2B 294837fab511941bb5cc3a5e23dbd3d57b40338c6eb706cc5080123559d30b5b1f6bbb5ed6983bccc7ed8904fb1e03ff38d111153e9612ca06e772896eb11ef9 SHA512 65ac1f9f14b51adb1f32935c3d92fe32724d7b87b61d209f9966f25c312f93005fa12ae1cc6fba064a0692471476a67803c41da8e19cf8c713616bce64f4bfe6 @@ -70,6 +72,9 @@ DIST gentoo-kernel-6.6.80-1.amd64.gpkg.tar 273233920 BLAKE2B cfc7a199811dfcd468f DIST gentoo-kernel-6.6.80-1.arm64.gpkg.tar 246200320 BLAKE2B 9c0210b3d774d2a05dacafc7bace47871676dba808a9883fa12b437dab6bad3e140ea9b9f2350275cacfa8ffa98d964ae81d35804583fc071e5f83728ea3e5fb SHA512 6a413b435dc8d0195ac0a37159ee4d191a3c9620f51e36da43009881a62473c049ca9b04329e07e9aaeaf2c1f95bd2757afb4b01bef9056ee8538b715f9b122c DIST gentoo-kernel-6.6.80-1.ppc64le.gpkg.tar 64430080 BLAKE2B 484c6aa25ffb0e7c8753c87cb0aecdf23e9671485002982b9ad88349cf538e62de093c1c33065d48f500a973d89f8de5409b3115083519dfaca8162c83ec87ee SHA512 1d50806ec986dd6d1b2871244660ce1e0c792408cf93fc3d9745c899de7c60128b0fd00df00ba713f7b123f99dca4847f1fbf1592369c7c38d4c4efdbd2357fe DIST gentoo-kernel-6.6.80-1.x86.gpkg.tar 68587520 BLAKE2B 95d4ca43f75193d7b733b6c116003ee03a8cf96b41403ac341f6d13366dc2d7d735b188d29cb48b4641ff79b6e66b5fafe53481a26705c8dff16602d8d526721 SHA512 e4fcbe5d3e2617398ea2ed724abb1ebb2399bd683eb57cace236f3abb3a327ebcdffa97f8215d20e6bcad224543065fb0ce2246cb65b53bdd6d1363e79e23069 +DIST gentoo-kernel-6.6.81-1.amd64.gpkg.tar 273254400 BLAKE2B 8efb5b658730ab2e6572a7add3d9c48f4a0cbe1b3dfd87f9b9cb599e1f5bf31f49c28833b1fa7890590754168b9cccd75e8be4d4d12431b16c507ab1411b14b3 SHA512 d821683939f4aada5b0c5b3d22280ec3cc39cd043e46aea6f8df32925a95b37db89028ee5b891b73f10e607412775ce02db46e95f8543a146df1f1482e94f1e3 +DIST gentoo-kernel-6.6.81-1.arm64.gpkg.tar 246210560 BLAKE2B 9d8247ef3acf546c0e93c28f4d1c0104c99f135ef360511ec722860619a8df91f6dbcdab628f0f2c2e6fa61e5f3ea948310edd9020dfa4ef09ea5a75044ea33e SHA512 61e46b8d4a89d9f1ca7a45b09870f0adf2324e4c725c0b9991f1d3f9c01c7a71e0e722fa1d0cb8c2db6589358a34c5c3bd90e0de7686a239f68ac58b153e6bc0 +DIST gentoo-kernel-6.6.81-1.ppc64le.gpkg.tar 64419840 BLAKE2B c3e8b086eee77da0060edecdb5dd3c8e94b82a80bce544a18f04c88cbcccfe10f714b8c22c1c4f60f065de9857d4b26c4ba739f8af266ccdefec20d4b323209b SHA512 7a8ed4e48533dec0b16e9dbbc1ce14e4a5c36148030d49ec99984fa2d180695efde2435fab5c5899319ced16a836af85329370f7fe3769210101bad7c0c60c71 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.81.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.81.ebuild new file mode 100644 index 000000000000..a1984a720d87 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.81.ebuild @@ -0,0 +1,179 @@ +# 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 + ) +" +S=${WORKDIR} + +KEYWORDS="~amd64 ~arm64 ~ppc64" +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 +}