commit: 2e821536c32f8cee17307edd12efcfe69096fa5c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 5 17:43:05 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 5 17:53:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e821536
sys-kernel/gentoo-kernel-bin: Bump to 6.12.2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.12.2.ebuild | 182 +++++++++++++++++++++
2 files changed, 188 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 903295262653..8cb677f46714 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.11-13.base.tar.xz 1057764 BLAKE2B
af456ba89688ebaf57a0921c3046
DIST genpatches-6.11-13.extras.tar.xz 4056 BLAKE2B
c03fd34ce154442a7e5d786d554a5996dd90ada4cc302aca88a00573e4eb3ee4c5cdbe765aee0cbf1a874b5be0dd2f03bde9d50da53f3e62dd0e3e9dc0560a66
SHA512
d8b42dad1b61ea53b83e283fa0abd3cbd6e28f062047b51b3fb0339f1fea650d0ca386ad5848e9a6407006f886f1ef6107f79c179096e63bd968828428aa7652
DIST genpatches-6.12-2.base.tar.xz 6548 BLAKE2B
6872ca3238aa7b9e811ce827260330850fd90bb3bb48abe7a06c5fd36acfff7ceca5983aff7cdc82da2396e27b908cb737ab77c5efc9603d03193473236ef634
SHA512
baae1ebc693f5eebb308d35d8e6571f5f00e95bd98e4aac9c84e6fceffd051b4699762dc5c1f1b02231126e7c4bafbb352e4aa011cfa71d9b0ba84fbfa766536
DIST genpatches-6.12-2.extras.tar.xz 4060 BLAKE2B
ce854b442562d86627eed172c94d6766ed27a29e0c7cbd240ec7b18b3fb0965a30289640d828b603eb309f2e911dec157c206740b4f16f40ffc3ce8069fabf3e
SHA512
dd14190aaf8dfd51696e0fd3751695889e9c4c6ac9eb36b288f5991f01874b3cafb29240fa115fe54b718ee741c810c154e97aad8f5eb72f988bb3bae0005222
+DIST genpatches-6.12-3.base.tar.xz 330568 BLAKE2B
37e21093772463ba3d14744ef5a549d0b2af6091301e8a4141eec1e1535884ea775b55608750e2ca814a973f0b96efef0993cbc52e4ab5952f4d1c3f7d2c5b14
SHA512
f5c1a7b2d0e4fcf1b012fc3eb974e137079ac5f679fbf9afe03eb60393eaa326ab178685718bb55d5f6cd994b74f51afbdc1272b161a93d808672ee93ac8381d
+DIST genpatches-6.12-3.extras.tar.xz 4056 BLAKE2B
8b868220be5ce7d53d9bf680531efb6263b755c80dcbdabeddde97bb8925a1d7f26fdaf8c6b8274f0fc5efad1d147e9cd02a247ca6babfbe0c6e143afbe4782c
SHA512
2b0bfff24309b0a71b842efe1522c54c320bc9fbbc7380d123b4cfb8435819baacc4bf85bdb5d10806544b43cd728e292e3a08c095664d6e5a52e3e9d11fea74
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
@@ -44,6 +46,10 @@ DIST gentoo-kernel-6.12.1-1.amd64.gpkg.tar 298700800 BLAKE2B
0e691f266113eb87e1b
DIST gentoo-kernel-6.12.1-1.arm64.gpkg.tar 272773120 BLAKE2B
aecd1217beef2537dc0a459e55eb9b368c9a117c7d47f1c5f3e839d84b35651c46137c04cca7173e2f69cfd84d281e5d1db4d4eed84ad72a93cf63712aa84e31
SHA512
e213ff8b0e4744f682986f377821d4af3d97d91b4d6a47ea8428bf9914ecb11721ef9a3490a8a803bf924e240c1eeee78254b11dc66d981dda22e171404b2b83
DIST gentoo-kernel-6.12.1-1.ppc64le.gpkg.tar 73031680 BLAKE2B
0d4b88f258cba1fefe2bb6982c2a8386e4b6768e2ce79c8fda7d44e106a4c769164b9bdecfef1df6a22e560109c87dc378dd9993b3d48f9638b25bdcdc5aeed4
SHA512
94d24b9925bfe58844459360fbf7b4b982cbd55e153c5cb07caa6f725aeb35024b1fd96672a7bc2fb0886a39eb307ed621c7a09ca05bb8cb15046d913df453cf
DIST gentoo-kernel-6.12.1-1.x86.gpkg.tar 77352960 BLAKE2B
adb2f04f127644dffeca1b11892a5b021f60fc36cf322ce820682ffa83f1586c74f013258a33679ae6dcd5e5bb3095c0922b12acc0395b3aef303c3e936d5e28
SHA512
8f05cf80e92be1d2ec15aa176883db74ce0ae832c7ca3367a7f741a8185a7260d524493d6ae68fc7d95eede7ae2fef546f339ade85d53b5443dfb4b8d437ae86
+DIST gentoo-kernel-6.12.2-1.amd64.gpkg.tar 298711040 BLAKE2B
3cc56597f6d5e5df78679170fe8cc36cb3ac5f911e11e59945caf64ce386c05acb2e8271b83a53b56561b8634db57c085954b6e1b1549eaef007bbe262c433e9
SHA512
f6ad1e92e18383e137f06dd06b5b604c82d74a2573426820556e4b5d17ca79f027255a402384c36a0d130a8253454b1d6f9feb8f649f759d483620da431df7eb
+DIST gentoo-kernel-6.12.2-1.arm64.gpkg.tar 272742400 BLAKE2B
a88caed9d219ab6cbff769279b37f6d9c3553fbb2af4dbc2dae6d40c886e22bd9cae263ea7b12e0a00284ef2937cd5f7f2ccec61a283ac2e8b3561b9dab1cbac
SHA512
06736046eefd5c121650c7beeaec3be0229397df821a5c6da1557c5c013a871e8bf10b16151d5e66e82c4e71f2ff79c533de1b70462b409dea21caada8ec2e5e
+DIST gentoo-kernel-6.12.2-1.ppc64le.gpkg.tar 73062400 BLAKE2B
ff9f1535aa539227e34ad1d877bf6136e79e0f1fefcac1cd07d41d17ff33ea2ceaff3e3f441d580044d9c513788b1f0aea56792ccfe2cd3a8b031128b77c710d
SHA512
a79e64abca134cd7bbed885a3bd34b0358396b16b6aaf94aa8b1af7ab45da0f840f356660b8f9f4e447f5061c49a424d4db54e1e7d2c6a4c8516d0a630a23859
+DIST gentoo-kernel-6.12.2-1.x86.gpkg.tar 77383680 BLAKE2B
7e7fc7f56109ed8ba3314f6db3c87df4c1d8bb55ca34d5c9c4e641d64870f31996a63a36cc3efd19c0456a5de4bc493316937f7118f61dc87fb650ba122713e6
SHA512
2e3950e4f0065e9d1b1454b02ba456462b6f51f74cdea694580deb0fdf56d9bfdb74d020da94d53e725c50dee884175fe415ddeeefbff01f90a5876622d26e7d
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.2.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.2.ebuild
new file mode 100644
index 000000000000..e264bcf1bcc9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.2.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##*.} + 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/-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
+}
