commit:     c425d07c50e6510f0c6111685bb39d275795b53d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 24 06:04:26 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 24 07:16:29 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c425d07c

sys-kernel/gentoo-kernel-bin: Bump to 6.12.11

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.12.11.ebuild               | 184 +++++++++++++++++++++
 2 files changed, 190 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index d7a45ced52d2..ccc210610281 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.1-136.base.tar.xz 6772616 BLAKE2B 
dbc95219a1c641003a1dce638afc
 DIST genpatches-6.1-136.extras.tar.xz 4056 BLAKE2B 
beb562de00607a2dad56c4fd338f2c5c0453d116336aa8167263547b2a48def2551b051e9cf53ae0c9525cdb280596b3ad1f740721f425ac150fb654881a5d76
 SHA512 
28a227ee754d258b671213a54489454134922b5d9bc2b4f9f6f51ecb2f23f237e9f0a2ec190e3aa3be46f038d5d35db1a7957b7d4ebb6eef2883ad94d1fb5af2
 DIST genpatches-6.12-13.base.tar.xz 806528 BLAKE2B 
0eec1195d5a497e64556d992893f251a54c558151aef1fc1d03de0b95bdbe03588ef486875e7676f9635da62e975dd8509279ed2d96b4dcb3796e1d8a4bb3768
 SHA512 
3cf8549679aae42fe56a25c0f9d5eb5c59fb867c77dc22c21446064e55d91276ec75f60f5737ab9a39c82dd0e74ab1ee3bd62b5a78f7448827b5577257976aed
 DIST genpatches-6.12-13.extras.tar.xz 4056 BLAKE2B 
af48fba5d81bf8e13658555d94fa131e3f8fa06144148dd11b58823f802c5c4aea823fc4cd8f308ba6518638b65637d0b8a030d513d4b2a05384fc8f40550d94
 SHA512 
d7b1290d44696284fde4980ad3b90a190659056739a084ae704d1edf1a06ee166fa78960a42999b9e6e2d8aad4fd330621c8865f5e2517f1453c916d6375a365
+DIST genpatches-6.12-14.base.tar.xz 846696 BLAKE2B 
63f6f0326eedcbc5d44f2320dc0c9352c009e219764d6eb9e1da460a6b10538e5c81c27a0a633264d3d1011af266b310e49a9b928dd59dc76b226cc3ce8b06de
 SHA512 
909307a85a15e27c517e352690c4e8579d4889e36cd7254164230e4589b3544ab1126008373ea2289628361cf82414da9de4809c45c1f1dc02ab3666547d0a90
+DIST genpatches-6.12-14.extras.tar.xz 4056 BLAKE2B 
db12618351b80d499fbf9b3f8d0a4ab00639fe1b0c73776e0b038f6f996db29f0890d796effd120c3428a9515771016cd0a23da559c028996b312e75525d78aa
 SHA512 
79a23575135205c33eb07d7026ccd0c38e5223b4b29d7c90002b72074a089fc994c38dd17868e53198fc11d2fc28e229a79ea50d5449261aad9689cd73139003
 DIST genpatches-6.6-75.base.tar.xz 4089936 BLAKE2B 
f88b0f84e3d73f87025389a3a66edbeeb6c126bf93b2522105859d27911aebb768cbbb2aa8418fe7e778eed6130b2253d85c08cedfa99c188c02d8d043f5fc7d
 SHA512 
ebaf66ba8a338d548041c1ed619c4cde495a3bcbc990caba75dc86bf990a159b7f431e46e84cd16cea62991ca9d50420747a988da6e0c3973aec25943bc00d8d
 DIST genpatches-6.6-75.extras.tar.xz 4056 BLAKE2B 
6e2e14f16a7ebc675e84b180a8f26f485aece3f22de1d27bef60b414deea8f3744cbd95536b58722d793aee320b505d5ca3c0af0b1e20f238b02c29a12abada9
 SHA512 
c8030df10b17675adf3c48931f04c59d1795598c955eef39c7b3dd4f36c1af1d79e8d7405004952cfe4922cf100aa95d2fe3d7c6f6e0d683276d5382bebce399
 DIST genpatches-6.6-82.base.tar.xz 4255664 BLAKE2B 
812e8caabf0a73991504a728a8abc5a61a0b51ac073be06bf18b87e6de0291fc568ce4dd2dea506ce0db648669f2341843e608d0184cfb4dc233d71d57518137
 SHA512 
5fe4f880baab09d51b2fb36f3501298ecdfa382f09699f64c887ac39d84788ed4c27a9f7fd1d5766dbbdf8135956f0f81b4adc09c2558682f8f7dfb1ac7ce6ca
@@ -44,6 +46,10 @@ DIST gentoo-kernel-6.12.10-1.amd64.gpkg.tar 301516800 
BLAKE2B 44bf837abfd4165d0d
 DIST gentoo-kernel-6.12.10-1.arm64.gpkg.tar 277606400 BLAKE2B 
e60b300544e8b5bd26207792c2ccf3630035cdfbc6c93296c83f40b19123ef1161dd7f68256a4f1f8b598e0898a736ee499e0cb8c5f314d95da57b44f76ee8ba
 SHA512 
