commit: 501ebbdc6d215abe7b3e460c4d312516f1305830
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 9 18:58:41 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 9 20:23:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=501ebbdc
sys-kernel/gentoo-kernel-bin: Bump to 6.12.4
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.12.4.ebuild | 182 +++++++++++++++++++++
2 files changed, 188 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 847913db441d..c92a15a6072a 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-6.12-2.base.tar.xz 6548 BLAKE2B
6872ca3238aa7b9e811ce82726033085
DIST genpatches-6.12-2.extras.tar.xz 4060 BLAKE2B
ce854b442562d86627eed172c94d6766ed27a29e0c7cbd240ec7b18b3fb0965a30289640d828b603eb309f2e911dec157c206740b4f16f40ffc3ce8069fabf3e
SHA512
dd14190aaf8dfd51696e0fd3751695889e9c4c6ac9eb36b288f5991f01874b3cafb29240fa115fe54b718ee741c810c154e97aad8f5eb72f988bb3bae0005222
DIST genpatches-6.12-5.base.tar.xz 331136 BLAKE2B
6af9e74cc62063482672566432da6173b605d67ed0555ca1486cc0ffde606d84446c40d832276a9ee2a6d2584aae4a8de22a186a2c5b68ced840135b87b37457
SHA512
4b6f205a9fef89118e408e492b179289338e9453563dc95746826f71f5c995d4b36ca14ff106ef5ed6112f5d8dcf6992c7e368ab8ad3fd682c9c0219956ff02e
DIST genpatches-6.12-5.extras.tar.xz 4056 BLAKE2B
a3e17cf0578b3cb3d5edb399e7030283c35cfb71357202de8b4ce28b0c21ffa5d5e777d6f6fa64f5791ecfac6a37cce3f7e1a926fc16bf75ebfe7029af9e4c03
SHA512
52dd7cb88876ad7a643eb39c7e86a3341438b3662b9821ee1f479aafd759962db247d7d746ae1ee63a4b803c28e8b7fd14e89efafe918327663df5029651c3ef
+DIST genpatches-6.12-6.base.tar.xz 365140 BLAKE2B
bf281f8314de03b6ac24de430632999188ff1573f46f58cab999f92fbcf0c2e5fd14413892e5a961eb1ee8b64360a253e8cc26d24f8687b413ff9cc1df72a4c2
SHA512
ddca7ef8f67bdc182ccfeb6ed2e5fd08297287fcd5744285c549643a854c7d6148342a3ac1a13ad6cdd87c334acc5abc58a7f6e6a58f34db8ce9dca2b0802152
+DIST genpatches-6.12-6.extras.tar.xz 4056 BLAKE2B
4d3a72ea884a1b6cc84034277d6cfb57f7cc3fd43e9d229b46707c07dcef1af73bbd61aa880805ca5746c3b470335ad48c10d55f442f3396f0aaaa9a7a23c73b
SHA512
538ba6590f3f4ff9bcb44131393a95a677ee6c59b6ee67ad2519ff242fb182358cd217d5e0533e11225646ecc92e8efeb4688c332db70d35a977a8e3cb475787
DIST genpatches-6.6-70.base.tar.xz 3723176 BLAKE2B
19017743aaa0e1c717746592f253a14ca476eae1658742c6e487023ee5a670473fe582a814a1202f2aeefc78d7dd3dd249810d7665299f740fcfceb1c8c11f84
SHA512
dfaa2df7ceb9411e9e35fc9f4822f7d579c1106b49c57805d657ec14699764a54e10d93f717801db7e33698b1c01dbab489e7b9953b1ff23feacbdec5a99c95b
DIST genpatches-6.6-70.extras.tar.xz 4060 BLAKE2B
65cc5e2a27894992dd78d6cbfe5601f2e10b21f6e588d8a8d75f1f265f1fdab3ab03dd4d5c18e3ac5f48a6a72f021e2f125c5140224b26f0caeba3def4054042
SHA512
728495f3fa06f52f0ececb3b5e69b1cd4c7aa29d8ca02bc7a537616a2c1cf81859b5f624e125332a1def8176f7a878da58843ef8d363a5d622009b31548879c6
DIST genpatches-6.6-71.base.tar.xz 3745848 BLAKE2B
ab33221175b500bce645d302fb32095aa15a536ba475b866c41087d963e57a713579ddde608d93a5f2ea823e7126850599b49522c8c7112cf9435fd85897805f
SHA512
eecd342f586e1b594009f91fa1ac12399d90a164dbdbdb454414eeca9bd47ce04a78e0ceee28f889324ccc505112f6a3bb4cc093f88ed10a4c521869769f4e07
@@ -50,6 +52,10 @@ DIST gentoo-kernel-6.12.3-1.amd64.gpkg.tar 298690560 BLAKE2B
38f8670f67bbd9ab5b5
DIST gentoo-kernel-6.12.3-1.arm64.gpkg.tar 272814080 BLAKE2B
e562374063514452ead9f93905ac0a745f0eb7841aa1c6dc9d6a79dffdc4b939d8ea868d47e66277f66052d096285516723774000f0a9c8bc694fc5e83142f9c
SHA512
9889b42c9ebde4a350a085477560d076384cd1da48090a629de1f71ae1aff3b15beedf1b630989b09602c77299fcf341e4d736a5519ec79d9424119a30d7bf1b
DIST gentoo-kernel-6.12.3-1.ppc64le.gpkg.tar 73072640 BLAKE2B
f10734adfd71df134f10ab7f737256fb6e2d1a475ca0dd948c95f9b4371e54ab22374afb17b68c5c9e4d4aac4e6f51ae8aa4b58e968b09c92c7fcea6932f833d
SHA512
d9de25e1eaa6eac0a31c31be8d7cfa3b48ce89a940dfccb200f048c353aba3c6cbcd1acc1764203c2fac35c0e47274fb8f0d0f5ba3404e861d505e72f07065f3
DIST gentoo-kernel-6.12.3-1.x86.gpkg.tar 77373440 BLAKE2B
0a6b4e351ea26fc033c82ebc83bbcac086ed3bedf169d1eb68a908113f2b8b6c7cb3ac0af1ab1898e9befaea5a1549eae8f3902f8c0c98aee2e7371b3775270d
SHA512
bbcee4f339bc265afc6b7d9df25861f1f0f4fc426d740be9e20ac296ee9912e41731c1da5ada3832b36cd6a58e5b0addd27db1e21f5794e943f41dd22938389d
+DIST gentoo-kernel-6.12.4-1.amd64.gpkg.tar 298762240 BLAKE2B
b05d0ee9b91861d34071db2cdb088b83d36155d946a0be21af2583bfcc01cd0a059aa953de92a5431449758e2ac76d2d26a967b989202c88692e517480f1de9c
SHA512
10fddc460a6da166bd2567e00864375739343e0e25d1b9436c27be20981794e21b68cdfcfd5947e8bc8342d02b2e443a72bd96d3919b086b1fea9b7319342d57
+DIST gentoo-kernel-6.12.4-1.arm64.gpkg.tar 272793600 BLAKE2B
808837f2e196d65f35a939d9d8a24fa7acb90d3c603ae5c1879d977a8b3b89240a4d9052eb7ca6c014811a72dec75e9082f1d92eeeb6049e06a1cd3926a787c9
SHA512
68fb263672e5c40702671370fc32f67f85a0a2aaa8a71f091c4d96e16c1aec7fb0e652f3b0eef9a1a7895c85e43c1ebb22d50ec3a59a0cc40b1a465950d82ab2
+DIST gentoo-kernel-6.12.4-1.ppc64le.gpkg.tar 73062400 BLAKE2B
1a24e24a8433ca2b3c963c57c51f53ccad08320c1cc7f65d1f5e621d36bb8e0e2a677d1014c3cd573465e1386e98856cd0c5951cc13f6a360c2bc2ed35eba760
SHA512
b32ad6aed53adb6efcf3ea000294535aaccc05f11bf161273016c745d49b08ff05b73c4c0faa4f63fe099d36194c84cce92e092f2b456edc44c9d3cce72361e2
+DIST gentoo-kernel-6.12.4-1.x86.gpkg.tar 77352960 BLAKE2B
4eff060db996daff2ca09072ecbdd9dd3a86917bd7b0767bac8ff4788a5490dace803eba654f56e4a95abef5c4ffa97b5920e71fa4ba08d0b958c68bc6456059
SHA512
0154a2ca907d8d78602dd5b5213e08db460b9a0c13030ad250ed21f477aa70ff976cfe8e3b89e26b5c22d30bcfc0b161a68c6d12230c601c14a885a1256b12f9
DIST gentoo-kernel-6.6.62-1.amd64.gpkg.tar 266598400 BLAKE2B
f02bf7a4a53b025a1c2da579f73f3b0222e0c1b06deb3657b39e70103bf2ff0ef5e56386b70ae70a0d6822f41626e574f620e1901d46a752c3d3cfdffac70318
SHA512
8a62586c680c0d0dfd3f498dca24292ef337797adb15aa200f2964cc37624cb2dfb537ddf42036640ff46237749d1313f1a8724169a78ed958f2e99f5d530ddc
DIST gentoo-kernel-6.6.62-1.arm64.gpkg.tar 241633280 BLAKE2B
67f10267c5f7bbbd436c7fa44f1f0e9dac83262f58c3b297a681d8769c1d0577123b4cc3c45283aaf94eb3dc14189c90207d0415ea174737f7eec12688bf1f4e
SHA512
6933a49baa988b84171cb4a6a1849c1f115cae4d09715f2d450fed9a8e2808a1c86b4af67545554ad91992d77eb06196ce1b395f6749f9547e01bd63f157a827
DIST gentoo-kernel-6.6.62-1.ppc64le.gpkg.tar 64327680 BLAKE2B
7bb24f2f5d97446baaf70f15ad2f8437057274f371569caa7dda12c0e31de8be168422623d685609c37ef532b8b67dbc6c90aecbc561e7e86c66ca46945962bb
SHA512
4936c616f77f1bd1a728778722207d298e7c596cfc4e35c0f3ce703ae4282e7ccce274762183a81cfa2feaadb456d4467a87a87c191abb3c72d3da5a498cb297
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.4.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.4.ebuild
new file mode 100644
index 000000000000..b35a3727e6c5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.4.ebuild
@@ -0,0 +1,182 @@
+# Copyright 2020-2024 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##*.} + 2 ))
+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/-2/-1}.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
+"
+
+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
+}
