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

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

commit:     2d155dabefc4ab4d2e8c433bda2fd10844d15c9f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 14:37:50 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 14:38:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d155dab

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-5.4.236.ebuild               | 127 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 3aabb5563529..8bbae9808cc5 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -38,6 +38,8 @@ DIST genpatches-5.4-239.base.tar.xz 5520768 BLAKE2B 9023bb6baa304282c516ae3d8ecf
 DIST genpatches-5.4-239.extras.tar.xz 1812 BLAKE2B f16995331f57d04a5e92164dcb09eab416c56184d9df7546bac597f25614af08053823f3877dcb4ffd54253ad610e9a8c39818290ffde145c3839041ca79fa7e SHA512 c0f6e320892485d8806efc553bef45b9bda7f35bf357af562136d6f10d41c2dcac767595902f2084ddce9ebce9dcc1952e9e72833b79b396dbf398a66017898d
 DIST genpatches-5.4-241.base.tar.xz 5607360 BLAKE2B 2fe1ac8414a69000b32e9b9c9d1f067085648bb45d0e149c55a8e1faa68c0297dca4c077317d2644543cebc1ec93bb408b7b702de80aa5d70360e2bf80213ac2 SHA512 24e0c4188ba25c835a9fa7c18df12b0d34c74d090ebf60d23bf206cc0fd3a42e06e3e9868007c271813900379f6ba1b49eb85c2f86f9d4068f99d0c6eea6ff6a
 DIST genpatches-5.4-241.extras.tar.xz 1812 BLAKE2B cdac5d4fa8b7620b85608b6fe0870fc3dbcd3f9940e33fbac774b8319aa033472613df5daeac5c356efe1a898f51deaefb0d34cd7dc28eae0001fa04922cd207 SHA512 41d9c56caa35af7650ee7f8e28a64582b20aa5edece9cb6047a3047e3ed59f0e26ea296dd1f02d3e1faaa8a3ff6e36f1c150f0addcba868fc7b823e4b1ef5c8f
+DIST genpatches-5.4-242.base.tar.xz 5610464 BLAKE2B 54d7c2e11a6b21ed8b16d26a56ffd392f35b82e1bd4548f65c40018ee6607eaea37d791734a31abb30ee061ac85089fbaede39f1ac35c2b0f48220f266d2db17 SHA512 cf7d24286d88319eb872f14c3907956c1ef9e0cba4d1a86e740e9eba3a450a2060c1f03d519ac49ad97e9afefb2a32fa7e77790387819c4d60d15039c425ef28
+DIST genpatches-5.4-242.extras.tar.xz 1812 BLAKE2B d2b8f6655e540964c1c6fd81a5e74bc2e7001bf86ec8a7e8293b2088ae24ce4bd41d0eb5097011a2c9669b9ff479bc828c2f8425924c920f35193d466b4dba58 SHA512 8d76a855216ef7dc89babce2d35a7b6b58b641105c117e246a01a779396fdcdb6cbcf7b599683ecbfeb53df09504244cca5569b08b15a4fbe6b81b10d51c8d86
 DIST genpatches-6.1-14.base.tar.xz 774040 BLAKE2B 8e0866c762e2711b766cc75630d66c7c46221bdc47357a903c7e8506ad122b7b5ba84d102b19743d236ac5579b44d24f77b9f52f3c23695ab6a279cf7875e735 SHA512 6a753146013baf0b94d83abd690118517679d4d7dcf6e9f86cf8de35e24f80a792e9c0692f237098671c316d046d6f65f8d3512255e572daf6a8ca81853beca0
 DIST genpatches-6.1-14.extras.tar.xz 3804 BLAKE2B 7f016579b130c9a4f7a8ec946254dbd682f22e5654ae777d11b265dafe2b177a4c40c5a979a760a5bd6ed3dac057b90a3120c60b958f6b748ea4731b9a5f1ea6 SHA512 2807d359459dd11b9d3356fcac609dbfb8487e8c924cc543ef37698667b1c8b74cff7b015839ca0677cf1f96b566e0b5018c057b517275886ab500cd2ca49653
 DIST genpatches-6.1-15.base.tar.xz 803732 BLAKE2B 5f43fb07787e9e861b54b4977acff47c13870b24cba98296538651c656e332be2bd194b91a67d68858bb7ddf116e0e97179c5c039c64b75f4392829d091ee387 SHA512 482cb110c5d218a0b0dd4dd828862d9cfb5044b5c90f75218dd7bbf266dba1a11af11ecd913029904d6de1d572d2cbb247b5bbf1c4bb5711eb9fb03b327aaa81
