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

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

commit:     e4392dfc9304eeebb30bb838f3b865ed6f6a0cc1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 18:07:07 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 18:07:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4392dfc

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.15.24.ebuild               | 131 +++++++++++++++++++++
 2 files changed, 137 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index f8dcad4d3024..f52fd75bfc66 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.10-107.base.tar.xz 3012848 BLAKE2B 912470b5bad9a695029f8949dcb
 DIST genpatches-5.10-107.extras.tar.xz 3876 BLAKE2B d067bba64a51aee7eb835bc865660aa253bb08a49603b2b3bf7acd5cde0afc2db96dce1e4aa850a4b87dc064fdb0d394567ff182c178c5e59480e437d9a317ff SHA512 2e837983c89e7e79e23415ef382e0bd4e2103c0bd6cf1d6db0324b21e74f1bbf01e98f87ed6f41544f2b0b8f5dac426ebc7e27d4b87c7a38f013c611f9560499
 DIST genpatches-5.15-25.base.tar.xz 1018612 BLAKE2B 493b8c695f2bfcdfa36712143ffad423883273b48e0ae45db226d9e12b809764538716fa8dc257d0cb211f9db50f6af437cc8d19dde0e8af5a10accf85a3b4be SHA512 f268ace309d283079e0f491a3a77de56d4a18fa31bba643be4d215f931baf6a251d1e28c358d4b606b0ea15fc34e71f6b13901f5eb95f18ebad79f384bb6e5a9
 DIST genpatches-5.15-25.extras.tar.xz 3876 BLAKE2B 17a20913e907e6b6a87afdd7775b7f9811bc3eed5374b957244242fdbc655519606063656bb8e5f51ded3168f73e99832d0cdf66e830811dc1e5ea0c0b8a2582 SHA512 1b8f4424996351a70c26f5a90c2490078c1a8daa80da578e2e3b3d1c4be6a4474d40cbd2e6fae8b1f1b9389cdaf2257e01a14ac6c2f7ece8a883d745555a686e
+DIST genpatches-5.15-26.base.tar.xz 1059876 BLAKE2B d3a7b03647f3ce4a10ac4b75e52723d26cd56f880ca786883c236b3569c7312555ca57325a039bf9713cb44b930190b2e099de6ef9d677a9cd5e8ef9179fb52e SHA512 241f1cf431626fd0f406f5a661363a29293a23057c58a4cf63bce6383d126e4f276be371eda670abec8699036d46c1896788f1f56d47239fdb9eeec6d5c8a51b
+DIST genpatches-5.15-26.extras.tar.xz 3872 BLAKE2B 84bf993010dbdf678e9c42e5807bcd1cbf6066d0ffacad81d8a3d7c16c65cf0b59b219e691aca1fb6932e6aaaed9a0eabcea8921e8042e5e6f57d0ae45e53826 SHA512 55cc9f5f2cb30f2b81b7815254d2932f851f5691fdc92c5a01b3a8977392ac9eebcb77b826571530ed435c4504560dcaeeab65e0c51c35c23599876b4992bb62
 DIST genpatches-5.16-10.base.tar.xz 464508 BLAKE2B d590a7041f6309674e8000c735a232bb2f70d872863e4122fa5a8cc8bc0e68b641685b4bfb10c81d286124084eba2f6815e9d650978b52fa2fff70508ee361bd SHA512 cb591c67a3253b35d2d8dcbd229231507d28cbf2c1dbc2f734ba7e0fbfbeba6ca400f99bee6c9b94c90fad5facc9ee46c85fa4178087865d2e942a0717878a60
 DIST genpatches-5.16-10.extras.tar.xz 3800 BLAKE2B 79c288854d58ee20f8377be8bb15ecdca30b27fbfbbe314c2db7260576036258202f620d2ea2c2a6725fca1fe68fa1a158b207d36ae13630b3116397c3868cc4 SHA512 34069ffcf17636489af7d6df3e322926f566f43396297867c2b1a512fa884062bf86d50675c313ff29ed68f6fdb9039748fcd14c9395e29e9beeb166f45eb25d
 DIST genpatches-5.16-11.base.tar.xz 516420 BLAKE2B 3e3d1a7ed60355a6d0911742fe1fe27961bd6efe16c25bf700ffc9aadbd8d02860d8b35a9fa3de61bd6d59024364e698cf4d78a7abe2eefdadd79b5aa086778e SHA512 d513a67f55edd3ea469b36ecf93eda8f623fb2f899c8cb373ee5092838283fadda029db6d97687dc27b734634e666106c054d0f35498af086aadab4aa59a2e7d
