commit: 2f67758261d06ce845117c7c9dc836c15c4e9fc0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 16 17:32:07 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 16 17:34:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f677582
sys-kernel/gentoo-kernel-bin: Bump to 6.9.5
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.9.5.ebuild | 161 +++++++++++++++++++++
2 files changed, 167 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 1bdab69866da..88474ebf4541 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-6.6-41.base.tar.xz 2399184 BLAKE2B
5765835d442a0afe00be3070b1780
DIST genpatches-6.6-41.extras.tar.xz 4052 BLAKE2B
a3ed97dd21f02f8b5a8b2e315b9581780310177da774123c7cfdb30c13485e1ec8379b57e10749e3abbd1860f7e52a5111ac5f63250d015e9aec5e64386d4571
SHA512
39932e2c61d1687ceb64698186551ac5e8c184f58e24692f6b22cde65644da5375c58f26dd7cb0e1bf5f21a737b6fcc6ffbd86372e5c055c8dd2ae001efcaf6c
DIST genpatches-6.9-5.base.tar.xz 275240 BLAKE2B
cb961b8245eaa58405bf758f4432f1ad98b767d7f9ea8e45fb440bd2616e67c6e12cff6ec3af89748f19043c9b0b58b634e28e7bcdc469fcc4daf2f752b3a438
SHA512
60fb3290eabe8289fc4acb4f1df809ace44d7678188683b64ef2ec92edb8c2ac0d757280ebb63087145fd068e64619a3b0a9227fd5f3061099d287e8e8dd5720
DIST genpatches-6.9-5.extras.tar.xz 4052 BLAKE2B
e72e5a5195db42f38ed671899217d7609eb8a5d9f954ebbc36a53a88fcadd1cadecf7257b33a880661e949f2c7b176a5762ecc1e56be0195e6768d8be8ae5fc4
SHA512
3d9315afb5c45cf24f6e5287048d49f6969e49ba2c8f339d9f4da0f5a08708ffa65636c3d24efdcfd246f6d28c72535089078971e97f7aefeb75119a67cee11d
+DIST genpatches-6.9-6.base.tar.xz 319896 BLAKE2B
8b58a70db0844a8455fb413de046cf0998c19c2ace54918a3408f9d31eae6bf276d6a86f5db835cc3ac87335d908c2ba853fd2f334e80cd06e7e72847483d3de
SHA512
fa3f1efa0886a6df0ce8006a4433a8bf91731069aed6040e1e4ac9002dbb879ed644f2ba1b258a92ae8550709b85a3c1d2657df000cc6dfe4f79d32c991efcb6
+DIST genpatches-6.9-6.extras.tar.xz 4052 BLAKE2B
cf761f7035971e6f2be6ac719048fba08f203b2f400bd7fbb62e4e10bb7d5c508dc7e79f85812ccd1ee1cbc791c4f19a6becab2dbdfd4ad2c3ec2b1ce0f2bb47
SHA512
fbdd60a92f8dbafb30dfdd65b3e0c03cf274dbb148c092f40dfc2bdd4e5d7d18f68c9064bf0419e7dff5c94c67fba3922bb474ec717dda8094b37ab489cfc8bc
DIST gentoo-kernel-5.10.218-1.amd64.gpkg.tar 63262720 BLAKE2B
0c5bdf6c3a6f1841751ea3efdbd51e16862aa73d3fad5015cbdb6993ad47daa89f770597b09f28e2250f5f22aecda041abac37a99d06b797fb27997a33f64c96
SHA512
fcc67d5a76267351c550e56cc61bf59a9a3557d148c6cec6919953ba7b18f45d36d1a3a8532d4da1cdaa608f29024f9fba32d27bde16665658f2ba0d13656bb3
DIST gentoo-kernel-5.10.218-1.arm64.gpkg.tar 56719360 BLAKE2B
c114300a4f17b91277ce90026c2141acc0729547a3511ea0df5071532b13a6c06c87853917280debdb7753927442c2414baeb363fa83dd74077a5708ceee1da8
SHA512
5468341ac80b5d0638ad38cc82a1dccfeedfbf1727c6bf852e8aa8a9b51750022358c4e32a483473293288ca9728ed9c0839a78e989571844dc823394cdad19d
DIST gentoo-kernel-5.10.218-1.ppc64le.gpkg.tar 52869120 BLAKE2B
27cb1b7f85bee962218b8a6635fa6639cf2c1e04c3809042abaefa1b766dabc7bef06c5e83022d0d1958cce9dfc97bcc615623e98c3c2200aa1ed9bc8d112250
SHA512
f36d649ba33eb2745463325991a5ed0e665f6ab12dc8e13572cb8dbfe5fe2c24e00bdc7246d78891cfb43129d51ea6ccf39f42c270765dbd8050f3cdc8254cec
@@ -64,6 +66,10 @@ DIST gentoo-kernel-6.9.4-1.amd64.gpkg.tar 159006720 BLAKE2B
9e2189d7ea4546bf9d3a
DIST gentoo-kernel-6.9.4-1.arm64.gpkg.tar 129740800 BLAKE2B
aaffce5d2f922f53de6b4ebebd23ce2edf40731e79a325bf07502f0b61f440edf85d6551ac70f6d96f539ff3636091e7aeb478e74b7e45fc0adb5b8add5f31e9
SHA512
61ebb357a3a4d4cb80f90bdcb5e8ab02c810b1a39ca4aa95a2bb3be56e85435625c427f3ddf93313623e42ad81aac7a206c14eec60865ed7d661d1451779dfd8
DIST gentoo-kernel-6.9.4-1.ppc64le.gpkg.tar 70737920 BLAKE2B
02097895e96decedf998bffaf2c442623e27c9a530c7f57dc6a6bbe7bc566142215d90a71055ea383e63d146d77cb4c3b0b3d017156f4f8f1cba22ad46bc2f0a
SHA512
9057f864de4f15e7b1911f91e21cc71c888e95c26035ea3246e0f116d5a7817266ecea2e08cf1f9eb09bf41481be570034638ee1775f09e39901c599bd6b4d90
DIST gentoo-kernel-6.9.4-1.x86.gpkg.tar 74864640 BLAKE2B
20221f3def72875073f8082ac9e0c4c93ae047e5b027385e48d9fb75ff32ffcb9b7aa254dde566346c98570aa78575aacbc7b015db19120258a169d47b1ff3cc
SHA512
4d9dff99e8354e95c0e2ff687d7eb4a78f0715ea6aedc582add5715ee3a227ce9933de8a20fc8c155f5d005219f970c8874694c4df20c754a731d71beed600fa
+DIST gentoo-kernel-6.9.5-1.amd64.gpkg.tar 159016960 BLAKE2B
f5504ff6a13b926de9772fb9c4da28596c38d718a00b10ecc7b55efdec6d34d20b8c49dadf8d710ff716cffdb8ef8a9e8e490c623e56eb5e9dac71eadc01901d
SHA512
ab3e96ba66df22b96f29aa3aef9675f462d7e23bd130b5aae90db08a6194f714966b5bdb469c8ec12f5fa9af36a0633dd37c29d475c366dd3925b66e3f4ad5e0
+DIST gentoo-kernel-6.9.5-1.arm64.gpkg.tar 129730560 BLAKE2B
7cc24e1b1bfa2c765a28031187ee5c442a922f8ec270051920dd10913eda207238f6c54308adb036d0ca7e6a902679f426180a8855159df1f4b5ddee999b4a11
SHA512
2688eee165559ef24c612ca05c4b92b1960f3aa5e6a3154d95f18bb186d3ca3b78caef3acc34628ad03ac191e65d871d8ebca24a6b7d23939003fae8676b20b7
+DIST gentoo-kernel-6.9.5-1.ppc64le.gpkg.tar 70727680 BLAKE2B
3b3c0e470d68e225d2fc79e41ac345b3905824216e0e8c384f98f21ca0adc1c5998a12bde07bc02a8f88fdef22a087b8b29ed4647e728dd80f7b970107460515
SHA512
52d5b894acf435a1b11bf8f8d2f223fdf90b06bcf9ba322be12ce77b245379090aab4650173c29eae5559e1ef9c5da63662587bd1959918f6cb4db922805cd3b
+DIST gentoo-kernel-6.9.5-1.x86.gpkg.tar 74864640 BLAKE2B
9e14b93ff6076ee5838214239eee1a61595451f223a37674ca76715c3d5df6876fdd8870291042e2e21162ac488ad4fc33f6839cd30f968c3fd7174c25c2c514
SHA512
7d1f2b90a46e57b00fa15dc0a12971a0d595b077e32fb8583b86bb28dc89ba9ffe99e532c33f3d9808b9ef6bca41935795d5b30c48654fe46948d6289bf4c23e
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
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.5.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.5.ebuild
new file mode 100644
index 000000000000..5af44cece78d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.5.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
+}
