commit: 8ad8e77beedc78c038de75f9b5e77a223afa88d3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 16:58:01 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 16:59:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ad8e77b
sys-kernel/gentoo-kernel-bin: Bump to 6.9.6
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.9.6.ebuild | 161 +++++++++++++++++++++
2 files changed, 167 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index e0f04b5ac4c5..0b375736ba9a 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -28,6 +28,8 @@ DIST genpatches-6.9-5.base.tar.xz 275240 BLAKE2B
cb961b8245eaa58405bf758f4432f1a
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 genpatches-6.9-7.base.tar.xz 406988 BLAKE2B
066ce941f4338903a9f54071b34215dd16401d7e00e471615ea4b55cc5da7c8b312bb4c5224398c5348a76fdd4f1c6c5fe97213b913cc397ca92ecd1c33a8d86
SHA512
0175ff3df86d76b926efae0b15aa4addf2192d8b38f80a23e930c669a6a2453847d358383f2d61ccbc0c0b2e6e155a62bccbb4408b96c1ad3fb56eeaffbb1365
+DIST genpatches-6.9-7.extras.tar.xz 4048 BLAKE2B
06ddd8d1443bbc4833040250b872d1949489fe14b0b4567c6c484d6bd6972a465ce0563c37a5272de1cd4ae66bd7711b1bf413b0a04b52bc00b9e549154b97fa
SHA512
b74f2aa4050b06d7e5b588c87638470f92c45d26b3ffe7a16db43b487fc6460ec4e7037b81120a87608e773a63cbed678d4368b7d0399b841711fb63b1744f99
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
@@ -88,6 +90,10 @@ DIST gentoo-kernel-6.9.5-1.amd64.gpkg.tar 159016960 BLAKE2B
f5504ff6a13b926de977
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 gentoo-kernel-6.9.6-1.amd64.gpkg.tar 158976000 BLAKE2B
b6986cb27a5784c19989b73468b07779aaa88aa815b5c7dae8d703ac79516e6ca18721fdb887c2cce04bcc642be2c38a158ce1d419406adb3ff524617acfb1a5
SHA512
4a532d5727a2c4397e3b3ff125f403e1183ed8c66d472dfae33e3dcc6d82a45aa819117b13f5ea2bf334bb5f23bc8eeddda59f96d348c35f1f3203b75f5bd201
+DIST gentoo-kernel-6.9.6-1.arm64.gpkg.tar 129751040 BLAKE2B
37f565d5d17b16013931ac88a913d379c9c946e615267b51ba9ae2f321c493f526a8666773d4853730c31aaf475ec6dcdf67fcee35b93cebf2f861f75643a550
SHA512
62b4d011409028748a33e6172a8fe612f308bff4474dfe3ce907de4d8b2afbb41e29a63dcca97ea2ac45b5064b8d45b9ed0d1c63c63a2fc0f7d40dce222d0a69
+DIST gentoo-kernel-6.9.6-1.ppc64le.gpkg.tar 70737920 BLAKE2B
eeb7f7d134dae7627181ccfca39579c2faeb0ae1c681589ad422293c9c134310337227e55af03926e6bd63993b699cebf9653e70b5c531bb8f2ffee511079b81
SHA512
f785ab94d666d7b2ca14502f1d18ae1d7ab7905dba7fc14fb8f0c54dd55ebdd8138583674406a82a21e09a2e7b0e24f4148e05d017226c5fba20c6ea964a3fc1
+DIST gentoo-kernel-6.9.6-1.x86.gpkg.tar 74905600 BLAKE2B
ae14dd62039dda8326e4e2aebad7723a82280e8c5f0ccf97af764c854750b4f79c61b63fd6e61a872db4415e4c5c8a3dfa6a6a254ed7ccc90d1bd036313641ea
SHA512
55547ae6265d47514face363a4c7f3ca866b14f4022534b9dab1ba31144c2de6a15efc146837a7c1b43c4bacc72dc17ae13ad87e0f53a53809694369995abff6
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.6.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.6.ebuild
new file mode 100644
index 000000000000..5af44cece78d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.6.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
+}