@@ -16,6 +18,10 @@ DIST gentoo-kernel-5.15.23-1.amd64.xpak 69156149 BLAKE2B d44b2969462458282bbea66
 DIST gentoo-kernel-5.15.23-1.arm64.xpak 64071650 BLAKE2B 51d83f9ae6593e93c73b7f9dd575d4200804d3df7d3c1d0a52098d69a7a277d1ea5682bccfdadf769f319527ed7b41ce216aaebe75559fbaa4cde956b63cf66e SHA512 3e149646a757163bb6205ac7ce0e19b1d3812d160d8874a120c8eafeb2d3552c34f56a33f31d417ddeed2adbcdec37eed492f6a2b7b384729462cd6861a70fe1
 DIST gentoo-kernel-5.15.23-1.ppc64le.xpak 57841330 BLAKE2B 92ea96a25fb0bfcfac67bbed26bcb3aef78b253007c890045936c304223652751846d76ba5e963e3979c753f5f7cf6a680f6a7f2b20a1f25fca6c3443ddc107d SHA512 daa756525faf67274dcdd780b501e70e4b326466fb563637fb9e9ffa6d65eec9b3f3f37721b855ff640368c81a8a7ae553f7c3a76072bbd779226bf41e54a8d4
 DIST gentoo-kernel-5.15.23-1.x86.xpak 59903031 BLAKE2B 9b60e9e59130e6c2fb5f1a117af132483334cd656daed1d41922f7966273970fa37f3e9d073f07bc12264427acab1f503ec1a8a42fbe7aea1a6813702ba5e826 SHA512 5b818d66a84ac32768294b629790add4c6b0544c49f7f46f2115d8e7863669515bf87883a37b600456b65528091f4dd3ba50bd123d2e005aac1899f830882e01
+DIST gentoo-kernel-5.15.24-1.amd64.xpak 69148874 BLAKE2B b2d2425c7a1d2a0e2f5904f646861bd7faf9f4865d55bf7373567faca1a2eaa6d8ec8398843f5c36b2638e69e48d52c1c939496b5ae0fe08a9daa76a4df575cb SHA512 cf93d71a8afa9c04ab974ca579238adf62b3a863e16ed63fe734cb5bc549b6653ee9dd740ab9556addefdde9aee8da97d466d50bbfc080ab385707245f022351
+DIST gentoo-kernel-5.15.24-1.arm64.xpak 64079551 BLAKE2B 0927eb56e49b6d02d9299d08a050e1b63bd1edcb879b06d34e0dda2bd87337b7d94a7574cdf5fdb195bf0649503e9bae9ee453a8ca249061517d4a760f4cbd72 SHA512 850a59cc24873e05ad3920140095be0a30837192f6bef284809a2ec7f88921ceb7386ab5c883d4038ab07f99229abfd52bf67f1f1274edd393c6ded7413d94ec
+DIST gentoo-kernel-5.15.24-1.ppc64le.xpak 57915153 BLAKE2B 1319ae23e1b33e5f0896196fc42986fe216a09363e622f44ce26f07d8e3b3c76ec323a18773fb598bb7726fffd4fa0f2a90d6c876aec397d9e7d913d184f6193 SHA512 c6df955694a167bc1f3d10f1f2571439bf5e9cba942d6c38e782b1d28252e6146fa458e9c19a3761578b631a8ad61e7ba23169f1c5cc5f11f95ee47de73a5e74
+DIST gentoo-kernel-5.15.24-1.x86.xpak 59889148 BLAKE2B 347f6ad367a3f7e9734db959f06b986425bed90bcca8bb590024dcc89347b15b686c7c9f06a3d77dc2652f1da306eb6bef5b41bbd4f793d6438bee2ce863d082 SHA512 3255e4b4cb76ef321a71f522a1b2b5c9d03bdfd02e58569977f1523ce61bbc04b267ff4761462736459b281a575bb411168b14a72db97e9bea2ac9dca27e8cde
 DIST gentoo-kernel-5.16.10-1.amd64.xpak 69568600 BLAKE2B cd01658393cce36ec09b2b59db73fb7b05d9cfd46094c6aea7b32eacc2c3cd9974c4056a7650a195853354c8de56a6bf42d2b9debd6810fb20e2b09094da7cad SHA512 e68ac4f34d0bf30acb8401f8f8c9c1fd4c93a3b9f36d071196ff1a42cb6b2b8ed9fa0e04b9376fc82de6b296958a6e49facae8dcad3e53fc6e89f0bbff246423
 DIST gentoo-kernel-5.16.10-1.arm64.xpak 65046002 BLAKE2B 3b12c8e5c621124b0ab72bbdb58e1c054ede41859fbdda8c510ef12d3d52c2db17bf64e95b509a29ffe8cea45c8ede86073d9189e0195d1e4745d3810bea7f1a SHA512 6c89091febfe2ede589caa68a9526daf8cde16870dbfa508c3395afee36f6470c329c491767a6a4b2be6c83454dc26431ba0776fe3090aebf4170fb092a43e5d
 DIST gentoo-kernel-5.16.10-1.ppc64le.xpak 58450194 BLAKE2B 0e95432237a2a1e98178b7a41a23abb43797cf12709061f8bb50e98c0315563e8dbe9c6ead57dea72ef0f153a906712b3ed5b02e15167327975341febeda0778 SHA512 450da33416b07fae2d6759dc0d6f59ac21e61ab2f2d7a2cc0df41459de11c040996ae52311882831ffb68839068e4323cd6ea5fdbcc08d7e4d09088b0d46708d

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.24.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.24.ebuild
new file mode 100644
index 000000000000..fc9dbc62cb30
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.24.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+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}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)"
+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_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+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 "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv 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
+}