commit:     af08517e184f02bc0fcd8c0fd19e4b5af89c328e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 10 16:38:04 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 10 18:04:33 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af08517e

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index ddef3091973d..ba04bf32b910 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -24,6 +24,8 @@ DIST genpatches-6.13-12.base.tar.xz 703484 BLAKE2B 
5b00c4e4f5791de684731bee53531
 DIST genpatches-6.13-12.extras.tar.xz 4056 BLAKE2B 
1141e92da31d5a7de405fa789b73a50bcf5c00f4c07a5543ba17171e874373cf50013095dd53ab7b6282240b7291fb62967114020bdb0c2fd6102c93ac37c0ef
 SHA512 
5facffe5dc9b97ac807acf7569a3c0cd2099112bac593fb0d397c6f1648b3c9b2c5699910a6a3361a0b4181c3ed9ab0044a53ec07cf2e748223bb27bccce5ed8
 DIST genpatches-6.14-2.base.tar.xz 16768 BLAKE2B 
95cf49b103512f2a6758a704c88b740e1c0fb5ec48c361cf5c60c03a21aeb01554452effcf9c241a5163a1472bbfa1bb3476ebda784c3152ec3bc7e823889a2f
 SHA512 
4403d071b9d4691c1a07280755d828ff234bb56c9e27d6d3515be2653aefcb25a4e9722c61904de145b96bf20d76d18f7a1f9f83058e30b2485544563779202c
 DIST genpatches-6.14-2.extras.tar.xz 4052 BLAKE2B 
1f50db489f26a2727e46d64aa5fca4fff7fbc59f6093cba8fe91faaded0d38bd1be46a974dd3ece6cfd5bdc18698e11b5413ade535730b99ef22b0135c7c7394
 SHA512 
3316151a578ccd510534b91e9445441ca6b53822533b60bd516c765b4abfe0ca0575f2a18e31f7a975410bff1fed0892b57643f844757cdd3c976cb759cbe2c2
+DIST genpatches-6.14-3.base.tar.xz 273232 BLAKE2B 
a3bbcfc9f84d435dbc990365babdb930c3c07341e9a4f706cd054328080cd264dc0a7afd8607005d34c41cd14369b55db514bfc786cb73de47b5f04a1e0329c7
 SHA512 
b53272d0e86090cea10d664c56fa6ecba05a0e4e95fb2ba7f72ab2e33a77bd5b1d10f06fe6b8cccdc4274616df66d7c70c42c81e6474328e37d06aea44c255fa
+DIST genpatches-6.14-3.extras.tar.xz 4052 BLAKE2B 
02175c74182dab71e717ac5e803fd540bb24d4c5025461fb0bd0ae8978d8fd99fe9654372fdeb3c4f00a090dafbb15e43c1f678280f45719910787ea41ae0ece
 SHA512 
359fe9e447d34080bff08d683b60065962f357698b1fcf50b73383cb5618a93cd2b1cfb6d3269bb6ac3c463e359f58d78d45ed5936bdf98205ebffc87c03a704
 DIST genpatches-6.6-94.base.tar.xz 4728588 BLAKE2B 
63e287cf4973aa3808673a8069572ff79ca0efda0c7711df217fa44ba1d8179f355ba4f1145be2a81974922eb17b2110f31ed091fd1aa2609d2432995df9ba53
 SHA512 
9cd910058edb7e36a8621eb1f2d8493ad4c3db2551e3073683557be9a73b20cdf4647d7beedd2ac93b84fa126b816485372f1d8c5901bddbb83f6896dbe9a22b
 DIST genpatches-6.6-94.extras.tar.xz 4056 BLAKE2B 
91ce861bb22c0e604dbc9e23fbc0a59baac8992f9c7ee1e1f3d5dbd28d3695f0621a6fc9b04af70dd16c0283af61b77d3560069b34e7b7457b3daf4db4a8e63a
 SHA512 
a9b0632fb4c8fe27350e28b3bda5b2c2faf539e2d063e7ff04cb901ac4610c16537cc121117e283076f07318454eef6127aa326a401f932f197575baa5ea99be
 DIST genpatches-6.6-95.base.tar.xz 4736688 BLAKE2B 
bb95c2f2839f40a05b0277558a08d91a031e9066f8ba44f08dc1c9cfcae038ab431f8951734f37ae0b4c0edb42e7c3f868f495b90a7e0e988b8fdbd900cabc3f
 SHA512 
c5b0bb418c4ce0cbf8e00da3864c37308141f757621c5125e33c283d92187efc234d5e2097e40ececd55b1c10398063b378b42fb7aca57a0864d04f0a06b3472
@@ -80,6 +82,10 @@ DIST gentoo-kernel-6.14.1-1.amd64.gpkg.tar 309800960 BLAKE2B 
4c9da11703458806877
 DIST gentoo-kernel-6.14.1-1.arm64.gpkg.tar 282818560 BLAKE2B 
d7bedda56957a14122f2e1fdbed00b01c47945bf4f0244ed58b446c15f616c549aad212bde6e33e9cd372e500f66380298b532c4f2e629a05629ce80eef925a6
 SHA512 
