commit: c5fda66429df0e9ff72310b08adacc850524663f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 15:09:19 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 16:18:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5fda664
sys-kernel/gentoo-kernel-bin: Bump to 6.10.4
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.10.4.ebuild | 170 +++++++++++++++++++++
2 files changed, 176 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 7f11b0932b4e..521066ba4616 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-6.10-4.base.tar.xz 15672 BLAKE2B
3dfb069409ca8c1cc8022daaeda3f45
DIST genpatches-6.10-4.extras.tar.xz 4056 BLAKE2B
b1cc5a0d37760aac34837b9f7b26240d92afa816b5456a334deaaff8e911cba25f15c5e168bcba86b80d9fbe006a4b07cf4aa963e68a92e5152033cbcb080be0
SHA512
765b58ae1ce61678dce39b27e9212844cfd991e222384c7650355a374a236918f622549d49d5d483bfbc6dfaa74120b66976e85bbfdb6b54b0e871f1d5d5ec60
DIST genpatches-6.10-6.base.tar.xz 257104 BLAKE2B
13309e86f5b16ff79797736ac91214698afb07ebc167eb22bbc354432f64e26dc3c19e0e4bccaf4fac7f0c858b7739317db3ffec9eef596eda5c2a45e785bac3
SHA512
55c009415c1b03c02a5e0251c8a12adf9eeba0fa7010cde100735880332127bda25bbbc59f9105c091fbc5bd67d7bbcc4fe02fbf4de7bee645bc679649ca3a67
DIST genpatches-6.10-6.extras.tar.xz 4056 BLAKE2B
746ea837c1ba5ed7a4385b2f60be08986ad43f0c2eadebbda940d4cc2f7eabdef830459c55c183a68b63be318af661a8bffa25bc5da37628efb1f59987724c8e
SHA512
63929e552c0e648245f8b7af72478bebf3a19be2f9aeda2d37e68b02611a69bb171338228c1c1d46b352236f63c3b514e24ef4f0260e0477d487d02ffd99ddcf
+DIST genpatches-6.10-7.base.tar.xz 309388 BLAKE2B
7c1b7e7ef111b090d54c616d2e4df14d2f914c0e5b5a947c27781c237de9ce53d42c4cb9c6b55b3e0711485a0f28bcdd484babb0ecd2d3e0d508712f3e5e8979
SHA512
828c4638cf3b29e2513bdc418cce2ac567b593a9c2b710c564c49193790e5268e2be5a37d341f3b2aa08a59d36f59019021d3d5fc5a2ec7fd4f45b643d686801
+DIST genpatches-6.10-7.extras.tar.xz 4060 BLAKE2B
b07e59e37eca5c1a3fabd0d062c67f35f404244f93ae10b423d6849ff4d141fd184619d93551014ddc02db0c3379b8b2c486f71ecc798c1a53c20ab5a5a6a426
SHA512
0938b6a622b8b9e6e251fdf7689d972e1aa0a78ebd1cfabb7686298286f87bf9f0e30fe01f64205f775d90e870cb2cc3eefa73b49100a82ae01a6399376d6e94
DIST genpatches-6.6-48.base.tar.xz 2633356 BLAKE2B
3ece4f33cce7380d247fe1f3182e2a516a8e63ce1952e30593f228afd4f11b67d838a0374698b1c3f48992ce04f4b55fcc258c8a41bf2821e01b6c4bd4829d07
SHA512
2a514a91d3e7b8e51330f6852edab7d8481dfbfc84fad4415141dc3d0c68865f19724480a2403e86e080d368004d26669f365de233b6dbe9f664946dc168e853
DIST genpatches-6.6-48.extras.tar.xz 4052 BLAKE2B
a5aa357ab175db9a16bb4eaae879d8439634ea41e525b9aac80e51ee51305399aa5f7597f126017ab856649d06a90f2e38e50663f258585793a429f20192c28f
SHA512
9dfe341e12629b049ed97ebcec3aff60907c5e4e4cfc6f0ad1eeed2f6b7c66535c95d486b3252cade4f92b7beec76fe2343a71af415fd3160374be5b99076197
DIST genpatches-6.6-50.base.tar.xz 2671516 BLAKE2B
356a9a17f69416423c37c801e715dd4b03d1ebf02411a3e637e3790b4adba44db6c04f51f19a6da4ba420332cd5af1221692dcfc2ee1101825a5c8a8885c2e44
SHA512
e7a74df4659bdd54bf0bdb4aad8172bb1374aa563a19d28cf9643d034b59aeb55343ff5048d3aea42ddcd7561f0f723f951ab1f00c05e5ad88d20e70b7c3069e
@@ -58,6 +60,10 @@ DIST gentoo-kernel-6.10.3-1.amd64.gpkg.tar 160778240 BLAKE2B
264edb4c72ec7c3c773
DIST gentoo-kernel-6.10.3-1.arm64.gpkg.tar 131891200 BLAKE2B
4cfb6c05ef01ab976a65d164f0100347d913033e9851b4b4fbc9646bd14ae6c455ebd3c435678dd74e695a356c03ec136df0395fb11b292f2dd80a2661039757
SHA512
dec53cf395e42280bddcb07ae6b7aca73ce8b7c9ad99a460199a1212ab72801959ada4f23c0205f6cf00b50d70176b3e47a339a3f0d581e688c8cdc0c522a3c5
DIST gentoo-kernel-6.10.3-1.ppc64le.gpkg.tar 71966720 BLAKE2B
c8055e58ff14a465f465d4076fcfb363a4287648cab243ac6fde7ff9652d96b802dcc6231000136af6af6b90e58afbb55b468d44c36812e299476f19f806ed63
SHA512
7fe3ff27cb7b5c16fbeb12bb7f0212f0ce548cd95f003f7c35f6088a2b5cd22ed90796c1838623678f9fde2ef5b56570a8c72dbb55ac3fc5cfdb8685fc6cb078
DIST gentoo-kernel-6.10.3-1.x86.gpkg.tar 75509760 BLAKE2B
d95db1d0b11c9d801d0d8384d31ff1e9bde30bc7665e0321bfb01cb3b135dbb89081d9a4c41c3dd41ea9464b935c252cbaecfd1c65f325a84ec822a65623e3be
SHA512
fd8ca83123122e8af61fc8e3d131e7ff887b52c65e6c4907f21627edc6793f99a5aa5e883fd5b7a361029365c8df96d9dd2056785178b78da4d4f3e2e2eeef2f
+DIST gentoo-kernel-6.10.4-1.amd64.gpkg.tar 160737280 BLAKE2B
83f76efb148ac83cc76df74e2985f1833314079a5ff2a9bab7ce69fbbc3f77c1a3ce146fe77ce714a43b659b0714e03fb8ae355b7e9725ef3aa7a64cef9b27f5
SHA512
00cd84b80645f128b9d6b3be28fdfc3aacd8aa7754a828dd583a3c72e7b0fbc357de7735edc6ce3cff2a57f16295953ab33d5c57d8ac98a3aee65fd577e25725
+DIST gentoo-kernel-6.10.4-1.arm64.gpkg.tar 131901440 BLAKE2B
be3df65203f3f7d60499f6556e53891573a10b0e8749553e734c5947368b7605da0535b534449f3b5fd0522e4ec6a70da15c0917fae7c00603d485b1148b237a
SHA512
eb4e15e929f81d49c3616056f49e4f5385a954c8a11197c921aa0ae907cf253949d5b7bb49a8a3075f5a76f72b482874dcc20ab306b05a66aa1b30d02c276613
+DIST gentoo-kernel-6.10.4-1.ppc64le.gpkg.tar 71966720 BLAKE2B
2af667bb98038ed2058b46b5867d46e4fb8730f92293e5fd082ab0458a662a1b70878ff3f6966fffe9ccdce49b05299ae135a17bf1b87233ab4623a621c83d59
SHA512
d23039055d94c06841399a52406f53412b291d880649cdc53bc882e6f422f24df852e561dd1141d89ee3686d7058a2be70866e71008575cbe7e71e5b51bffcde
+DIST gentoo-kernel-6.10.4-1.x86.gpkg.tar 75509760 BLAKE2B
f31f246dcacbc1864d2ec6d7e999bd185e5d8d517692612d521ac320014d15f1cb2ca0b925327237fcc5a5cce31e7c9660c9c6db46cafe4ed277c19171bfb587
SHA512
a9c5cd35642229921a491c6eb0819432a40990ebb507b18327f935ca8f45d092568a1803ba9ca97b4d837b00d0d8f1f9937ad8ee91fe13daed7f3e737b019a57
DIST gentoo-kernel-6.6.41-1.amd64.gpkg.tar 147558400 BLAKE2B
1aa15d95efadf52bdce20bea609c0e8ed899e8859d567dd9de09f1f90b2ff686ab504a2611aa3ab219b7e29fe2ef4f587eba5050cd26f092f91a9837b56616aa
SHA512
cc2c5b971a56b2af4bed2e89cb75405405b9ce6581b25777d02fed8a68b40e85d0a6529941f7aac877756615b9e614b2c7c9920e7130def88e221dd876f4f259
DIST gentoo-kernel-6.6.41-1.arm64.gpkg.tar 119552000 BLAKE2B
7d2599490de2ab79bf36aa02eb72b99395864b9248daef0bee2b4389e524e1a53bca3fcf8a0c27d42f9fa91b9b6dc8dea0b49dd7a299c0583dfd020ea61eb783
SHA512
fe602fa4c7a5443be43adf3f35b0402288b86ec8d6d93e8ae9c0dddce0ed6226a4a0ac5993023de47937a6d9b929e9b2887d1ad6b2cf0b2421923890113d7e91
DIST gentoo-kernel-6.6.41-1.ppc64le.gpkg.tar 64245760 BLAKE2B
1e4da6cb6d5af1c25a0880eb430eb457d7eca0e4948e1959afafc7d83264b158b7cc6627d1b4b6121a3a99754395f6ce3c72b24dbb1f98e15eba81b1b8b76ab0
SHA512
0e4010371fb78a301fb5a9dbdcb626ffd867782a2a699077b20a8eb44fe68dde69f20f6f20f7125f3d5a0194072dd7b0d578ec1f743884df543e60c6ed0145fa
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.4.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.4.ebuild
new file mode 100644
index 000000000000..5e3ffa99e33d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.4.ebuild
@@ -0,0 +1,170 @@
+# 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/-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"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+ app-alternatives/bc
+ app-alternatives/lex
+ 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 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
+ # 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}/usr/src/linux-${KPV}"/ || 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
+}
