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

["Sam James" <sam@gentoo.org>]

commit:     b36cda27a890ee7f99595c0b70f067a44d87fb28
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 04:44:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 06:47:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b36cda27

sys-kernel/gentoo-kernel-bin: add 5.16.20

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.16.20.ebuild               | 135 +++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 04fd598be5bf..ad7812a488e9 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.16-20.base.tar.xz 772164 BLAKE2B f29e052926e6c72417d93b7e114f7
 DIST genpatches-5.16-20.extras.tar.xz 3800 BLAKE2B c815ea22d067c98f82650726a6c8a2e937c7bddb8b941e9d54c3014f4d8ea173cb1e54e76e23b6f767ae247fafbe02a8def6f39e5c6523e8c8cb12f098b8a34e SHA512 788ad08dfb0639c5ad42bb761d99bb534fdc5a9be54e9cededf90e0da34f13089b82609d8c7ccddc6fc1a28b913d4012c0e44b6768c84927e582f3a04be7ae55
 DIST genpatches-5.16-21.base.tar.xz 1076736 BLAKE2B a5c6a42aba796d3f6fac0bdff544ee952d1cb63374864fca43a4fe57efb09407b8aafb54a692298173b66b5d267b9a8fdbafe614f48c1af4b4ecea2e951db975 SHA512 3a2df76cefcb1c8b6b4e65c82328a499757db5e50a33e9fd68b7d6044981f73f7cd0427b582b4477d1207898e3e2344d2c4c1afafdef17dfccf9e787a17b6dba
 DIST genpatches-5.16-21.extras.tar.xz 3800 BLAKE2B 337d9144c809854637406275061e894816422b04f048f14f710e44901c93621615433da3e223dbcd9777bdc1991aeb3494f5e974d3bd172de4dc9a344a32a76e SHA512 6d1cf34a8d290d685c97fd20e4831d46945ce6fa927ff22cc2273de41447267654c555e25a4466e933781fd324b422217cfda32d03d234c6c7da06d9d3e05458
+DIST genpatches-5.16-22.base.tar.xz 1156348 BLAKE2B 320027e898f66751b1d0c8e82e63a48bbf144c0cf10ce3f615f77ef449455c2822003d3bd78cf927d21a0ecd9175d56bd406c33bc8e9524bec2009c1e91e23eb SHA512 9816c8232a7d811242f5c349fde3d8cab23a349086644faf9b676ac48abf95ed25a89e5d7efdf66479a970e4ed40d9d619f01f4be3487920e66a7a8cff975cb4
+DIST genpatches-5.16-22.extras.tar.xz 3800 BLAKE2B 73201b8988e7b2c41f9c45eadd21df333655f1d7e2a19b0f319d0b125df5d3aed3c68e9903d0be3d39d6f43fcef62fd95391a0c1eaa8228b40c97118f6993db3 SHA512 81e82fbf1286c4d1e080a4609eb4dd7e549b8b75851afe57c2a918fdfd48f98abf1edaab028e193ac4935ebd790cbd400b0a14ea60b81261281ae832209a2445
 DIST genpatches-5.4-192.base.tar.xz 4516512 BLAKE2B dd316606186f305369ea67348acf0b6afbe2eacc16564851a1eb94224afcbdc066f920578092a15bacc7abb7a8f659aa44bde26859aae2525eaa84e8cd0447f1 SHA512 28bed80b1bfa457d24f8367a3a76460e569f7c8eb4f0a6b632f1898615ccb4da4c2fbba95dcfd1cce5675fe6151cee4c0df6bc0fdb158c25c25cf71a9397127b
 DIST genpatches-5.4-192.extras.tar.xz 1816 BLAKE2B 2d6760ff367ee0ba6ff8d56f81c7c3587ccd8c4f8fb952e3380148b2f3532a19cd614f352241134eb3256f8e59c000806f3d1eb33caa582e0c4be813d3275672 SHA512 f8d43a3a80abd947cbd667b3ed449215d98967fa8dc2200efbba86db946a04dc7dc971d74afe1aa6b923ea3f9914b28c3bcb9f6ec205b1bfb0cd60c0ae57758a
 DIST gentoo-kernel-5.10.109-1.amd64.xpak 65727782 BLAKE2B 5fa0d5f189dfaa93b3ef1bde853efb1473ffd37711439a40009b329929df2c93b490331b2d8149bf7d30d07edb085e7c9eed7ce66aea3d9085d04d33d894b511 SHA512 1cc3dc9fb5a73cd1cfb1b99c3c1366de5d0c15377ada5fd4a251d774d00526906db395fcd6fd82b6b42abeffcbc3b4a4ff31ecb4e28dc81f69305ee0018e7bff
