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 5BB341584AD for ; Fri, 09 May 2025 17:40:39 +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 485AD3431FB for ; Fri, 09 May 2025 17:40:39 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CCD851104BC; Fri, 09 May 2025 17:40:12 +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 BF3A0110497 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 6EF5B3431CE 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 C6D2A289B 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: <1746812401.12d7e780b01b7a5a50f34395837abe56c4c7b74d.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.28.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 12d7e780b01b7a5a50f34395837abe56c4c7b74d 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: 27729738-1ccb-47fe-9f02-8d66d451fff2 X-Archives-Hash: 130d5659fd75aacee45461f03aabb373 commit: 12d7e780b01b7a5a50f34395837abe56c4c7b74d Author: Michał Górny gentoo org> AuthorDate: Fri May 9 17:05:42 2025 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri May 9 17:40:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d7e780 sys-kernel/gentoo-kernel-bin: Bump to 6.12.28 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel-bin/Manifest | 6 + .../gentoo-kernel-bin-6.12.28.ebuild | 184 +++++++++++++++++++++ 2 files changed, 190 insertions(+) diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index ba1944076807..1203b5d2dcb7 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -18,6 +18,8 @@ DIST genpatches-6.12-31.base.tar.xz 1895404 BLAKE2B 60ca4a8944e04cef4006eb1a6bf8 DIST genpatches-6.12-31.extras.tar.xz 4056 BLAKE2B d17eceda0aaea19d7d064cf746b8e0ef7197224dcdbd21b07c1a52e7083d3c6bf52f7019c781c4ff8e62989cf585603cea3acfe00129b1359b42302f4a05ad53 SHA512 66b374a4b4c73c8226875d33120f199751adb59a6e044c06dc4b28c9171ca853e1547787600c7f715789175bfc0be307a6142c300a0f42b9c8bf347b21f21571 DIST genpatches-6.12-32.base.tar.xz 1895416 BLAKE2B ee9002f0c337eb06957d1718463b8ed5a4154f37d6fc5fce080fb6ac82dc80b5f4555582382740408d8a7338436396791df8217e720415df05e2ceb0431454d7 SHA512 0077d7ede8d6c7f03843318b26abce19a35a8d2b1e6a87e1a3ae839ecbdb980e916f3206b5489d62f41c0d79dac7d384f04f1bd213f8ea8dca0ee8a48fa75862 DIST genpatches-6.12-32.extras.tar.xz 4052 BLAKE2B 2b831af1addceb4338bdcb87347bff9708c3176624eaabd10273d8b7d17c0fd2e468603fc951378b872d779de6f6e2a6d39502a0f5efe777b6a05e92e1cc4201 SHA512 6aad66905be74e8c254f37b5740cb4c4db38ed896bf3a097a05788552b5f920e426d0bab22e62eaada5e57612f25684af5f1e9cbeb46817de3d1f5ce4147cc4c +DIST genpatches-6.12-33.base.tar.xz 1940132 BLAKE2B 744c375cc762a071fbf956b5dc84e7126e35f82b04b3698f0fa52ce6fa6c781ba9631d6ed5b8a5acb5f04471809639b0c4e99651ff84f209b3d5a88e4f4195df SHA512 2dfe26826b474c36915b48504c2e5b911d7c731d0228b671d6cde1b8b7225aeeb7f0c4bea1793bfa43a69caf31c05c77d7c35c0ca90b9c73c6c4b2be44ea78a9 +DIST genpatches-6.12-33.extras.tar.xz 4060 BLAKE2B 9a5356f45097a5af36e7f44e29d75e83b3b14cda16c86854bb4e1a6d2b974a86aa474916228e2a642aa9e58f05a58550d56d63c14bbd1de17c4a2c9c70a03b69 SHA512 36dc5f9501484d4fd3f03d30474b1b6df44a4b8b01f3cd0b7c449cf2c7b282d61c0d447d24ee49aa112a6048e239ec8576e622df389766deeea55d4fac724f33 DIST genpatches-6.14-5.base.tar.xz 478484 BLAKE2B b4a07d4eb4efd31162d0c6880d826535f894806a664690c4648314df4ba70f374a0e8091bc8d7a7193ca2e75fe57fe730ff6867f171c2b4a90af4788272e3888 SHA512 00aefb9d59b0bb4d6361e59e8e92d141f8f5e2b033a7418fe5625ad2fcb1aac247606a3e54f7cb791f02591d57362e84c61511c896cd17be1013b23e43f70e73 DIST genpatches-6.14-5.extras.tar.xz 4052 BLAKE2B 131ba26cfcc2f1218a79b33069f5d01a1bdb016315f85913b557429999a17c414640246e2a95c1d79cfcdfcf60577f4bb614b728e56d725dc808cb5785795a3a SHA512 746e312955ab745c901c653d2f64fdbf075a80388ee1618072e52225f7fa6163e5cc65ea41791ffea89dc1b61f242317a1b3179e85647ba9dd7c9de27937d4c9 DIST genpatches-6.14-6.base.tar.xz 573800 BLAKE2B d8da8d4fd6ef42e403efafdcf731611aab86c3de7394b395e09d4648ba8bdfdad116e55a5d8b120c3f2ce3eb8938febb1af1f444e3f8a31efb9d16fdbb00e5d9 SHA512 fde9e51d193810eb26715a5acbba486d05f8617d8ede818b10a8299b1c025c791385e0bfd73ccd7a0af1d740ea09a3c8de1f1c7f3bf04c62f17dcce616cd1642 @@ -68,6 +70,10 @@ DIST gentoo-kernel-6.12.27-1.amd64.gpkg.tar 306268160 BLAKE2B 6736cc0724b18baf3e DIST gentoo-kernel-6.12.27-1.arm64.gpkg.tar 279398400 BLAKE2B f66780442069bbd485e768b6ba61163af3cb0d95ba6628d41dc2eb190d8e33400fd02a086402e19a858c48614c19b492e626e6f8ecfe2ff12fc290e173fddabd SHA512 bd7324cc1ba96d5a31e062486b5ad3b8672f48a38b8bf730ed41f11b7b93a296eb9cb8d6cf76d8a7952fa152da0604a25cfef6981729aa5cf4ced64b882e13e4 DIST gentoo-kernel-6.12.27-1.ppc64le.gpkg.tar 73246720 BLAKE2B 04066598ae6e12a501e06e014d2a31e8e6a9d533210f470dc0b1bab16c2da6ee34264a64a8449325085e262e7542e24b0857339ac3e1f89c62ad97f2276d8edb SHA512 163b778301e152dcfb6747041e8f819548d9a82a09b6bf0ec915a4e9c6b780429cd902c08734023fb10a47516f58767a954a2a0dcbfba10460892eb07dfef506 DIST gentoo-kernel-6.12.27-1.x86.gpkg.tar 77588480 BLAKE2B ba801cba4076ad1ee3a659031d3e1d1445a8df45ae7ea93c258aede038c2e05f54cd8132aa6485810d15f5c909b37650886f7ac503a09decc0e91f144972fa97 SHA512 e7989bff3739baa866617327ab98a31a259eca42815d9ccf1747febbdec388da38e63d7c55797f8139f7898614aed2d1cd70be19223f51c296deebf333f5dbc4 +DIST gentoo-kernel-6.12.28-1.amd64.gpkg.tar 306227200 BLAKE2B ccdda03b4f406b32e0c53111423bc14ecd264263e9298abaa7dfdf315702e0aa9e3904dbb7868d59811d562daf33729cb69c68315bacf151a71b3d6672f3636c SHA512 78f59c5684c819b66b5048788494d2745366c049b7fdc088043a47878ba22164ab39b7b2b7d8dcde2f49f609448d6213da1c368d32a64c6d751472c29e22ce90 +DIST gentoo-kernel-6.12.28-1.arm64.gpkg.tar 279377920 BLAKE2B 3379955b7300674954a1940034f7de3ad8dec7f071c82c81507fb617a934a2b9ebb344f0090933335df6bdf227dee6700e77ae2112591c4259651a81d6847dd2 SHA512 88a2c39d249f4102737ee006bc11841bd0d36f401e0de1e9ddcb51c66c8a4f5e940cdb8a2d3a2243e17f14933d33394c99ae3fab5c4f999b007f615ae058418c +DIST gentoo-kernel-6.12.28-1.ppc64le.gpkg.tar 73226240 BLAKE2B deb22c1824edda29668ce1b5138665f5b9cc9b11f3c9d3bc812f57b96c8b04d84dab4d15a55f46c20ed62f66901655612c4635bf7b04a225c4e9806f0a4f84a6 SHA512 4befefc2b88d88fb3e2c385f7fb0d29bc663e19aa074b0f6fccd675010a956c410cb7a50f25f1ec9859392136645be1eeb84fd24fce37222f3eb2c1b8f1dae70 +DIST gentoo-kernel-6.12.28-1.x86.gpkg.tar 77588480 BLAKE2B 0c154d83b1199aa6fa52bbf0e2ce07f6eaf2ae4cd1928f6ce8c27aa86c38a45d0e5413549c670069669d8f14a1f24764ac935c603873811a59eb28e841498f21 SHA512 0efc2c53bc395621fd7ea9361782bfb8c49ab86f4a01ba95c14845514acab07da27f711db5cc33e228516af65904977d49bc1a459653677335d3257e5a886ce0 DIST gentoo-kernel-6.14.4-1.amd64.gpkg.tar 311562240 BLAKE2B cb9268a68056d80ce6e7e64e6061e058413c3e1fabb9b5d86e72bfa58ddde19a7460b3943264ec9dddfbb0b2ea108efdd07f0b8c3de0114a7c92b3a97b65c0ca SHA512 a3b7f3d05dfb5c2a3336d166e166a4f3650f7e283f016e5d47e2a7e6d4deaf68490af902d09c423ca43e5308de91966c2a4cbc642c6c469d6b23c39ca963a243 DIST gentoo-kernel-6.14.4-1.arm64.gpkg.tar 284200960 BLAKE2B b151c4e04bca81032849982c8296f766e593304e9afe7794a98482faed458da3693ee7827d81bdea62d905987e961eecb90eb9e58ce674dcb2373d9aaddc9ee0 SHA512 fd31e7e5bb4e9c09397f8f9da0bdbb1c43ff2000c61166c4f95c23eb6c033f013f45e9c7a5455aba25930755fb2e6396c848ad9029408bd71cd10e3e72760374 DIST gentoo-kernel-6.14.4-1.ppc64le.gpkg.tar 74444800 BLAKE2B e920d4a83c08b91618f8dfe2403d95766e1e3c0b0e08216c63953d0ea3edd38aea942359ccb11022776f7c175cea1a3e1e1f79f859e5c094b808c94ef04c8006 SHA512 0302f6aa755303579858ad895191ca09074bf3548f6101591a0f6f3502329fcb3a029b3760b63f5f22324df8296ad82f17a94175fe57baac58d4faa100bb6f70 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.28.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.28.ebuild new file mode 100644 index 000000000000..ac7076155097 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.28.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##*.} + 5 )) +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 +}