[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/

["Michał Górny" <mgorny@gentoo.org>]

commit:     6344714e78959ffeed201150a50d1cf32e1fd1e2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 17:31:31 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 17:36:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6344714e

sys-kernel/gentoo-kernel-bin: Bump to 6.7.6

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.7.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 3909c771e5eb..115318acaf7f 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -34,6 +34,8 @@ DIST genpatches-6.6-23.base.tar.xz 1164692 BLAKE2B d42ccd9e636a413ffdbdb7dac6991
 DIST genpatches-6.6-23.extras.tar.xz 3704 BLAKE2B 899c859be865bde37c41a2a24f1132f803404908002e0f01f28629ae0a03c2e1979f5239d495720c6de3ba7ba6032a5f74ae0e23bff10fe37f6f7ba31daab01c SHA512 2ac88f95177413730b0668e0a33f8b27e04d9f7c42ee6fb2c9366efa06c95884e4b80ce3631105b73ae8b9ede0697b4859e92997e5059688698f96a0a2cbb129
 DIST genpatches-6.6-24.base.tar.xz 1263296 BLAKE2B 16caebdd68cdf1d07c5f0e0429ee0fff5b95408a41bedd55c3e44b53fc242b73998020d781d51bdb35e42b680c4fd3f4cdbc6f5e65977ad099691ac2b25d5fc0 SHA512 f6cf1e79a6d9c4e050602a1bb5a41266129fa3b93250b158fce55a7df5eceb6134950816c055134310fa25f0d878afea11c9bce8950050f8723b1178896adcd5
 DIST genpatches-6.6-24.extras.tar.xz 3704 BLAKE2B 2908fc01a54469d0b99c12b76e11a67af3251391e5f6cb7125a63d54abb681acd11f54ea26702e964a5785fa1a2557111ab9bea13c4e9a32cf4549c246b34edb SHA512 f72cf8aadaad8cff309a6030e98e29534e86c75665895d53772d3fa783df2939d74e449e1e0adb136349f7e281cc158153380d862cbbf6a3ac4916ef4b8da6e0
+DIST genpatches-6.7-10.base.tar.xz 599552 BLAKE2B 952e3510f0e76381b0028179599e7bc05e6ad6a36a283abd4664cdc24d81d0ab287d6e1c077f489964608a86f3e7d8f4e2b9246bf01538b9d84cb80704f7474b SHA512 ec30398a92414b83d719b9f805edef1a8796e8b988a7384f75454f930a5a31ba05f1ea6ad1f48b2fb6e6d183450cc5ca10cf5c9f5c6bb3c47de27eda668fb76b
+DIST genpatches-6.7-10.extras.tar.xz 3704 BLAKE2B a5264482e3081f585475897242e27707a0cb5cc838a17b25bf50632625d0bfe983c889603df6aac1ae2f96466d13ded9783d7d8c118c5cb8d6beea132d436d87 SHA512 5656a2daa02ef9148ca22faf9c4e64dd3c79cc4eea9a99c697b5e8de29550e0743782b60c00f2030fe8a7370931d86cd6bfd37339eb272e6dfc70d52ed125951
 DIST genpatches-6.7-3.base.tar.xz 19844 BLAKE2B 69f53a7bf61154f3644919b870ed4434ccd7ceeeb8c57e14c274c7be28a1f6c5b0af7975f4c0ef131ff5b53f3afa0a1a4b7c7db92202e11e3c1647524e8e9444 SHA512 5022aeb1970e8652b5f82d09642c22970bcae0e01deefbc0271cab9c054bd21ae4c3835f4fff0a22d14f5fa7495211a95c50b35535586dcdca3c2b1f45ce05a1
 DIST genpatches-6.7-3.extras.tar.xz 3700 BLAKE2B ce7bc87494eec57d39330b1de3462b99a088781bca0beefad667674bbd9eaa2f2413c712638d16ef8c335b6a0e353aec83f4eb69e3da53a88d51ca6853d3254c SHA512 43558eb7a699d5e24c8f2bea13689adaacc6c7c58b4975c3d204a4c2278620032add6ca6017c3fc6ae70ade7e3e227a655deb989b85ef05acb05804d33475ec6
 DIST genpatches-6.7-4.base.tar.xz 193776 BLAKE2B d0b6ee8e055d0c3b8122e1050818b49600a94c8b1b06ee4b6209d89207d527fc6c65352c728e359ad2830830ff25079a2d6d6ef6a55ecf60e43887c16673376f SHA512 5cc15425a7e9e80320f0b18b891d2efa2dfab4090441003b3c617d820c7e449a792aa266941bde0d22ba26e9a6999e42c3b686b270bc00389047678dd71b93d0
@@ -142,6 +144,10 @@ DIST gentoo-kernel-6.7.5-1.amd64.gpkg.tar 148234240 BLAKE2B 1501a044d3bed23c6b9e
 DIST gentoo-kernel-6.7.5-1.arm64.gpkg.tar 120791040 BLAKE2B 0d5936029886ba799f2f628b15a9fb0e29a132037fee6e4ae61c3eb9ab13608892279009cd6c65ea671bcda2efa922d29a2b4d1b1c689584e960503d47f388e9 SHA512 cc07a66a06388bcf5e777d121fee416c2e6ef85b0bca11d3554a4d74bba00898e08f7c0948696da42f46542d0e4092a8bdcc117404f3d7ab01ccf8bf52c0b671
 DIST gentoo-kernel-6.7.5-1.ppc64le.gpkg.tar 65525760 BLAKE2B d33a320750728def46329b189c45ee15836b012616090414946dc6a1e8d676cefa33d094bdbc2c881502b95af9f1d9e0128e530962b855fa89730079272b8e96 SHA512 0320e5a2394d590cb519eb8ea97c2cd89d7eda9a35a1b9b33ee472705d44d60498a4483d20cf5048254e3adccfe77a3934e20e960d49cdc47079f6d7d5359f35
 DIST gentoo-kernel-6.7.5-1.x86.gpkg.tar 69488640 BLAKE2B 1e2c0459268ccc88a80dc1941ce4497231ccf4749be7bb2b7e419d51f14d1784aff2d9b615977d6d485911570291a04e200df74028193e0a8d47af56c92aa996 SHA512 ddf9bc62c9a2f7dded4784418c899c8fa951e18d64724b6b4901e3df807781bf2c78750dc2b888f7cd0de1422c7fb115809b23df445f2b74aaee4087afa5b72a
+DIST gentoo-kernel-6.7.6-1.amd64.gpkg.tar 148715520 BLAKE2B 417118424ba3a26ffca12e600addcdc9f4fcdda549df3bbdfbeb29e7c799879826e15dcdf35b655b4fb34bb8db77d6d9a97b6fcee928c04d87e9a40f13d34960 SHA512 2f9cacf4e79e1f35b41bfedbd2f8bb8d60da8b8b8f70729a11f93d9474df8f5fb00b0ac606a1d20926b833c93f0db5505c7ca7ff32270dd44e1b828eb5bc274c
+DIST gentoo-kernel-6.7.6-1.arm64.gpkg.tar 121221120 BLAKE2B 49ece3ae3f501be890088d19471406b5d4da6927d2b3ff23a863ee7fe12868266eccc2fcea0c5b0fd8526a897a0f3fdc0f685c637a140e2febfd0f6a01ee1b2e SHA512 1cba365313b71728a0eaef08d24e574fad07b66f3c86795a330d9ef3f3f605695af4ec1762f2a19a5333ad2a52f3513eafa166d5cda18a495d93737d9e0ffa92
+DIST gentoo-kernel-6.7.6-1.ppc64le.gpkg.tar 65505280 BLAKE2B f1c89d33d16dec539799d7b23f000c327ecc5c06f936d538c9306623717f392904f8e610c396d89be7778278a7ec241cffa1d6b7fe5e8523a9d2031f89a1f7f7 SHA512 738285fd5e50ca0fdddb76eeb77add06a9c28c4b68a9fb37e30b8ab36d4c6fd00457eb1762cb06f881d055d40820db17d6c2f2fdb41abe8b565f347e501f9e7f
+DIST gentoo-kernel-6.7.6-1.x86.gpkg.tar 69498880 BLAKE2B 7d725599b7ece9dce44a61856305bd3cbc9b9e6ccfe80c1c52c2c601636c08eb6cb7c4f51db4e647b49d1374d2b5b0a1a50b77f7d546adcf1ebc69c8e8a359f9 SHA512 0f0c8d91bb69eab3a58a26b4d4d0ebebcbebddce0682430885ae6156c63d2705c9f495f2b7b192e065108967afee160f097b0c21e1b6d66a7a7d321581d6e222
 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.7.6.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.6.ebuild
new file mode 100644
index 000000000000..b73e3912b990
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.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##*.} + 4 ))
+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}.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
+}