commit: bdab59b2388be16f963006d8c5e12bfd218d7427
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 15 18:16:06 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 15 18:38:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdab59b2
sys-kernel/gentoo-kernel-bin: Bump to 6.12.5
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.12.5.ebuild | 182 +++++++++++++++++++++
2 files changed, 188 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 2ec854e81264..1aa08b03480c 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.12-5.base.tar.xz 331136 BLAKE2B
6af9e74cc62063482672566432da61
DIST genpatches-6.12-5.extras.tar.xz 4056 BLAKE2B
a3e17cf0578b3cb3d5edb399e7030283c35cfb71357202de8b4ce28b0c21ffa5d5e777d6f6fa64f5791ecfac6a37cce3f7e1a926fc16bf75ebfe7029af9e4c03
SHA512
52dd7cb88876ad7a643eb39c7e86a3341438b3662b9821ee1f479aafd759962db247d7d746ae1ee63a4b803c28e8b7fd14e89efafe918327663df5029651c3ef
DIST genpatches-6.12-7.base.tar.xz 367676 BLAKE2B
7606acc5d274142a0dd1bbd0ace6cdf5dd74a7a594ed2e6d50cc3b62c03f43371ddab20eb639051077a564783ada9d08c459af88ee144b1310b91beecc24f106
SHA512
c1de8583d5baf08e75137068b868f2cb8cef7409bd481948b430de4390b5625d74f72031644c4e445bf55d5c430c9047cb280a05f2cc277a6a51d9ea372fa155
DIST genpatches-6.12-7.extras.tar.xz 4052 BLAKE2B
e2759676e3ba5088f5cf53dffd34f4f00e9d975434df6cbaf0ca7af418bd361d402183fcb88af172e40f297d0653eb3bdd7f7252ae7433f88155303c54145b99
SHA512
853a9cf03acf258cf39a4e2a1eb1ee203583c5a3efad1e4bbeca3e045604d013f6a0b2b91ce62c4eb5a61b355afadb1838a6fd051962745559a1be0b54cf7117
+DIST genpatches-6.12-8.base.tar.xz 575036 BLAKE2B
aa22e2f16cec22a76f2ccba2acd9d55b66a93851e01d2cf0af19e9904c6210550ece4699e19918a88f8ed5d5e78dd5d81afdd2a94541ec97d349bfebae26835c
SHA512
4251ebdbcec4649663541c8dba7eaed3b674612aeb68a0cbef94e0d0ea5820370a8996f33c316a3fcd6ee94eafb489dc32a22504e94843a71f464a3650647e1c
+DIST genpatches-6.12-8.extras.tar.xz 4056 BLAKE2B
e6aa730acecdbb82f7983e34df47db46f473a792d19b848d4e4a5d25b52bc7d247217a12f708698f0473ef6eae33eacc704bdb36053378ae8b86e4d80713421b
SHA512
c9da9965144e3adc7cc6d0168a1fcfb8165102ccaec2cdb9c4fc909d8e2002578263e12f1c2f56f21ec3b9d2d7a0a69b53dcd7d9dccbe40a9417ca0f6cfb43cb
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
@@ -60,6 +62,10 @@ DIST gentoo-kernel-6.12.4-r1-1.amd64.gpkg.tar 298731520
BLAKE2B 2031f80e2e889c90
DIST gentoo-kernel-6.12.4-r1-1.arm64.gpkg.tar 272875520 BLAKE2B
f04b706d89dd096b00c9849b556b7b3563c74ce0e32f8ca5c90b9407b7c2df2bdb47fc50ad24b12620558d0153b00f592aaef0f0b720e6f13e3e2f27bb85899a
SHA512
098d0385dd7db3965ef02cc723f69589205d16dae66918ff2aaff1438c6b79046c5931f6700b7b2cd0dd36a331f0f34e8ea099d58aaf795095ff4d7559da109a
DIST gentoo-kernel-6.12.4-r1-1.ppc64le.gpkg.tar 73052160 BLAKE2B
f0381c69f2a96602d610cdc14d057dfd024510b5bb261501d6ca656e516950eb2026b4d17e21a40af6ea1fa3af0a38dab2b330a704357a46a29dc55f3a4b1e6b
SHA512
712aefd61a0035851ab98f7f32b63d633ec167ee1d3047da9864c4a1a496bcb4fc7e597e27a5b87cbed24179612850f280afabe95c900aa64e1fdc87e1400d4d
DIST gentoo-kernel-6.12.4-r1-1.x86.gpkg.tar 77363200 BLAKE2B
22f30fd59ce13630a6e744158c22030e7b4f2a20c260c9fb1273cea51229fabcd2987f453b97d54f281c52ee2e5e216a55e736332b3d0aafe4877a4f0a450f9a
SHA512
663f4ff4ab0c17428eba9931d90f374cee6b5a263b7c359a8221ed0d6cbd28e29ca743fe7170963a452c7852ea0b586b1ea23305ec537f0c0887584a0f25f307
+DIST gentoo-kernel-6.12.5-1.amd64.gpkg.tar 298803200 BLAKE2B
d4ef43f193b5bf3e46fe3e2eb8337745a4bdf0e8d9b0a3bda4ff2f8fc33ef5b144a7b298677be05f2d42bf5f0ec6a624ad82d94413b37a14a2ad0c37574c4250
SHA512
03310ad4b73da51a5291cb832994416ad9229bb84288e4a58af8f3aca7b14248206d5b9acbc6b3668571fbd790de0717151b608846d2e66cb48f7217ba78590a
+DIST gentoo-kernel-6.12.5-1.arm64.gpkg.tar 272855040 BLAKE2B
4639a318ed1c9fccc6b0a53d547baed2a27787de1250aefc8948dd7370763097b102aa59fd76ef1c654d6da5fc8240d7d575c15b498d5f950dd6c11254c19f67
SHA512
21feba4fc21e8e7ba131e23d7fc641cb1318e383700d7f8da8ea7473b1ecc4165f935396d14a7b48e5493e761944701f99f5a8bc53a76aa1910aa4b32b0269f5
+DIST gentoo-kernel-6.12.5-1.ppc64le.gpkg.tar 73062400 BLAKE2B
5e801130030f4d8b228d13a1e00f68a5110f858bdf3f02633582daf6db6dcf4b8ceeaf206e6330b0bdfeb5cc7ddd5b9552ee54ee455008a920ce1468d87b136a
SHA512
2618158278619467fd33e38f6d1610c78324bfd0c1e4cf37f5c7b32896ed8d1d581e3767b72d248da72cd66006db79868c64056f2aebf028466ef524cca1dd7a
+DIST gentoo-kernel-6.12.5-1.x86.gpkg.tar 77383680 BLAKE2B
d4d120a1269f96fa3cb6beb913113482e4d2ae01c7cb2d945751f0e4a574f4cc74c3e3fe5f0aaf3b2b0b7c4c13dca7fec0ea87739f69e54d74f7ecb8a370a128
SHA512
15182ded6345f2fba113a259ed54ee0d32dca662bab9f2965497da456af99855d56e7bcaf68becafef2a751021512045ee7dc17f556773a97d851abcf9752afa
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.5.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.5.ebuild
new file mode 100644
index 000000000000..bb92381f7d2b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.5.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##*.} + 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
+"
+
+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
+}
