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

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

commit:     cb04aae4f989b4a4028a1adb247e76d269b4dc1d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 15:53:24 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 16 16:28:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb04aae4

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.0.9.ebuild                 | 127 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 931e3dfd73ef..d8c2f28647a3 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -38,6 +38,8 @@ DIST genpatches-6.0-7.base.tar.xz 373860 BLAKE2B c6cce4c024ed86128424d47eea766ac
 DIST genpatches-6.0-7.extras.tar.xz 3808 BLAKE2B e332e2144f8831ac194ec1bce1e8b1bef7ffdd8a1ad76003153abfe0d3d5df2db739e8299f033a67d539b51f7d97645d447e023431fddd3ba06c595be3798748 SHA512 43a5ec73f5f552c557d2456df96e9996499408a9701f35d37e78b9363ffa8e319a3d877bc45702fe3fe24f9cc8c4c9af2d0a63e3b596c4a5c7715ffb8a9ce2fe
 DIST genpatches-6.0-8.base.tar.xz 428744 BLAKE2B b8cc7442f3930b8f5a9b11e3722b991f049aba0c635e3e7c1ae3bf4df12470a1ba974a0459ac02c5dc5286a3ac3377704b583f241fb844e6ef34552d4bf5c2ce SHA512 cb0c4a2a100ea25f84fa5ef85a2a52ac3c42bc83b0b38b526e96d034d9433382f5b3edc958f0546dc0692874ecab252d19d58264376d60cf9338bc6ec8a6d7c4
 DIST genpatches-6.0-8.extras.tar.xz 3804 BLAKE2B 338f4ef5b88afc9a950ac47261b06010317c59c104819c9aaee6ec845c47b31982dd86a9e4e35ff3c21997931411235d8d6322190d96453c55c443d7de0cd893 SHA512 1d58df2e68935c50b25109a3e92a48d7ab703d97c536634b47ccdd958dedca458eed5c96d1c3a37f788a6576fb655e4c4446b95f3bb8ce38ef1ec008922a3e12
+DIST genpatches-6.0-9.base.tar.xz 478548 BLAKE2B 916f2b1b5d198adec6f73a0bb52029f4667132e7b7528ac5578134e3ed775d6aaac7989ec5e3827fe16db691f3321ef16b5a29088d2ad81e963f768f67cc2b61 SHA512 6b748f241e609d6191f83134f65bd9010122d5681b080c7ffeff8690f4cb1ab0f44b2681a135689d945de45f4ef25384411aea1d78a5b1c6248e547dc9e5297e
+DIST genpatches-6.0-9.extras.tar.xz 3808 BLAKE2B cf37233fbfc631e8ec9d7c663e8982a3bfb154573fa84d13cbb3d67fa73ff38ce74b27bf6dbf827b311826d18c628ef2818a75975e068ce381bc1a46c4948075 SHA512 b4f5d0daae3120662fb79e9f53b7dfd0c15f0a2b7c77a32b7440cc7425b3df87107aabb2cd913a31b7014c9fd1c3c85ab2081839af652ae9d7e43352dcdda42f
 DIST gentoo-kernel-5.10.150-1.amd64.gpkg.tar 66488320 BLAKE2B 548b1836f84cb713bfbc3a164e218f5d4cccc19287b3a7627de422fb521190401d890cac611a018f30fd6e6edff2da939cdb15e819470f76bf29b974b7b37f18 SHA512 c578eac829553e923fd0eb2fefe6cd182769e3ec74ff59d3a7c1d2b9cdd0838d32a16cc8f6be0599313d54da1a94d009e5ca9a8726c7f494a5d9820078430aea
 DIST gentoo-kernel-5.10.150-1.arm64.gpkg.tar 59648000 BLAKE2B 07d60e7576f56ddb93fdd8128a0a7392865ab6ab6d87069aca8845aea7128fa1cec81e9f7733e9620c77036641a027a6d64636b3c8561c2483f59a17e3bce888 SHA512 8c193e9b4e2ff698912c5fa09c8644561e9d555434a7b1f2d7406c9045604a17d7ae7699d264fdebd3354f30f7e0f679e0fd87cbd373fcd4b843d05da304a49b
 DIST gentoo-kernel-5.10.150-1.ppc64le.gpkg.tar 55029760 BLAKE2B 144627355aeb03f3a7886603473cee7579b7e9cf4d8bd8e53dd6e65a2713a008d789dbb4b0c8521c295d300d8e5e47c1eb20abc81f9667eb587d24b25387c8d1 SHA512 00354da7ab9103ce3664aceba5bddee24e66dc610eeed00e83460c776a4056e219ccce73d2bab7ac55d19500456fe8379025a519f7273487b9799739776d91cc
