commit: dff90d2dadf2e6202a3de7ea6257e7cb008b9515
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 13:46:03 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 26 13:54:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff90d2d
sys-kernel/gentoo-kernel-bin: Bump to 6.9.2
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 7 +
.../gentoo-kernel-bin-6.9.2.ebuild | 161 +++++++++++++++++++++
2 files changed, 168 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 58f104f1dddf..5b2b5e786476 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -28,6 +28,8 @@ DIST genpatches-6.8-13.base.tar.xz 781972 BLAKE2B
7e8d26cca0d5fff4e1dbbd7088cb88
DIST genpatches-6.8-13.extras.tar.xz 4048 BLAKE2B
095bac7134081b953aa4c7d5b40305ac572bee80eda680466a84c45bc4775a344dd40806aa6c0600dea61c9b7f9775e7b7481a364cc84aac3b8169bd8830ab63
SHA512
9f9a02ba1b8e1f13946d63d93f1e61959fc8377aaffc4a60e5b46e9f632df98ccbcb998f37e86c0f640ab478f6d0e7e0e92b1a0d04d076e1a0591841d90252b5
DIST genpatches-6.8-14.base.tar.xz 791700 BLAKE2B
b265239da8f8bf3c61e2f007d06a55205e2bb89f48b2c6fc2cce839205a65ef0ae412dab4908d1ac55de15257961035772642e2401f3a575f354539bafba6b6d
SHA512
de7f53507e6bc9a2f752109514bcd916be51a4f7a48f92a8493d6316fcb3cd7379ac014e5dc50b716f67e157f5d27d042b24084e060653c7770e5af0a411fe05
DIST genpatches-6.8-14.extras.tar.xz 4052 BLAKE2B
0e5895a033a4eaddbac8a22adc57e26d6a21a4364d0cdbc6c170b0c93d463e8a0ffa0c56dd011f169933b29b3b10cdc815301804005b005e1cc0981d677757b4
SHA512
43a3b2777f73f451a5cb27a77f94a34d8f60e41847997b151426319a7b2a05f925d0de6f61f26676c68c1d674b1cbd1f41f32dd5e09c8d9b220a929f9a5491ea
+DIST genpatches-6.9-3.base.tar.xz 22900 BLAKE2B
6cc860e07ef37d83920accee580c0dc69592c2779e729739ed5457d411e5b9bd3ea6b73e57cbc4536f40172439365729ac1d0f921b19e7836c684cfa1fb556d5
SHA512
bd7391b1d987ab5ec9eeee698c04cee6587e6050954d0f54dd7ed382c79565a8929fe7ae9dcd32d4757ea96d4da78780b867455802d84c33dd185ff4bac0f328
+DIST genpatches-6.9-3.extras.tar.xz 4052 BLAKE2B
5c97314b601fac604449ffd391d3c1389bec1a5c5bebc3a7fc3678c44de8bee31431f01567ea7b239ac62c22c149d4e563f6f52336f0eced4a105b99a1a3b93d
SHA512
84ef3f91d3c9823b7371022b276d3b5c7bb86fc7be00aaffeddca171438c21f70291e67c992fa75f7222fa964f049be2816bcf7e081e35fbbb31d68da8c5bd08
DIST gentoo-kernel-5.10.216-1.amd64.gpkg.tar 63252480 BLAKE2B
787a17da61971c776a2ad55f2d95487073e31a0fa7765b564ff834ea6f6d406b685775b542d3eb25479c10c4348cace5a8c563b2c76c6b39054f0c6e6631a0bb
SHA512
46fff78b78b7ca0989e95fb26bfaf9beeb353b943a10c8f6dc837f47133b0109f69d8810da6de6f006176401dcc04fad4a38d1a4b07b56fffa6672c96f26e714
DIST gentoo-kernel-5.10.216-1.arm64.gpkg.tar 56719360 BLAKE2B
61a5d2a3eb4dc5434646cea9103f34c8b228c6eb337fd031e669836996e3f28dd718106138af1bfc6f8c9e193e6976a0380e20146ba9f131c876255a9e513ea8
SHA512
848b340e05a9be6cca74c5f1e0f876c74836929f84a1bee43bdac53bb65723da4fc6b56d6c02cc2179b01cd97a62199aa971e6d3169c25fdca6f8603e0639884
DIST gentoo-kernel-5.10.216-1.ppc64le.gpkg.tar 52869120 BLAKE2B
3f5eb4bb82b76321988baf7187fb550794fc246fc369d2006a2337c24c5793ad3e2f9afa1c57b5121e43283d3195e1042f2ec35dec25593c0c7a14d74ad0acd2
SHA512
dfa92819e87f23d37cd51efae717837f3a08300f9a3bc7b7f7a6860178e5b87ec8203087f6d3120565c32589fcba9a70a473e3c708fd5522f45eda8bcdd1003a
@@ -88,8 +90,13 @@ DIST gentoo-kernel-6.8.9-1.amd64.gpkg.tar 150845440 BLAKE2B
535d166d00958e4b4e49
DIST gentoo-kernel-6.8.9-1.arm64.gpkg.tar 122408960 BLAKE2B
f74cc8f857e07dc82d1c6150074557ac33e668c4b49178612dbfe07e5291038f0ea4ab21dff4f3c556db5beb003cf6d39775685833106b9c51c1aa27178d47ac
SHA512
7c87576ea64840555c1f38042c87359219f6b35f35a557ba155b9c930ab72c7316b58d7c712565ee6296c80591bc0f45116f56ac286c756bf25433003e25e07d
DIST gentoo-kernel-6.8.9-1.ppc64le.gpkg.tar 66263040 BLAKE2B
b9e3e8bfe611dcdc66e46623e2adf09d7d10bf4624be28e1d7df312ef6a2fdce40af669c4a5a63698871bea0c70361ce580557607f1103b873398ff865ee5d30
SHA512
bcb129a0941a2b5ac4847a97c688f6144dba0db1ae43542b7cad9ccef7825d9a8dcdb6218c43f549269a2682c59fc7cec86134067cafe0cb0fff3dc31566129a
DIST gentoo-kernel-6.8.9-1.x86.gpkg.tar 69980160 BLAKE2B
37f657c5488ace494dc16355d7dbeb0cfd4a88dd5a4a44f51f392c2414ec4ad95fdba2b6c25b3f6bec4c35946ffe6e5f950c71745ae0ad6f4599301471c6a0a9
SHA512
cf53baeb3b80b4030d336001eed7a6973c1451a7ba02d020e30716a11b1c702a8ad4fcfec69ddafc441d3d9232fbb61ed1d08811208c828ecf0a68bc4f8231f4
+DIST gentoo-kernel-6.9.2-1.amd64.gpkg.tar 159293440 BLAKE2B
f6186468aacbdce2aaa1f1ecdcd6ee0237ece039d76970f653cdef7921c4440a04f7a9c5b6dcc3fb6d037aa49ffb9bb38a7c68842a41c044fd5b3f80c44c63c4
SHA512
0770f46176d8c46dfa5c95a21ecdac9b88bd0855a14a636864021edc176924e9e8deafbca6fdb6cdc641c443d6309741ceb550bde584fb36bd298344bfae1554
+DIST gentoo-kernel-6.9.2-1.arm64.gpkg.tar 129955840 BLAKE2B
3770c5e6483b93362cc7963808b6b62d6f48c77ec61ccaa87206124752fcd83164514f6f17f742196b1a117d06f62196dd3566cf01b9dd4a9d3c654454ac8e70
SHA512
10928704181a880bd20c077d84574a906eb4c0978ae50df181e1b25eab3e17f9d62d63566daaf871e31a3278bb7f9f16163aa34f4fde8d3c26805edcc77c172c
+DIST gentoo-kernel-6.9.2-1.ppc64le.gpkg.tar 70912000 BLAKE2B
899d416da03d99471549a3b1aacfd59f442d55a741dee47acf413e2a406c223ecfe81c35d6625ef5dc782e2d596346cc378ef32414bd513e7ce4e7746091ac7c
SHA512
1f257ef44d63ea6479626b3604d725617d967100b9cd1fd7656c5630a3f31bd4cfd849d8babc31105ca2f26b4b465f0ba9563bd5992cca2f7dbf941bf1dd904f
+DIST gentoo-kernel-6.9.2-1.x86.gpkg.tar 74987520 BLAKE2B
3c5a86b599e8cf9aac4ab285be221b37cbedcd5ba0677a7fd75b155368cc2e648fdfcab431e527322266c35061e434e69c7ad11311666f20842bd79ac863ad58
SHA512
cd3cc62ce96af825111ab88d1ebd3ad4f2cc400f94ca1643f0ca2f613e791e15f500c6edd50daeef800e3da66b0add2497e51ec9da4f93563e971e7654286d6e
DIST linux-5.10.tar.xz 116606704 BLAKE2B
b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1
SHA512
95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
DIST linux-5.15.tar.xz 121913744 BLAKE2B
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
SHA512
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
DIST linux-6.1.tar.xz 134728520 BLAKE2B
ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e
SHA512
6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
DIST linux-6.6.tar.xz 140064536 BLAKE2B
5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2
SHA512
458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
DIST linux-6.8.tar.xz 142502100 BLAKE2B
c6f17f816cea16e629f63e9379b98888713f57b2c5173306926471f139a9d612a0c74e119341f8075390e55e203d787d9edeb4ad5a064b18870f6f0f7ffaafb2
SHA512
5c4eb4aa1d3f7d1ea01c0f7ddeadacdece6e144fd4bdfc16b2b925d3e10dc04de3a6db69320b79a96c3560052616f001d2c09e7a1bb4f7b731e2380a7ecce068
+DIST linux-6.9.tar.xz 144034416 BLAKE2B
4cf86c3cfe6e6534745d42dfaeca59b17ea1168c4e8b615c80e6d8aac735f11283cd85fa992b440b5d4452917e94b9f08397a64af0be5894e3df23c68892377e
SHA512
fed3b4cd1fbfb4d94618587c1934273d2ecc8b6e42a3d586ff8a5f24980be930f2ef803aa2923ca3bfa5e4e619f967f3af315368f24fa76f610b10443624a579
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.2.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.2.ebuild
new file mode 100644
index 000000000000..5af44cece78d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.2.ebuild
@@ -0,0 +1,161 @@
+# 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"
+
+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 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)"
+ 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)"
+
+ # 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
+
+ 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
+}
