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 DCD551582EF for ; Mon, 17 Feb 2025 20:47:56 +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 C8CC33431D0 for ; Mon, 17 Feb 2025 20:47:56 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id D6D1A110482; Mon, 17 Feb 2025 20:47:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 CE715110482 for ; Mon, 17 Feb 2025 20:47:20 +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 7CC7F34318A for ; Mon, 17 Feb 2025 20:47:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31A8B27F8 for ; Mon, 17 Feb 2025 20:47:17 +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: <1739825229.e3f37c36fa90ebc8ddd06c177e4a9739cdcd7f49.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.12.14.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: e3f37c36fa90ebc8ddd06c177e4a9739cdcd7f49 X-VCS-Branch: master Date: Mon, 17 Feb 2025 20:47:17 +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: 1cf69927-8e32-4d04-beb8-eb8a3daffecc X-Archives-Hash: bd73ceb48ce56c2264d88c9026311459 commit: e3f37c36fa90ebc8ddd06c177e4a9739cdcd7f49 Author: Michał Górny gentoo org> AuthorDate: Mon Feb 17 20:19:57 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Feb 17 20:47:09 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f37c36 sys-kernel/gentoo-kernel-bin: Bump to 6.12.14 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.12.14.ebuild | 184 +++++++++++++++++++++ 2 files changed, 190 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index a7d051e82bef..6f6edf322d02 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -16,6 +16,8 @@ DIST genpatches-6.12-15.base.tar.xz 856536 BLAKE2B dba6809d63e9ff073b40a08afdead DIST genpatches-6.12-15.extras.tar.xz 4056 BLAKE2B f3b21174d15e3ee9f367ddd10745e1812b2a7573dc618f1c42db7afc9794208fdb67f62e2f400a144ad2f6d050b0419d67152c10af83ca263ba210bd8d939972 SHA512 7a5460091350c279519bacbfdcc83ee69d14364c0a8b5c192b244695196f72ec24e27d85d1f87608b1af6e9adcb5089ffb079c3e5190b7580833a438a2672c32 DIST genpatches-6.12-16.base.tar.xz 1027208 BLAKE2B 2b1afff6deacca3df2b83a04a104271d167d37b4200b8396adc8a3751bb9f972a9442ad1a6aa7d9e8867a9112be1dfce236b0aa2d16f706520d586a736289a7b SHA512 5660c464c27586c9ab7b95ad5cd61cbf6c982e5c4a281cbb65e55cd562a885c4a9c5a79cf08373ea1b1f9757aeae1da00cdbb6c3bf559fcfcba0d9d380b45fbc DIST genpatches-6.12-16.extras.tar.xz 4056 BLAKE2B 268700eac9cc0e309e30140397211d9fe614edb3c9a1208d8e05d5eff07f959ceee6ec7c68b8331df601f5ab1d81ab04bb7054513fed02a027e02b7c31e02207 SHA512 7fb9d6b03236370370528d28f4b4dea0cc132ba839ccbae80e31fc4c532f85acc2cd56e8a0a9f27ac7ed3497721f69d3ccba0c338be7e1d38588229202b3e456 +DIST genpatches-6.12-18.base.tar.xz 1138088 BLAKE2B 6490753d4f8036fc29e7040695e0c85f556c2a928b8afe275fe11707a75a3a167a52ca63c6193600332fff2fae4afbeb01e0dbfe5be81466a0883f0301ed025c SHA512 7151ba70619b2950ed6f2b46ceacedfa884200c8600d97718da0e1a8ba53b428633e6675235e36d1a6508e32287b69b195d1b5cacb1bafb0a08741db58b2b9cb +DIST genpatches-6.12-18.extras.tar.xz 4056 BLAKE2B da0da8cc6a7691e748bc0068e1e65e9becc7357dc2046c520202acdfdf95d7032095fc7b5be642599b6b960026ef747edf96131128af3a21a7a5fcba6f5aaec9 SHA512 3221e842185265a129eb49413661ff74866377292b0a8345bbf55cfe162bf5afc1ee79644a8b81cac1bf370f432e54718bf760a13497d3505472d786bd8d3591 DIST genpatches-6.13-2.base.tar.xz 15268 BLAKE2B cf7b141b036ce1f324e59a2a159cf031e05242dc82f56f65f280e93650c879c35fad3906b680394741a8582310b7924cd09e0b48887130e39ef713fcf4c513f5 SHA512 058545ff09be7f54889b691abbface6579a3f030830115a06c15182d1a92ff5e566b4989de65ec21c57a233f792b973408f8405fb33d020939b06ab31f3b1449 DIST genpatches-6.13-2.extras.tar.xz 4056 BLAKE2B 87dabe3972da098d4491f83189fa2cef15d7212800f4daad3bb248a0895112def3ceebe5c6101eea3832eef329827ca53e2c0fbc82febac0158a461ee59a5b51 SHA512 526d45b794e14a6097e25f1a614680a76db07fd6c423362fd38378986f29fc139557573ad61fcd2a2f865cbe2e575528fbf57a04f2b5804f84fe89f284ca8c07 DIST genpatches-6.13-3.base.tar.xz 206716 BLAKE2B 8e5b254c09e81896cf6228cda82228d055ed3b6c2ff27db2af4c0c1abca6dbbfffad64a52e864ee5aed5244979dfe4ec5c27916c62021816cc25cd966f1c843b SHA512 913f79df9a918146d447a7862d52ce14102a66b9c3112780e182de61ae45b867fca25c4e286dbe1d9e8b6922fda07e724d8784b47d378015998dcb42ae55c88f @@ -66,6 +68,10 @@ DIST gentoo-kernel-6.12.13-1.amd64.gpkg.tar 301363200 BLAKE2B 20b43dbc1cdaf8d67e DIST gentoo-kernel-6.12.13-1.arm64.gpkg.tar 277422080 BLAKE2B 9e5470d0aaee07886110388f1abfb5e7096f0fa554208ce32dc7aee566c55bdacc05ee7a8a3304ea2786609302dd5b737b0f879e1b8afbeb742837c82504c5f0 SHA512 be8817a64ca9c046378c0a2c2238797e7680a6895c57bf0989e2a5c547f98544b8030bf189dc685991f753c2f39dc18d3a8b881f6ccc2c34e2cde0cdc8fd619a DIST gentoo-kernel-6.12.13-1.ppc64le.gpkg.tar 73103360 BLAKE2B 56c2aaca9824f6de5d8ec43b9b6f0a3bf36acb6766e1040494a00f7a01fc45e241a3ca8f6826bad38be354de6b2576ad17348db3036aa9df71cb5a823b7b305c SHA512 b249faa9a70b43aa3335df98803bb3921cd005fdb52602b384c1eb10b4df71418f659d2ffa541930d7eb54e69365fb0bac040650a482e11df283a1e9ffc14f4b DIST gentoo-kernel-6.12.13-1.x86.gpkg.tar 77424640 BLAKE2B 2acb496e1d0ab45a55cc1594bc32e0a88fb25845a01cb766f250fb0804e07dcff2deb4a133729711902421eb80274d6abfc8635bfff0b68404aeaf9c0b14025e SHA512 db2c29dea6d6ff9863c9651a3a27fef0cb86d6ed92ee758ceb8c683cb3f6049ebfe228fa713cda8fc0aeaf9b65f9f6e984c89802ad1887d225f58e2d9aae47b0 +DIST gentoo-kernel-6.12.14-2.amd64.gpkg.tar 304250880 BLAKE2B d20142f9ce0703545f9f234268bf3782ce617a536002e62321af676c7e6168d81fa5af9f42ba237f41c151f64b6d00fd8fa06eaab6fe1aeacf3b132b69fba2de SHA512 1d24a106d956c4d7cfdb3fb4d4379a0e16c956369ebd959109d889145a545e8399aac3fde4528d51a769fffbddce69ec70fa703db9272845422a38a4556024d9 +DIST gentoo-kernel-6.12.14-2.arm64.gpkg.tar 277719040 BLAKE2B 8f08c58fb786f58824241d53b573b2a45ca4ecdaa9ccb6a74b0ff795bbc23ee4de006203e013d718bee2a47c7706f55bd1ad2f0296175808cf3c05435a971c17 SHA512 545ebf3b17dde719f0b27ed5f3eba132f5a4f8e70df2158bd45de479f089331ef4e0f94ae7fe505bcda5a51bdefb42035bfc3943abea8660345b34982da710b8 +DIST gentoo-kernel-6.12.14-2.ppc64le.gpkg.tar 73113600 BLAKE2B 00e973e0eeabf75072a5db1c9f990fa6877f487c5651c1a444f451c945edb66c1f02c827ce0c865a62b00054f31437905606e8a7cc07432fda8f31b862482e05 SHA512 3198b56bcca548ede2b81f3613bc57c4fbfd0be45d8fc13246588ac7277a6298380a97a11bd7059d4094cf05003ce238d4498e9273c09538201d179f7730c858 +DIST gentoo-kernel-6.12.14-2.x86.gpkg.tar 77322240 BLAKE2B 995eefdfab99d969f8c49add4f4895ac9982707664888a48a32add85367e3fdc0b7061e66a477e784e7a683c28471f3d7a780fb67f40108c3eec1840e42e4bbd SHA512 f277741f912cf8e6f96caf04c0f136dfedac624af69759f38b0db2703379c825fec694a91b0299c34dc775d4c2ab95d995b54eee14e8dfa5077ddb3411701496 DIST gentoo-kernel-6.13.1-1.amd64.gpkg.tar 302438400 BLAKE2B 9332494e18e9e19df2a0b858e8f20ce2bef78c6dae9c0802464a8ee79281c7ef017655585be72098c9a63e2bb9efc4128e1dcd99ed41470f60346ac7da4c86d6 SHA512 8ecce0a52904a1e4d0335f3ad8c0856d9ff74119299f0b1621e86436d923a434d36b80e1fa626fbb8662af57b1bb8d0c1bbd2f4a4264c37873d9d86891f345e3 DIST gentoo-kernel-6.13.1-1.arm64.gpkg.tar 278824960 BLAKE2B 9ff3d775aa63dfed2c318ef7bbca39647414ea667cc2b5732efa97900a896b0cc8bb03a0d538eb51ba9bb6a1ef48f6dd2f14590a225715e2a7309f1712b89e9d SHA512 d115eb3738ac79f2227c580affe90c7b0c89b623e2de6e1771cf599825fc650fdade345de794c543e5b96c7c0eb980186551ae1773d0ec396014a8c6f89fbff0 DIST gentoo-kernel-6.13.1-1.ppc64le.gpkg.tar 73164800 BLAKE2B 3266957def06bafc2b2740c402bd59902731f6a0b173f570eb575fbad33ac6cdd52a35eb6984c99d2e5915934b06626ec07c0e91871e8d913febcf2d0305d049 SHA512 768cdeefa7bbb8bdfdbe1a6c0550beb6a4896688f194bba1a81c319f53bc263136581620ebe43ecd09a83b6a5302fa1e7e2333d6b85c82f73747d221e766d2d8 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.14.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.14.ebuild new file mode 100644 index 000000000000..b9d87046bddb --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.14.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##*.} + 4 )) +BINPKG=${PF/-bin}-2 + +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 +}