@@ -42,6 +44,10 @@ DIST gentoo-kernel-5.16.19-1.amd64.xpak 69742461 BLAKE2B ce36750615f4c8f3e11d960
 DIST gentoo-kernel-5.16.19-1.arm64.xpak 65171587 BLAKE2B fb35047d05ebd6ca08075badd07ac1608deba5681a2d1c754af810953f27b80cc8672f0ab31c6ff9625d5f5efaed958813b8dfcd799bad1246194aab176b3aa9 SHA512 6e05c2caa77a36479c181939a9af8154acd8936ca525f3a89fec7785a820a70b46c4036320cccd5ea2bf709dd3cf1d8446ff028ba1d8802970d051a90384bc33
 DIST gentoo-kernel-5.16.19-1.ppc64le.xpak 58435731 BLAKE2B 86b88494979b8ef5feb90899b2774a27cf00124ba46b70de23c50366ecaf7491b8c9d59b63ba8a70b607ff79da37bfbf795b5ee8561432a3d7efb3703bd196eb SHA512 eeb15e4ac579cd18a35019c8d7f758e68c46b9e8787cd5b1e879834e880a283ebefdae25c7929d1a4d882997f533ddd5be04a0a0268df36f95fd50fec0ccba98
 DIST gentoo-kernel-5.16.19-1.x86.xpak 60548554 BLAKE2B bf169f58e7791bf8f37673a68b0c878da07296396ae929fa4bfbba8b57f68ddbeb20758e80c5a2818b2b5a9098863405f5fae4e9ff98b185d00c61b9ca3370bd SHA512 1af7e9d5283904f0261653d51f86c735e159deef9d9521c589d41a1563bf6bb95df1984606c9a8a4523a639c995bbb41e6543dda55645207bc33960c38d9f00a
+DIST gentoo-kernel-5.16.20-1.amd64.xpak 69816925 BLAKE2B 8254f4e01f4eb2cd2ff7aa515bb03f0d9295d8acf709af66056dfa1da6de0a411f829f64a1654bec71c0383ddd7ce1ddafd818399defa54dd38028fcf8906715 SHA512 2d09176759f0bf4bbab0d4cd87e5132234f79f21b304f2ed9678ad277ac8974996f22dfd8a1d11fdf1dfedf315125babd7aa342e29fa18f9b3f2a28e514fc390
+DIST gentoo-kernel-5.16.20-1.arm64.xpak 65182597 BLAKE2B cb147b9b116a6488a997b80eeeb1f1cd1791b9b4082233dee6c2b55ace2dd78186167b070ec36a52f76b6209a302cfab5214b4a7d077f2c7ce400db13e287d57 SHA512 28b3ea38fde634a4f411a9ef5f4a322f0b3836b4b5f94dbc950a5a3351b6d0bf1c7e26b27d32abffa73396e307041bd92946b9c846289eff423e852a58027096
+DIST gentoo-kernel-5.16.20-1.ppc64le.xpak 58464414 BLAKE2B 4131b54a40240463b8b5d5fc5d880d2f6f05aca7ab2261e9c0af890f9d9b03cf83be51bfd4a148967207bddfa238392abf45f233853b8005f659ad7b7ec8d8c4 SHA512 7184452d33c2dc68c473b40f68de76f5684dfa6c8a49626ccc5f5b3366b5d3c30621379b41778f42a32d9e55838935b063cd56055da05208d7379e0fc6afa448
+DIST gentoo-kernel-5.16.20-1.x86.xpak 60674097 BLAKE2B cb818be7bedb2e2112e0c0d43558889569b6facd3ef910c20b4a442b087fde350366d0706b79164ada2419e764cbd80e053a828696fd4a7959ea6e4efacbecfa SHA512 a21f5aec608a76f809e9fc22d8463e162bab3ebc4b939ebf1e4aac007575942aa99a9d650ea4d4587e426d95bf45ee4582fed8f4e68d0bd97addc0c9e17aa494
 DIST gentoo-kernel-5.4.188-1.amd64.xpak 61601422 BLAKE2B 99c6cdc76e5dc2d778ae57fa4a09f06eb35208f167ec93028c52d72fc61d8b3c672c082210790646fad3c0e752964a05319e2fdb24c92cbafc9017c336caf920 SHA512 3ef221e440b9d5a1f7bf6bb4d58bd4dfa021d20dc230accb16207c27007e8e51aad73e36306f3161bde740a228c66b9d3133bff07d3b9e05421577bde30e8a75
 DIST gentoo-kernel-5.4.188-1.arm64.xpak 57741944 BLAKE2B 95b3a954db55df7c00fe0bab94b82e98237f39bfa54df697d94de151ee66ab6107b0f0fa9c954d785b69b801ed589a53da5d0f8777873df3e7e6a1bd89867843 SHA512 4a293801db3ab0cb18f51067d23d5f59aa50996362410a5ccf510573e17b6d611bb328c11e0f91bb47a66c0b773d79000dff91cb76faefd517e410967eae6ff9
 DIST gentoo-kernel-5.4.188-1.ppc64le.xpak 54984206 BLAKE2B 51d1b01bf56ee1491cffc11910e5bef1af473d129e640a071e73a44c490a703d509e5d9343d207953e5deaa89e9831490a4edcc7bfff30b69f37a875d3931ce7 SHA512 beaa920f5b6acd7e58b980e9677b980b2daf0413938bedb6b30efdc5652c5154dbe12af57fbd21660466e76063ceaf98012799400ef163086545500d79753dc7

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.16.20.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.16.20.ebuild
new file mode 100644
index 000000000000..1b99b8dd9731
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.16.20.ebuild
@@ -0,0 +1,135 @@
+# 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/~sam/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~sam/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~sam/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~sam/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
+}