@@ -142,6 +144,10 @@ DIST gentoo-kernel-5.4.235-1.amd64.gpkg.tar 60487680 BLAKE2B 7ab3f0616c367da790c
 DIST gentoo-kernel-5.4.235-1.arm64.gpkg.tar 56535040 BLAKE2B 7e31ee0e5602a39810719b4520dabdafca0f649dfa6b0e69a12a6e93cea1b0dff4fc272a622db88c0c68743e67da901cf9f525ad49413c61d21897aa4abacec0 SHA512 72ec254202bf236aec4d42fde0f1bba66354937fe6132d3f6c6f542a3cc359caab8ec218755f655fb91a68b0466310f789558fff459a771c4919d260d1f47dd5
 DIST gentoo-kernel-5.4.235-1.ppc64le.gpkg.tar 54210560 BLAKE2B a11994bb699005339df8ae1c15a716a49623c8fc64751209f35cd6f90dcb3aff245910246f765193e5c2f9f5b4f6f81ba5b08fc49d24bda42416d75bb550cb6c SHA512 ce57477aeb3b5c1fc8d7a1385dbcc5225a83b2b2cbd056aaec42e7c2b6393666e0ce25206483594555660dec0f5e2ba9a7ce98bb22c011cc5ce5e25967b57f59
 DIST gentoo-kernel-5.4.235-1.x86.gpkg.tar 52428800 BLAKE2B 5e23682a53c891db9f07ef93272426cfdaba5a2a39a7872b4c9187d1e81f67903f53b54e6c07b2ca620716b8f8094a986f28c44a246f2f3706425f318383ec56 SHA512 323aae22842ca4d2cf173c639e86b6b1894108fd98dc89d6cad480e871328ba8eb4870b7838e65d449bdf3b167d22f8bc0a013080e4b48c5fb0d9a38af3b334e
+DIST gentoo-kernel-5.4.236-1.amd64.gpkg.tar 60497920 BLAKE2B f5369c5daba253d93ac3a3d3a45daf8a11a2b392e0639e7cb867923d4595cf0ed5ca438a86674e79e13a7b9b05892b87a5f9306351ca4cd55a997d0c4ecac3f9 SHA512 fa840eabfe95592e551e75a80d04f6e4168bd40153c5127b47d915daa78451da8d118a1024ddcde7f85e45f644e21327097cf722ce4bb97340e2a4f5cfa42dbd
+DIST gentoo-kernel-5.4.236-1.arm64.gpkg.tar 56524800 BLAKE2B c0f3befb350e1cce8d5c09d27bb5713597cd887b94d968b2e72699b83b427347aebe1d2e5a38dad22b7d44d0aba948a853f223339caa6ecb055fa26a37dd83de SHA512 5616bd9ff8d0e91fe799acaae47fa0b7c201a04b7dc32b6ed807bed206e3847e275ee8c9e578ae3e705c047abcc5ad232bcdb888a7f0e9cf3d0a4a7c5bd6c591
+DIST gentoo-kernel-5.4.236-1.ppc64le.gpkg.tar 54231040 BLAKE2B fae905cae9e4927c58970ece0a3925d629d0cd21076f728403431acddc2c67b98f798b74595384e2a85191b9f5ebc07fbc428e387079b6b1b862353e6e47c3fb SHA512 a80dc6a5c1839db75338ead8e1678b1aded80a0d935e3495076c8cfc3cbdf6dc51e655aadb92dcdcb966bed374a80d401c0289a9898da3081feb379e1fd3cc66
+DIST gentoo-kernel-5.4.236-1.x86.gpkg.tar 52439040 BLAKE2B 08d7bfb6ac39b40ae1709a4a40e1da20af8fd656e28865ebafeb0c011b926de3e595e5da9596f1804ae47266bc5ec7eb3084c2468b55d74921bddf15e27bb9fc SHA512 dcf9a9980123d3325c31ab88f05eb67b8e78cd5d0f4c89930c86ffc43fa5e92fe98c9b5a1c581e83f3df81a41caece02d4892910bad2f3619bcd4c529addcaa8
 DIST gentoo-kernel-6.1.12-1.amd64.gpkg.tar 76759040 BLAKE2B 2f2e485ff705b26fa3b1db861acafbdac6362151e30dc73cb2829fbf871cc022641cc15cab82e0d19a25c720f84b6382b74c02d34f658a0cde90a267160f3af2 SHA512 d67fd7cf59df2e648bfdc7543995d7f46160d708a2fdd172002fc94d81d4b1bf1b1870754a6d5223a3728484170bbc6f5650c845dad27aab45da8f9f9eeb9232
 DIST gentoo-kernel-6.1.12-1.arm64.gpkg.tar 69447680 BLAKE2B 83f5eea4ca23eb6e79fad8fd746759982fa1d7e6cbd4cd63d43901aef9be3e7eeb64864f6538bdea6efe2486d13a37042a5533825f924a2af393fe0f66db7a72 SHA512 500abfa834826bc3ea7bc97c1b8991e68e72edb8c69ddb316621ff3029bb7962d8c8cb34e73f71ebed2f9db4600b5bf03f925953f67ecc6b46e9db5f35c265fe
 DIST gentoo-kernel-6.1.12-1.ppc64le.gpkg.tar 62781440 BLAKE2B 5a29a7f274f8b3122209603fc1b05ec7940dfaa0bf9dbcf658897b99203eb091d74f8df8dc9a7fec4b2bb913695c7d78650d062d4b58ade48598f2cbfbd6ff58 SHA512 edef917a088aef0b6ec572f678febfcb448c64f70de39697e01be50855e81fc9f3638d432c98ff75bb8963ecc25bf783ad9ce7752cf4705f875415feacda9974

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.236.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.236.ebuild
new file mode 100644
index 000000000000..b667043f3f79
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.236.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+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
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+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 "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/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
+}