59e92e07fd3e67cee69ee86ffd7b94b03b7965dbf9f717673b280f3186f4792253d658b8c30115a8e3a5ed4948df43e13ad74d93f874426fe9b310a9a031efd7
 DIST gentoo-kernel-6.14.1-1.ppc64le.gpkg.tar 74280960 BLAKE2B 
2b652958a86b388539807620c9118a2241c71fbc0dd0a371f42874684454c5268e0d7611e9a08b642ac0dea60d7c32fd52ecdfdabe7e293657e07aeeedafcc9c
 SHA512 
eb8fe847bf73b7c0c1dd5bba39e0452e8bbfdbc96d5a0b09845fbf969343df7d4c8b46f7f1db99d7184652b63a0db90a389c52888e37d116b17d115d9e365c7e
 DIST gentoo-kernel-6.14.1-1.x86.gpkg.tar 80404480 BLAKE2B 
6ddfc81111d43317c04752c652d8ddb26d1c13c9a56babcb3eb79d63e3e11080f3d03d3beebcaad137608c6eac1bedb0a2f08d18976278b2c0afe17e41a87b16
 SHA512 
fda8e366a4990e5b1153d75b33ae7b8ec9c69946c9cac7ec22e971ffaa61d34125c3a4920dba0a56cc0d36950bce936b3095481ed38e436ffaca4693df851aa3
+DIST gentoo-kernel-6.14.2-1.amd64.gpkg.tar 311193600 BLAKE2B 
146cb8bc8fa0319c252000885bcfc6a45949be16fe74f6214f504e0e4b57cdeb5296350af82b64884f0d3feda8397f85c37fbc13e5439ad28ba8919d9c126852
 SHA512 
f10613e58d48fcc08bccb015f0e59aa71535bfae5e07deb1540ab81c36251a7ffc0eed6dc9b4db2eaceb10e63bc654f387d465e61bdcf93e342371269a1d5217
+DIST gentoo-kernel-6.14.2-1.arm64.gpkg.tar 284160000 BLAKE2B 
018ad4be7333ea905d8d3e53c886753f9acb3f838963a53f197f4af139abcc2d9a863bd38e7562ed9bc39b7543e18f49c3563f515f5266ac6ce74cf287baedf2
 SHA512 
c7f177b66ff73e89abe8175401fd85784f6a56a02f4b63abbded318368850f6c9e013d990a942370c08a5ac29e568c9c22d01b3f9c68f96da1dde42219e471e0
+DIST gentoo-kernel-6.14.2-1.ppc64le.gpkg.tar 74414080 BLAKE2B 
12802dbeabbcff58a136c91da5aca1851ed8e7524fe32f4f73783a44995beabd68667bd60a31ba6a00612ec828fd172a44926570541bb08d22a8bbab5f3d9fc2
 SHA512 
a9775bc8b12d73b291a37b92f4da8b1f0e4a51e5abb14f2e4e0f6041bf6b963290bd8264bd14f85a44dc06324b9085773c08fc861b062977f4003fee9610f1d0
+DIST gentoo-kernel-6.14.2-1.x86.gpkg.tar 80599040 BLAKE2B 
845c608e5039ffa8792c7f9c776f1e0dc9ea31700e1abbc44eacc2725a90d496e27dfc77ae35fc934bb9f21b35555f9fd5f96c2c35e703223db2da4c4a3c13f9
 SHA512 
9b0315bf9fc4a19935898262b300fad0e226c9d367c0fd0cb5c6e3314384b6826108d966a407d7011f7899e7fc81e1225be2c63d545894883227a02d74d64534
 DIST gentoo-kernel-6.6.85-1.amd64.gpkg.tar 273459200 BLAKE2B 
77163f000eb2ba7ba6afb9ac81e8f6f114a8401707a33ce1af1f787bf891e2dff92d74d57043cc8b16c2f83570d93d01e6364d7be854273f92fb130185e25b98
 SHA512 
9af07d1daead4b49544b57f1b30836538f86cd303bbc08f5e3fb4f23cc49cc2b496c6f0bde5546279cc5d0b6c067a6971fb2f90d40842777f9fa0eca3c9fb14e
 DIST gentoo-kernel-6.6.85-1.arm64.gpkg.tar 246292480 BLAKE2B 
a3db12f0125e55a9af4d227848397b259418c9aae6ca15e88b50d1f54901a836543537ee991bf35d9c07ba35a4e3e0dd1f118d5879fc4e798ad120715924b914
 SHA512 
0eb02919d964639733875c3e1402f3c7a54251c678a12288ec8863545bb0c739b050a6648b04fa00884fa4d6a82d1df452e81c52cc38ad1f64a64157e88cb529
 DIST gentoo-kernel-6.6.85-1.ppc64le.gpkg.tar 64430080 BLAKE2B 
52082ced8fc59daf2a95dcd924273b7987e814f6cd68e18e6e9412cbe80401c224088763d10c72dcc993c7a33fe0e6518bb9990c7d3315f45adbecef05538f99
 SHA512 
cea21d9a9533b6d55b4aacc11d3b4b25d8f297969fcb717ced2f6165f7f493d3e350a254d74f8fd3372d700608dee2f380a7aa62d21f507db2dbac76dba9dde7

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