@@ -118,6 +120,10 @@ DIST gentoo-kernel-6.0.8-1.amd64.gpkg.tar 75909120 BLAKE2B 5e6ae89ffb5c392bf558a
 DIST gentoo-kernel-6.0.8-1.arm64.gpkg.tar 68833280 BLAKE2B 644062bcb88831536db90739955d3f07aab6d35992fb9d1e06084f1a76cc18ebb694a35ca21fa5130d441856d8075720c70d40dfaf2edafc38c1cdba3d0e6406 SHA512 78810d5c4e0daf8e4386d234ae1df20dd49bab7dcbada5ddf9eb60b4181c0377dddf7743d38fad63db77660dc1e98feb60ffdf701582bad2bf9eaad47a9a33f2
 DIST gentoo-kernel-6.0.8-1.ppc64le.gpkg.tar 62126080 BLAKE2B 163d4f90f5889a1e70cdd9d20952a9d51fd934c08f04634260bb05df0f4136aa29df57ecf154334e844c735600d7d5b9b76304b7eb882b1613ff0e5b28bdf0fb SHA512 c3efd02b93715890874e938453de7e781a84fa5a00e39123e10da0e646e6a100acf89f66d14dacbd439f8a92090bea3e36f90ab71a7f7a41405b803021e26305
 DIST gentoo-kernel-6.0.8-1.x86.gpkg.tar 65290240 BLAKE2B 125e4566b5bbc3393f681239c49189f3c85c414f281ea230b4fcac7a03c1ab67512d7c7cb33889caa9fb9f9b98f79a71d13c44ec99d3d9013b5c0b28472bb801 SHA512 59109ca960df809f6a241d55b9eb5533056fa32a2e5a307ebc7144666a3472a38161710613dc80a65fd468c55e181788fb9bba5e043c14d321785a937e1f32df
+DIST gentoo-kernel-6.0.9-1.amd64.gpkg.tar 75929600 BLAKE2B c8798004001baece32bf8a6e242423b04b7e4cea4876fb42baae7e2299adde61591dfa62d06ec385db8ac1b985e8353dccb797b08ef0c42ea21c054c451f27f1 SHA512 4730dff292802f82fe9b6d1c73ab0eb42d00b2d9c7d672ec347c59a0dfa1a586f773a2bf1b6eb7d4e905da1ef678269715f55ef275cd44556520f163002e8cde
+DIST gentoo-kernel-6.0.9-1.arm64.gpkg.tar 68843520 BLAKE2B 6eec02147edfe83ec7a6a62a5d02d6982649c28654f160223ae6e8479b6071174a26e256ca8504e9a8ecb0f6b26036b2972d9be71f6d23bd6c5c627bf203707b SHA512 83cc9b1022bc652cb5a8105c58f3dcda1c21216ffede67835eab9bbec58cf4c2188655337f03692fa1c1b2a4d24ffcd99c49cdef7300a9fa6f1a4f9b4d642628
+DIST gentoo-kernel-6.0.9-1.ppc64le.gpkg.tar 62146560 BLAKE2B aff5949a4e9e26f2a63599953e949c8747bef2fa7ddf05e25b8bb095dd1635d3ffb03d37608b6e84e111616d1438425da0a39f91c0621fab8bc1c0cbe5b926dc SHA512 555ca3733ad5883b04100cfa934da2b979e22f2345a3b5b88b86efbf0b9c111d52062b0a706c00b58a4f891c9a6e3e57350f2efca09b249bb71a4af8e16749f3
+DIST gentoo-kernel-6.0.9-1.x86.gpkg.tar 65300480 BLAKE2B 351dbc90294e25feb6ffe8f78cbba3f6ef1d0aa70bce0e7a7a43e04e603117b6bc573b0932fe35281fb730726bb1118c462e97b3a6ce2fa28b5eb24ae4644472 SHA512 5c042ae187b8408f2eb82386a8d2db107d26333ff2a41e9ef5ef024daa77db4c42f505c21cd4bf26a660e207a02ad4eb3417c73ff28468cb583c8d672d40ea94
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.9.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.9.ebuild
new file mode 100644
index 000000000000..e26c02363e05
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.9.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 0 ))
+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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/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}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/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=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d 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
+}