commit: 195487e2fa405f3e128879abdc350be8ee6bea94
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 19:44:53 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 19:55:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=195487e2
sys-kernel/gentoo-kernel-bin: Bump to 6.10.11
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.10.11.ebuild | 172 +++++++++++++++++++++
2 files changed, 178 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index cf59a9f606b8..4532f4d24241 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -28,6 +28,8 @@ DIST genpatches-6.10-12.base.tar.xz 602316 BLAKE2B
6cd02be7fbe2322d246e826d04236
DIST genpatches-6.10-12.extras.tar.xz 4060 BLAKE2B
77b8b8cc0ed8af03ca45e1224e6de1f14d59682aeb411488e4c5eb6f9f4252a50ae442d60eeba496491c62013c7f1cb7af9f7e40622e1f48de7f0b85c4686c28
SHA512
95cf8c15fab7ea99e7c55166d445494d85cf843d9bc32e3055789ac20d725b52687d1077890c22aa39719a9d0fc7745b0d3346d014077171b1009a3a353f04f0
DIST genpatches-6.10-13.base.tar.xz 727116 BLAKE2B
5125f8971fee0c7f78d28a555932e20ce80a260f09f3228b53e6a9e3923a809d7e812df8b32eb9ed74da3bb4b2762dcaf63d921f78ea5ea39c8f7a5796a25a31
SHA512
e0f124f613c18e9c3623887b90dee5dd30d2acee7271599e226cf9dc5a184f9ef06ddb536bd4fb20017c993fe203d9c9696a7e441caf5de2831552754b04192b
DIST genpatches-6.10-13.extras.tar.xz 4056 BLAKE2B
f44d2635322562c13ede3ee395900b963e4a151786a6417fdedfbdce20708f277f7b732d5302606b6e9acc09c9bc7a4be4c1fcacf32a670a50bd9ddd5e8910f2
SHA512
16cb15c66948c48ab27c989226c1394ecc5041e1ed0323246e0f611fee4907029b23346ddfdc1b11d6a0824f2609f448dcc623dedf05dc94a2a3c4385f181c14
+DIST genpatches-6.10-14.base.tar.xz 759584 BLAKE2B
d08dc14d5126e73155a6b1977ce2b9790a5717b6bf1fa31309838c3884a81baf945661093da2e3f69bf892f472db60defe1a001afa4b9a6846deee11cdf6cec2
SHA512
6e41093c8ee9690ec279a3f35c01d058ef02c3a9eac7b9eaa3908c14463c8d3c85497665b875111fd1a29e8d406706aa6f6791a44e0bc31d8c51053259a18d87
+DIST genpatches-6.10-14.extras.tar.xz 4056 BLAKE2B
63d33a29efc77a7839f4961de62c54f2383bcc7a119fce5ca7f80cdb66515537bb1e1bd55bb50f297b8f0a9c74f75bb237ee2893a859abe6d7f05864ae21e38b
SHA512
c9adea40fdfd3faa5ee24a60be9ad4444819a8fbcb417ea98ce2f7a02fdd1e70c6f1168380cf6efd5a4d1820bea14db48c3064b271afaad8e1d23f0a8263a48f
DIST genpatches-6.10-9.base.tar.xz 401220 BLAKE2B
3335d5d29c347526cea6104b9cca56b8ed8ee0f1de9ee8a6f55d66514df829fcd197b8281b2261f6dfb979276b65bc654d4b1257868b5b80a2411fbd2f076f11
SHA512
9d2319c2b86b80355464d661f675a331a4245405bb84184a4d061649abdeb5955b6ebeaee1cefbe3c669f810c9da645b7fb637af4dcb45cb9b69e715c6e46f1f
DIST genpatches-6.10-9.extras.tar.xz 4056 BLAKE2B
2cba382236beae6374462f6147d6e164314cc8f7d7be87547902153c035b970ada27f4817a6de2d569116118eea0d95d42aa44de2147475c47c732abfedd9952
SHA512
358d82794809d49f4b24bdf10c49cc4fbe8ac0a45f86dfdc018d2c778b757c002d9bd129d935146b84daf809e95f5235fccf7466d2498755154b9c77e5a2b46d
DIST genpatches-6.6-54.base.tar.xz 2922380 BLAKE2B
f65404127bb6547208aeddac1996a4a2659bd99ff7429bcaff28247a867c000e962457725eab80db2c76297f1e5c27806dc6fb23e31d5694b6df783e65995227
SHA512
102f721f87478ad18599bb5ff65cd236180dd3d9d058786a5306cb36be3f30a2d2ef684e83b6f458d4de78a196323e87d346eba704bfbce733010aed6ac3d7f9
@@ -88,6 +90,10 @@ DIST gentoo-kernel-6.10.10-1.amd64.gpkg.tar 288399360
BLAKE2B 48d2fb4a75abac9c9c
DIST gentoo-kernel-6.10.10-1.arm64.gpkg.tar 264816640 BLAKE2B
5d70f8c2acacf7fee5637a9b0349784788cc72be4c6288dd3a8424a22c1bc9f6ecdf99e32a0b11eaf28637cdb7c174edfa1a35c947b05fd317b4d764b4a2e20c
SHA512
98a1f64b138bca6ffc028a446f04ca045f06956b4243d9f2938cef27acf3c2dea02ca93430161334310527d0a91a1bfcb85954df2c731a77d506b66ad3fbde80
DIST gentoo-kernel-6.10.10-1.ppc64le.gpkg.tar 72028160 BLAKE2B
e142e685d54736c376cea213b7585198167a1a78a9a3c53b1637eba2745bcc89b4ead6d634ef105edbc66aaa7a553710d36708a3b27739137e3b85ca717d6f2f
SHA512
5f5e8a3ef6b88660a2fdd3f5358bb1704008b5d565e8cd61a8cff9bccef4995f7a272c12755ab0fb90cb52d894d24ebfc60ac599ce97deabbe74fdcb305ec91d
DIST gentoo-kernel-6.10.10-1.x86.gpkg.tar 75560960 BLAKE2B
7e7e4c8de2ede34764a2db6338102faf9e8145733652896bad7354f453166093faeb429252515feaf654001db0f3a8f15a8d061bb1c5957725e3e83efe3c39ca
SHA512
8c618e8b1d02ba56573c1526fb2f70a7f5da3eda2023e9d47a1403e1fe5de4ef1787d2195ec82b61aad13b4410731775c30b266bfb0ff3334ee36f03c42bf5de
+DIST gentoo-kernel-6.10.11-1.amd64.gpkg.tar 288471040 BLAKE2B
7015cbaf2b47d62f516f3ca190fa805e5073de7d8a8256a4d14169ba64f4faf7804157a96563d47029a7a05d191e128acc5413e1b5cef277bad9d48ac57ef1e2
SHA512
b18b1ac7d905a24517f15adfb5a9f40ef4b3dc27c3114d67373aea70f1ae7e35a9ab19ed9238f99ecc271a919b971bc4cbe325c0d478a976e7659018504de6fe
+DIST gentoo-kernel-6.10.11-1.arm64.gpkg.tar 264816640 BLAKE2B
412355b2787647c1960f643c90d06f739fb9c7d2dc655f77f1c8c90d2f83b1a86a01a034dfae05323014f8bc72ce897fbafe42470213f565f26b4c757ebacbb5
SHA512
63fa9896ebd67aea2596186151e577d1071688001798bb889d61ebe91ec8db0f52d1aac7ba3b7c44d59d302a2331a696c0875f6fb9daa4eba4182d2790450812
+DIST gentoo-kernel-6.10.11-1.ppc64le.gpkg.tar 72017920 BLAKE2B
e735783122186d2036ad6c5ab8bb4e3cf3d16093ae793d5b7295ecc5b250f9b07430ef5fc42e67f4da69023c11b3c9f6874254dcf922ca006358ff2458c3e383
SHA512
19c8e6e1c23eb767a18fa392dfa5a5a9cd67636221037fd4becb07f375afd851607886dc7a4c8231406c7be99961e4bd4c2a8fc1477fdf484c4c43c12842eab9
+DIST gentoo-kernel-6.10.11-1.x86.gpkg.tar 75560960 BLAKE2B
f205aed0cbcfc3e4300a17e6675d0bd7e97c959030bceccfb533d72918b4baaf22b42e3ea55363282bd657b87a79de6c5689b5f666febc0cc8f33e33f6c718a9
SHA512
f02e4ea6ac8350e73d238864564c86583eb2d3d5e91cfe564443985151cd9d26110cf0e00aa6e584e35d68991aaf53e6cfe412f52b8978968465a8ab2b51a342
DIST gentoo-kernel-6.10.6-1.amd64.gpkg.tar 162723840 BLAKE2B
b06364ac6a1cfd4cda5d03202c2c83c3ab35fdb886c0c75a25900f113c6c5d68e8d6a5a3c78412301289555ecb416037260e6df9ea79f97c9c73a96f2e478284
SHA512
f3cb900ec088c4b856567bc5e4fd6d977672310f0e6e61cb4301650b14e080778859783f8446e029c50acd4a8a29575aa3f3f3948a008418968a8d016c9478c0
DIST gentoo-kernel-6.10.6-1.arm64.gpkg.tar 131993600 BLAKE2B
bf37c8d5a9ca3dda972cc7a08feaf12b22a880216767892b9f95550e9b31f7e824b74658bcebf10343ef441c6e1d2e4a28145d927f19ec644ea4246cd1136d55
SHA512
3a72d06ed8fc7edf1ef6ed702940cceeedc16eb9ece430cc0c0faf34cce36a0a9ee18f90471cefd0a6a6e87e286855c98f94799683c22be3cc14b3a1e8350032
DIST gentoo-kernel-6.10.6-1.ppc64le.gpkg.tar 71976960 BLAKE2B
78f76bb3fc5c6455d99a9f55a82b2b9cc8a07529635e3302e9a7f02aa0e869f669605d93e63b151ca5eb5014915a7d5be64a6c0caf0c10a322dee66b0456617f
SHA512
b20fb195cce8db548671b4622319d50d751955a80e89f0814253879112fa8943a92df195eeb2e6b65f14fe134caa5e514ac18f5457eb41bdde2f98b2fad2c25c
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.11.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.11.ebuild
new file mode 100644
index 000000000000..d5c4f186a89c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.11.ebuild
@@ -0,0 +1,172 @@
+# 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 ))
+# XXX: Change me back to PF afer 6.10.8-r1
+BINPKG=${P/-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
+ 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 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
+}
