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

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

commit:     e1e606cb0f2199cee0cf8feb5bb9c02ba4c0f702
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 12 18:14:50 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 12 18:22:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e606cb

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 1af90332122..d07c2b732ab 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -44,6 +44,8 @@ DIST genpatches-5.4-119.base.tar.xz 3361000 BLAKE2B abd2482e85fd277fc2baf8def6a2
 DIST genpatches-5.4-119.extras.tar.xz 1772 BLAKE2B 1e15bcf849d4474a3d7e4f48791a3acc3db1b8c98d08c8fbbea9086e85ddf08a5bc60e62d14d0fee54584fd383101428987e7e1fa395c8512031f9433d64455f SHA512 21e3e2c73373cffc99f66519695c64140a2ec222a2377781c79a771aded878aaf299ae435f6d87430d6613760df3d79f67bb90aa4917a3ec233fb6aa04bc3305
 DIST genpatches-5.4-120.base.tar.xz 3365276 BLAKE2B d72fc4839a6716278fa6144c4ec33ac24dfe1689734699fbf9da96f9ca0c91630c79cc31df3e86d8661ea8cb4ed7295a31a56c6da097b2643c35a0391f8aebbf SHA512 a84f804aa8287c90e23693e8eb518b041bba05f3fbb1f3bcd2f9e120c758b871e3926ab73cfe1a2363488000d4ece206b95ea73726be0900172060b8a358a855
 DIST genpatches-5.4-120.extras.tar.xz 1772 BLAKE2B 40abc1f926eb659f257f9b1988434f752ade522ae5efb72b721015a070774a9bf1a96ecc5947c289d7793864ba55505e4e140533b6d18b094a66e5517ea856f7 SHA512 0f03daef6fbfafde7cc1cfc7cd75ddd5ab55942a5bfe45fee7e39324523f05a3cb1774aa572a0543913249ec2b478d0db76359b6329f90942b3b8f8dac264ec4
+DIST genpatches-5.4-121.base.tar.xz 3407340 BLAKE2B b6cb01e7d9663640afa9c65f13393b66b00575f71ebbef6120ef01447f580b0c9a8ad45ac924ed4550d0d331fdd2fe711ce8bdb9bec8965943de0b24d485ae01 SHA512 01a5fdd3645bc3abb66fa3088bf8cf3e90302ebb81090efd4e76306c32756b5f5edb42d332efc5b0ba33f8d08ed4b0bab939945334a8e7189f6b8cbedf7d9104
+DIST genpatches-5.4-121.extras.tar.xz 1768 BLAKE2B 59572978e5e9e24ec69aee64991b794560355f522702f2b68b33c0ba74164027f62ea6bead7822458131fd8445453fe4c9ae0eb4bf60c529833a83880613b8cb SHA512 22d808f23f684dd468149ab0de361a7a82e188fd2381c79b4342fcbd64ea2033251e2e7247b0d1f0aca473d899fcdaa58a072009313e68538461de7be1150197
 DIST gentoo-kernel-5.10.27-1.amd64.xpak 64103968 BLAKE2B 68f1d8dda132b7e808f2becb52f9b035c12f4ad6a353bfa51618ec2ba24f527a5c1c3f4244b1cd1418cc34041d4114703e44c98cacd9aab13aa3e7e9941d2abe SHA512 c5eba8f18288936e621956248b3021c7d3c25c0a598ac1f7301287e2ae5bbef29c45d29f0b8b347dff99dc0b9408fbb299162998f4c7d85f330aa5526e4a6eeb
 DIST gentoo-kernel-5.10.27-1.arm64.xpak 59322840 BLAKE2B 35b4da2456931ff3316cf424448991c96d580dc7d63c6211f72b630ec40b27afa684c3e471995ace7d33c535e61c3bcb2443bef6a780b7ce1450e9e3abe7825f SHA512 c3465d647975785093fac8812d4cf2e7be9e4ee0c13afeb92ace0c93f54559c030ef5b746e169ec362b53d9d5df1bcb6c3aa9869acdda56c792803fc3ccde7c5
 DIST gentoo-kernel-5.10.27-1.x86.xpak 57074563 BLAKE2B ec113b1cd361f46d948004f58b0cc81edcc96d68fc5e949a6f4c0d4c634189ad014de8fa028d9282c89f8e75ccacb95034c0e01db21f465931e2ba78ee81f7ea SHA512 c1892e2fa4db321572f76f92231e9f5b3fa4a88a8af17fa5d4f8d754dd565c40eaa8f83dd2e991ab5837d821abe5d7f012fd56cd793f6e0fd6b3f2f78dab1621
@@ -113,6 +115,8 @@ DIST gentoo-kernel-5.4.116-1.x86.xpak 53182632 BLAKE2B 7fa5f8eaa056bae7438488df2
 DIST gentoo-kernel-5.4.117-1.amd64.xpak 61429059 BLAKE2B d1e21f821c2c0408fe34f4ac7841296544e90a5bba20a4d6cd3db27578aa9f2e5359a138e11facf36fcae7f9c6704007ac4b4123ca0ed5dbbb23f5c91c156a64 SHA512 c6be8504ae25d1b9d6b80e69c04bd0d04f525c0a551bce041d8edd6bc55c57374aadc3193f7215ca93c866cd02d9b61e319efdd158fa353ae4d9b39b120b74ce
 DIST gentoo-kernel-5.4.117-1.arm64.xpak 56441270 BLAKE2B efc53cde6cef487667afd17e03ae2e6dab726bc3ef5cd0e872511c44c7ab50946aa862164509e70f12a626e5314d72bd4acbaf61fb30dcc44622c9efa1b9f59b SHA512 c9cbf3353d78643fa8cef660cf997319a2d28cee37d535569c54741622a708808a585d6c20f5a1e62008058b52b86e9c336c69b593f2847286c47467c90c569a
 DIST gentoo-kernel-5.4.117-1.x86.xpak 53222896 BLAKE2B 327373b57c47f27fa864732a74d2166b7ce6deb741432b54e53503c0f63a475328b73822a02f8a9c12a55be8915879d59bca66dafd904a0774af929d43e82359 SHA512 1e75109bbb663d2699cf4bc0cd4dde98a1a9d4581690fa64c41637a395823f2dfa8a43f1fc507a194f8727727c5eefc48e91fc93cecc0aaa493c011a77014471
+DIST gentoo-kernel-5.4.118-1.amd64.xpak 61392444 BLAKE2B d99b66e6396fa0bf48c691a33c9af4e330f5ecc84bc763e62e470eca5159a792616ce4f18477cd3c078b45dcdd80dc5ac1a684204216c06a1fe3254df6366276 SHA512 6da307d56022c797dfe2de1cbe65a9251e0d325a7ae380f90784d2eafbb64f9d78d1c0a44fe0441625ba0039038d734524a7e422e4d6e11b0972a7db9a7a1cef
+DIST gentoo-kernel-5.4.118-1.x86.xpak 53177998 BLAKE2B 4a7e8160ce0c9ca321be346ec1d909d2dd546dfffeb8c2ca88e52060a8791545ec4afb04571294eff834fdb3da3538b686c690195e40c70f508afbd50dd54dc7 SHA512 2f3220f6e4c1b1c5a94cd4a50d4ef5ad993ce2ab4f0988de45bf2a734583401fae7ad4da21d314ffa181f772f85675698a22d9a63c7f09c560e0829e006c2ddc
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.118.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.118.ebuild
new file mode 100644
index 00000000000..550411ea18c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.118.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##*.} + 3 ))
+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
+}