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

[Michał Górny]

commit:     780cddd8b88ce70106d7ee31cceba0494c8e5d2c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 10:32:46 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 10:39:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=780cddd8

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   4 +
 .../gentoo-kernel-bin-5.4.161.ebuild               | 117 +++++++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 072b08ae51bc..c45d584b7818 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-5.4-162.base.tar.xz 4091668 BLAKE2B d264f2a3cf61b8ed2a297bd8a3fb
 DIST genpatches-5.4-162.extras.tar.xz 1784 BLAKE2B af5b67735eaa30c4edc7cd8681846e892b8455890b5677b5cb8b3849383af43614738c80a6a71d15420ab55b156895bb718952508510cc7e3566aef7d025ebe8 SHA512 4083da3dee1d4e243739322393fb6160d6c148f8b8101c518ceb24971c0dca5ef0886e2ea641d3c04be47495d0112b217dd9b7e33bfc1f16e8dae04c87699314
 DIST genpatches-5.4-164.base.tar.xz 4167868 BLAKE2B 62abbdb5c0284dbfcb1d6342b81fb1a5e5ee99dca0be41b046a751e28ea64ab76697d44870ae175b6a64ac9fbce592a32755374b1671631f31ca5ff199338b39 SHA512 e9bb5a5fc61f7f72a299bfb5f8ac5949dddf7bbde9fc347f2e64930678cb2bc48074a89a965b0eae61879d297a16fcf027deecc836ed377387f197ec1b1053b5
 DIST genpatches-5.4-164.extras.tar.xz 1788 BLAKE2B a1c49d863d28e352a89a8ef344e2b9fa7d634147190ef2886e1725ffa0a0acac0a8a1a8eca633dae7213e39f6030951c7af7828449b810d32b987ee8645edfea SHA512 841638c80395371d41aa45fc3cf5af0a4225e312495346514e078fe7d5e0d7dfc758e62402816ababb8f0df020206469920ec6b53fc71d3fbb6fe15cd8cb34ce
+DIST genpatches-5.4-165.base.tar.xz 4172064 BLAKE2B 5533ca691df2b2eae12f1ddfbdd4a38625569bafbe2a90d8b7c8020013587f873f03eb0b177191a2fa4a060cb4146ad98c5a36555d5efc99a952cd5016ae127d SHA512 377e4298bf5aa6e3537969adddfb6028937035cd1ea39bc49108dc11196bddff4771ea01fea17eb06be88126da8284c8846c33ac800eb55eaa2527de15612cf6
+DIST genpatches-5.4-165.extras.tar.xz 1788 BLAKE2B b724b539ecc76ffb7ed1186b71ae33ed066ddc823647c6da87e6afc3c0348bef83ce7cbade88f80579e00de1d2c32af76e5756f71d617c70714656ee60f2b295 SHA512 428c5204967d8bcef77c80c3146294fafe676501e72187c8a5c6a6882cde732635bd422ae690cbf365bdf033891a0f54605e953daf542251692af92a873f06b1
 DIST gentoo-kernel-5.10.78-1.amd64.xpak 65516317 BLAKE2B 444139b73822a88abf4ff033858cd4514f09c689bf68a24659477f5106b4faf89678ba7ed0b80c831d16456c04309bbfb1593cdcab9979991cf86052ffa9632b SHA512 4034c53b5c8f3dad7f8bcc146d3827978040daad6e05dbdd683202467a8ad62c29fa0d79236b1fdae404993f42ac301088f89605e4f6d32158cf867b498a8e62
 DIST gentoo-kernel-5.10.78-1.arm64.xpak 60916561 BLAKE2B 4994d703ca272c6ad296cf50c498e992a799e5129ff758c9797fbc4d29c5ddef3a865b529360b189c27c751213ac5f7d3822a9473f0596494c739ddedbdc6f95 SHA512 f1c9eb8fe6f3997ff90ddbcc9b7dcd6c7544edd69301da9e2e803a01d288c503269ec1295883975da3dbdc6928bd7a8e27f4037cfcb890545fe7d86db7df90d9
 DIST gentoo-kernel-5.10.78-1.x86.xpak 57263133 BLAKE2B d4f3ade0de191584fb2022aadf5223a917d77f8e0aaa885d919d22477230661a47c1e8849d5c78f3fd283097c2f509bf1e7db9e6a02bb8aa745a4a4fb45a1436 SHA512 340d4a59b417e872f0a2aab2b8b0a2ddaefd29abd3c51882f08bce93cfd72e44d2a4798e688a33e36162fb9cfc33b8c173fe0d4551e956ad7d4fec2ae7d2286b
