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

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

commit:     486a380ab73e53dbe186820ff3f1f4623e76d363
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 15:51:41 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 15:52:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=486a380a

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index a0601ceddf5d..506339e9d9d4 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-5.4-190.base.tar.xz 4508904 BLAKE2B 89aa6c02b3f145a6b5efc42fc880
 DIST genpatches-5.4-190.extras.tar.xz 1816 BLAKE2B 40fb8b5f71a95cc9696b36d49d8d59c22a0408b3ed16e50bc2661cdd65572f2d7f77845c98fac939c7c4e4a768435f16b8fa4a72a26f0e152329e82d9f9a39af SHA512 ce1b57535f747925dac1e117bf6037cd41c5ad984a3e5747baec4f6214debadf084f375742efa763db6b823309e09c6b190c01253fb9d434773ae5a7bc40e191
 DIST genpatches-5.4-191.base.tar.xz 4508792 BLAKE2B 121c16f90445bf80db180aadd06505634d903d13a05271686eabe41c4bb6e19d38e730824d5dadecf3cac0ed28c9b78567b5d97475478a6799e0af3965f0a18a SHA512 2648edc327df3945a34100778ccb0ce26d304d9bc11e57c7f5694d7525b5aab11c9af4a332dce930d394ee4be278a6fb9631a8ea423aa01ca73bbedde3115bc4
 DIST genpatches-5.4-191.extras.tar.xz 1812 BLAKE2B 94beb2c654fb68206e4598dab054b4503ca7290519f18e4dd389da0a1c78b055c6139969c2ff6bfb67583ae56356fc9b45acee9b20c7636b8506c5426524d865 SHA512 c307a54a9ff2a274384dc8a09c326ef7b2bdeb1b43b064ab45a398e2e713616167e947dace4de8b0605b6d7a5a141d18cd9e5d15a6c78f6f8d86f5c03a47044d
+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.106-1.amd64.xpak 65613550 BLAKE2B a4107bd142c8ae0f2292dc43b46f898f1c1f554c52e3333b2f37f9acf811637fcb3657614d3515ab78aa9c041ddca6c3b6385a4612d8c7725bf996d13763ac55 SHA512 180ac01d92730f52695c6dde595c56d4c0a9a0f4da1d3c20058e74dde1962a16376d4a1c00d3b00871e6fc6033ddfe0757402173f6ea55b9f77c4e5cd29a13b8
 DIST gentoo-kernel-5.10.106-1.arm64.xpak 60940180 BLAKE2B 3ca3bfecb480b304528cd32ba5b781aa288af3ebc2b6888c3b4b5f81e7a35b1fc55f0bf6dea88d6e86bc0a56e552005192db205834ea8e8392c5c7ab4166b831 SHA512 7c989b3b2fa8606bdb3b0aad87e76a9c65381ec94f5f54214cf0aa274c9a03d4434e9f8ce339ca8287c64b2885f6c37496acd6bb211a1e3c0eb861317a198098
 DIST gentoo-kernel-5.10.106-1.ppc64le.xpak 55771473 BLAKE2B da5870ca5d18c4533b833301e644856c469cdb47354df66241e1d04fd98a6ff4049d0df062af27f81d2e971c1e3a5ea89714fbd039f86038aae3d5e41050dac2 SHA512 e78a7c62775ed0620c1c0c0f6180b433439e8ca74660a6e8bd06b3a7dd5d548c143713d83f1d50200307a991da59ebddf83c7cedb8b1b82d94a34b504493adb2
@@ -82,6 +84,10 @@ DIST gentoo-kernel-5.4.187-1.amd64.xpak 61593170 BLAKE2B 90ffcc4b061775891a1acc6
 DIST gentoo-kernel-5.4.187-1.arm64.xpak 57745319 BLAKE2B f25ad22956a637039e591178f6c3feec588f355510fe768415c49570b512296dbe6d364145260eedbc2f3f46c06f90a3cade13f10408033cfcbb8296582788be SHA512 ec2fedee190d81b9798904581ff56b5fb1d5aa96355984aa7b59e76f1bac5042f0f4abbb6f21b3e44eab1b89d720b8b5138239811f73839860c7dd6fdde2a48a
 DIST gentoo-kernel-5.4.187-1.ppc64le.xpak 54925654 BLAKE2B ab0de37c542854318598a6dcf4f3add6afac64b0432103f4e4ab5911d63587ea96ed1262a5183973fddf88561c025f01451d6f13cd92f296560dffab87a03e6b SHA512 8d4e4e4d2152cd6ba9039fd239cc8c57d9b3eca14827be35a0d1f06bf9e3fc1666deedc199184d234fe7769b0d3ee0d7c1088543599fe8db0c3e4260577c1ed5
 DIST gentoo-kernel-5.4.187-1.x86.xpak 53288491 BLAKE2B 0a31b6ea450ab61e0b4f7bfbd2afafcf75e96b1cc4578c927dd97edac3ac29e59bb9dab07d6e1bffd223ca5e28c54f0012af9b3d33b619f5259440096057654e SHA512 ba2a5c5ae74d03f3a4d11170205ccc4a02d6aff983c8090499b1d6daaaa3bcaa258b3224e32313838a25825bd1ef470f7ffd82fe5b324b1f6bd9b83c33210ecb
+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
+DIST gentoo-kernel-5.4.188-1.x86.xpak 53275618 BLAKE2B 572ba82a884c0e43ac4a47238711b1c12271833f87fa5bfcfa1861fa51959f3ef19e365001f46564860a6d24e0eaaac5a1f153f1bc6e190f930ded5b0b62d361 SHA512 86e51159d95b12302b9761d345dfe10a46e05a40802b75eae32144113e1d81ab5eccb77413366e08b3fa84448b6b6b66b5c1182c82e23ad05e7dd055f83117a7
 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.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.188.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.188.ebuild
new file mode 100644
index 000000000000..457d69d62ddc
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.188.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##*.} + 4 ))
+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
+}