d4a535644955d8a508c28ed1ef293811261cd422dcbe54b18511de2c2ec05e2ef1c06202582f37060fd577a608af47370dbbbb8743528ab1a3bf4f391582d735
 DIST gentoo-kernel-6.12.10-1.ppc64le.gpkg.tar 73103360 BLAKE2B 
2563681d420ac7f700c9bc59aa040303405ed0494f845047c8efe8751b26783394ace15f0c32e85e337d998cdde91fc3a7018f739642d6dc3dac8efd22a7e21e
 SHA512 
557decc01e9979c1927823f05bb94cab78b2ec4eab2daf092e9d6cbbca63018343aa5c998197bdbf1149fcac79512d5d9f1b89e1da19607749a9984811cb5eb5
 DIST gentoo-kernel-6.12.10-1.x86.gpkg.tar 77393920 BLAKE2B 
1b25c988d32151ff556bde8e69636bda8193f4cfba2b4abd82b104e168d540e060ed0dffcc875c96b7315bf5b280c9bfee929ce74aa6f513dd76e17d0e346d85
 SHA512 
ad30aef0b07286eda8e6adbc683a50f5e19a3c5a6795d6ea94e702096a2924b04d318785bef33c5a8aee48a7316cc8262cb5734e33c5f9633d86a08570e602ef
+DIST gentoo-kernel-6.12.11-1.amd64.gpkg.tar 301352960 BLAKE2B 
d8edd0bc033540b25660b363ae581c9ce5d595fde307a29d68210313ba2edfa9615de5ee16fe869cf88aef04560bd4ccd6fb4d699744b55bfca6887576cc1c15
 SHA512 
0d02a0d419e1ffec1d3eb60afb14462549e9ca7a2eb16f0b26947b8d57c69a855d0d7ffcf6ee330b6004a82036d8bdeb17cf7586b885662dc055b025f29520c1
+DIST gentoo-kernel-6.12.11-1.arm64.gpkg.tar 277370880 BLAKE2B 
f6dd4880575836c9d663e271ff744c665bb9d8bd01d615ec002b1974cdcb4688a1b8498e209b7e37f35171dd1195dcd0b8f506de6c3cf164f03eee55615e5611
 SHA512 
ee9cb359da28d677c4ca0087079103ecc5b485c438bafa28abd3d73d1beba12393acbb7ec9f9c4a8a08ea7e5075a0c699df4863a2cfc69bf6c358a62e6067798
+DIST gentoo-kernel-6.12.11-1.ppc64le.gpkg.tar 73113600 BLAKE2B 
0760b960afdcd7bde62ed518bb55613447f83501bbf7bca80b6adac88d44eaec6e3d61be062a1c1a57d7d1a6922f041d9dd1cd80bbf353cdaf468c423cf34273
 SHA512 
ce91af6cef42d4cdd728fb97a229600f6529892716727eac7c054ad5e761de192753ba5c648651634abfd5b83ccc911d1c8939640562599b29b5e8987ebb7d04
+DIST gentoo-kernel-6.12.11-1.x86.gpkg.tar 77404160 BLAKE2B 
63598762f1835482b9f6a755728808bf17a537193d4c9768a202b127eb60a8b379004c876b63b265abbbbb158bd25335586eeeba23c7e279455703eecc5b26c2
 SHA512 
637a45ee484dd18ed6a21620375ca316194eeb66405eeffc4261cb0a7d469906cd690fc72c2babe17b7618747490291e00e23df8b835d1bb814a4129fd070b4e
 DIST gentoo-kernel-6.6.67-1.amd64.gpkg.tar 267724800 BLAKE2B 
c38c7d1a3f3cf59afc345f1259311433a2086764bf7919051894cca8d442b5d2cbc74016ac4474b11d8855f760e09099d86bc5d31ede56e9e2ddbcfe139bd9c2
 SHA512 
c86849c88b3ebd4be4ab111876916896b02140bf267a1c071a5db845aab917d1bfce310da2dfd8a7830146963751735a8fff71e6513d513b282ddd57cba2a37f
 DIST gentoo-kernel-6.6.67-1.arm64.gpkg.tar 242319360 BLAKE2B 
df01eddbaf3d31b91b87bad4372ebf8f46a5a27bd0646593c9a7961b95561479dec4950c25e5a4cbcea4ea1e2be895a7f95d383f87593d7a4fc65f3cdd0fef3a
 SHA512 
6067d6649e7e5253142b5416ddf8daf3087552f33895d2bf273cae7fbbfae26689c7d02231df6926d35caf3e8dc941aac28031f044cd9bba93f7349ac7874575
 DIST gentoo-kernel-6.6.67-1.ppc64le.gpkg.tar 64399360 BLAKE2B 
12f72a9b32eaede365570266c84a0342bff045d599952797c902dcd8f0cc22bd64e89b3f89f29945f2c8f10a88f802e7bfa5988cdd42160a5b61131923a792fa
 SHA512 
44ec739e47cfdc56c452b12182953942940edfcda069af413d21b51ca93b2f45712e949af9e24b336743ee0b55db9d658856df8e59aa9bb348075a342848452a

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.11.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.11.ebuild
new file mode 100644
index 000000000000..8431fd7c468e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.11.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##*.} + 3 ))
+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
+}

Reply via email to