@@ -44,6 +46,8 @@ DIST gentoo-kernel-5.4.158-1.x86.xpak 53194465 BLAKE2B 4419edde2a05c5c375e085026
 DIST gentoo-kernel-5.4.160-1.amd64.xpak 61419703 BLAKE2B 82b6f04cd1d7c2485b1fad1ab6c7aac432a39f4463d248ea9f1b2d42f57838b64cee7f5867491dc7551c5d7b0dc26c8c4c99029a2c224bfb52f9cfbd817a0a45 SHA512 4ee0ff7ac258517898c06324b6b26102391bc7c0525c4c6a8579e95f458e5ff6aeeb6dca62e19b6323b847461f032c15a6ae1dcee31eb72e681e033512660561
 DIST gentoo-kernel-5.4.160-1.arm64.xpak 57566747 BLAKE2B b95f9665af8b8b29263eca4d0efeb4c4738c565cd5cc82077690182a2f341246037b039ad918f0f33ae770f5b375c486e523c9feb3615069e36e4e59c29311d6 SHA512 041a84459e784973f734ff0aa591f218b80c3e19301a284ea70a7e910d0103848221aa60a7b4d0da5e54d300063edb190ede1caaafeebed2367426db3aa6cc09
 DIST gentoo-kernel-5.4.160-1.x86.xpak 53205051 BLAKE2B 9b67b07cb0b05d8f68d958432a427e7a903ff1a63b14b4d168f6d3ece28775a1042d8f8959e37cc4176123e7c9cafeb925fcb1bad0371af54aa7a4db90ad42a2 SHA512 d9711bcb40751af6c2aaad8888e8169e36f2b35492c867fe572c9901d91d05089fd1f43e6f5d4a39b70e8e540a5877cebf1edd834b4f952484f8fbd4b9cdd103
+DIST gentoo-kernel-5.4.161-1.amd64.xpak 61397959 BLAKE2B 9b213988ec360726a154c855355116fe118ac2350df7f0ef1349ca16ac6de5cf61ba3ec414e6b4f862fd1fb4b3942fd6bb6c43c707b436e7a49f0936da4b0c4c SHA512 a604e7e6520a34af6f2033d62602707cc1be5d5aebbc598ec068b1be7e841b43ffc8ede98cbc19a62a8b07eeb40b7951567144f5a6a0ec118460c8be302864c3
+DIST gentoo-kernel-5.4.161-1.x86.xpak 53165081 BLAKE2B 9bc7c8f2fe7754630edbf9f6df30912e435d9118395b529d732c12b1b1549815810df2e0714476bd4e545311b2c474b9258ebfe293b20dda338e92e3feb3e5ef SHA512 9e1d201483befe38604bbb06ffb5a27da4a643a648bb7d732470007eddde22766f9934cdb2a3bee81d5bfe213d13c7f776708ce8a5b7900b5a4e3f2431c9cd59
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668 SHA512 a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e
 DIST linux-5.14.tar.xz 120669872 BLAKE2B 0047f5aaa3940dff97f4055ef544faafbbb5282128e6afe21d2f47d8dc8c395806a17016febfa050117d16f59e74b882cb8b9c5011d68f119c230d0a4d120524 SHA512 8e4f3ec3d36f774280f75dc7b004a43e09417af58f12e9c9f8348976659d4cfda7ad905f306f43fed66a27922e5c45db22e46bbfa7a0b9f365012380de3b6f64

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.161.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.161.ebuild
new file mode 100644
index 000000000000..19484744cb5c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.161.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 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
+	)
+	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 ~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
+	ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.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
+
+	# 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
+}