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 AB0281584AD for ; Fri, 25 Apr 2025 18:35:16 +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 964B334309C for ; Fri, 25 Apr 2025 18:35:16 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CD1C01104C7; Fri, 25 Apr 2025 18:34:49 +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 bobolink.gentoo.org (Postfix) with ESMTPS id BA8851104C6 for ; Fri, 25 Apr 2025 18:34:49 +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 6599F343085 for ; Fri, 25 Apr 2025 18:34:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11589266C for ; Fri, 25 Apr 2025 18:34:47 +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: <1745606080.b40b3fa1c50816e329a5ae0dfebee54cfff8fdca.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.88.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b40b3fa1c50816e329a5ae0dfebee54cfff8fdca X-VCS-Branch: master Date: Fri, 25 Apr 2025 18:34:47 +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: 18de7c24-9fed-445f-af01-dac3d890a211 X-Archives-Hash: ced0f7dee08659baf2d2a7d80a4673d9 commit: b40b3fa1c50816e329a5ae0dfebee54cfff8fdca Author: Michał Górny gentoo org> AuthorDate: Fri Apr 25 18:32:23 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Apr 25 18:34:40 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b40b3fa1 sys-kernel/gentoo-kernel-bin: Bump to 6.6.88 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.6.88.ebuild | 183 +++++++++++++++++++++ 2 files changed, 189 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index 4752b37e9646..f0d894ed47fc 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -46,6 +46,8 @@ DIST genpatches-6.6-95.base.tar.xz 4736688 BLAKE2B bb95c2f2839f40a05b0277558a08d DIST genpatches-6.6-95.extras.tar.xz 4056 BLAKE2B 4f8a565b8f4d422373984736276882979492bef192230aa838ca2d44732e684035b3f2fb2c18b85cf639d4b1ccfe910ac568c0cf6514b3af40b075ec53786e93 SHA512 50a86b05bc17f49336d39fbb66ec3bd4ecf1be534982ebbad2a0dbdb52f25250c8dcc80a7e73459e118d94e9c645fa422ad796d74226636bbe274aeda2fbd7b7 DIST genpatches-6.6-96.base.tar.xz 4809812 BLAKE2B 2a803304f79d63a3a960c20633c6adde18e9908b0cce2087986721caca2489c7d9f603aa786dfc428a1720f9f6c3f5bc1fc9c714beb09fe43e5d7eb901e7c2a5 SHA512 dcd3ca2cf6cf5f640216c4d6dbb35ee7bc56745b7db0bac05b5c71101a00032a10cb3d94c5ef9c704d7317e373a2da81b86a2a35348c4d60592cb4174c5afeb4 DIST genpatches-6.6-96.extras.tar.xz 4056 BLAKE2B 56475cb62c6b77feff83aa82fbf171e9bf8ba71d0d24675d9fd13b72cbee30432feea30930c7626efa1b5e0874e9467cac872e9f800908a9ac91f4258c312bd7 SHA512 6b1cd09bc28a7a0f9a6ccacd4dc27b365c508b0445bd6f21bb15b9a82e981a471e80c046d3b39d85acf49a40feb4d8db0f91d76296719ae1d3e34047d895236a +DIST genpatches-6.6-97.base.tar.xz 4911476 BLAKE2B 8bc5c6548182363c183b3fdfbf53467a9e973d7eafe6bf31b62be93a70cfee779b1f6a4e87051a76991633853d3540504e02230bde8f02bdfef32b2254218d7a SHA512 a6c3fe80a1f285297cdd61a254c1a995e714614f2cc5945074e8e65890f4ed614ef58479b10bbf356343dc9445bb88ae596c794ec34e79106a5e21e7097ddaa9 +DIST genpatches-6.6-97.extras.tar.xz 4056 BLAKE2B ab29ea3f128eafcd229aa3280ef690e4e5d3f83fd4c85a4118a4c8ba5c1d5f7bd87c30659c972f917d193faa3261f1daa0c5b7144fe4c7be0247e78ab4285d76 SHA512 e586afbab5068e21821a0722f903c232dd36d24aad3e72c451870c52fdd37d5a8b43e2ef818340b8e9f9e49fa5e05684cf28465bb3b6e2a21a49d78b37e50f3f 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 @@ -142,6 +144,10 @@ DIST gentoo-kernel-6.6.87-1.amd64.gpkg.tar 273459200 BLAKE2B acf30cb5a3f2fef6307 DIST gentoo-kernel-6.6.87-1.arm64.gpkg.tar 246333440 BLAKE2B 3d57fe21b7cc91d08a9c4f2a20cd16d91e878e2660c099c47fe7e8e7b4d95d2c9d4ca5a19b3bd4b12da66d744c719ff0c35e1e0e5649f53b5271aaac85b5915f SHA512 30e0d3695af39480e20a0cda7e1f1c3cf339bd15cd432f0f9e3ba818df03cacca1b8cd180c93d9dcd24b302c05d2782b6380c96f8f021876cb9add7d389b736e DIST gentoo-kernel-6.6.87-1.ppc64le.gpkg.tar 64419840 BLAKE2B c3ab4b5f864b3c3f0d037f54f76e3a1e29df0baafc1ec667065ff3d45f307f29e3c52cacc146a3ddaf7548ed81462dcd6af88775346aa608d112b8b3e3b12b40 SHA512 5e7219c84c69c207ee18e712404b983ae560a404dd5dbfff16e413d2f35fe0a7ba5c3349f1be95506e17fab17aeaff427cdee6072b6b02c9812bdc78f6d9ba15 DIST gentoo-kernel-6.6.87-1.x86.gpkg.tar 68648960 BLAKE2B 28d4e83fa16caf96cfa34a9904f344a12a0e712af70ece028e795bebaa53da8ad3436ca35847f33c0d5f2a793e32f9a832f0a13385d9e7c2be7a0e3569547bd7 SHA512 e7d29a39771af52c553190091f8850ed413c72d1806c5633dc03bc10101d15a7be369e85a46b35650b18743bc1636a4380fb43058532d51923af1114d356a347 +DIST gentoo-kernel-6.6.88-1.amd64.gpkg.tar 273469440 BLAKE2B 65167b86bdf32540345ff2628fc4bc7a9e43534a23bbdb19bbb6241700bb1add7f9e5d15385a89aa442e7636b2277e43195b7ab7c930ce8c9418e7497fef1c0c SHA512 e4fb8856dc5fbc1e09855806fd3f8271c5096d5da8830649a5b5f76d8c160e29884d7335873f7598a3bbe1b1938ad0d0a3a8b814c263965665e34f84b5365fd3 +DIST gentoo-kernel-6.6.88-1.arm64.gpkg.tar 246364160 BLAKE2B 53db065b26dc1a9c587bdaf3b6ee600547b0367a4cc9bbe2eb5c9021025b61083092b6e071977433a738d23e9f23caf769560187770e4c2996ff44fa8a4895a5 SHA512 e46323a54181baa97025255a87076e66d899fdebaf6e48a58fe8a014011995daa9788e1445e9d892baeeca19f4fbce9c8f5efb8b4278717bd7fc77b163e96e06 +DIST gentoo-kernel-6.6.88-1.ppc64le.gpkg.tar 64430080 BLAKE2B 2bd9ff8a4e318841cf3a1853342e77140eb7e851eda68409aaffa6723c9a20ad6653cbf7ad5a3f6c71f48135aa4caeb53c3f40754a1611b60d6e17eab60c36bd SHA512 6f2832d3c842c993110763f8eefd2d9becac1a89f33dc82aa85e5611421cf2e538bb790cd0d2c7a2bd3561b884e83c29c44a763d7351708e2eb2c126fb31938e +DIST gentoo-kernel-6.6.88-1.x86.gpkg.tar 68648960 BLAKE2B 371ec6d51b1899cca981b0f7ec79675a531dfd4f037492b628ae7208558a31371ff81817145bb5928d36f973ce7debcd5f7ff4b7be2a44b0e877c81397776e5b SHA512 0bde8c01bc0d19c6d77206e3ff3d69911808817d91b8e6f96e0f222702f95d4b86b1539683b96d4ec5e8131b3571ab4e57abc7c36f8b65c0641920566ee9d093 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.88.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.88.ebuild new file mode 100644 index 000000000000..7ffb1f6159f9 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.88.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 +}