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

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

commit:     a50b6c67ab1b106ed88e7fc82b380681414870de
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 20:12:48 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 20:13:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a50b6c67

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index ce919d21212c..1dc652f56c28 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.4-256.base.tar.xz 5956736 BLAKE2B f1f5f42e5383da96ac4dbbe9cf7d
 DIST genpatches-5.4-256.extras.tar.xz 1812 BLAKE2B 3942c845d2159bb2fc927c5f19a3d5fc0cd7abee0a1102e07a4bb657a213527575fac692ec408f12f679e3a1e791087237baaa6199e92d8062bcc4576fd142c1 SHA512 6242d77b0a7de7542395a5461e6aa8b2a2003f77ab81b1931511f36b42b914bad839ff2683154371118bbd81953de0604d23d75f662437686da694dbb610c8e3
 DIST genpatches-6.1-44.base.tar.xz 2683644 BLAKE2B d0264b6d6456fb2e6a67c1240cd3fbb95eef61701bf953df6e25e37a12fb12702b57f66e30ac757f28d9d1bcd0f2fbc38775d5b73922504084ff95f9fda1d78f SHA512 e3777a612facad029782fe63abc702af06197521fcf90f4c80311fd7ad94739209573c7de910dfaeafd88948c2c3f3d29bb27f4fa1069475295b6f5b29e14116
 DIST genpatches-6.1-44.extras.tar.xz 3812 BLAKE2B bd5605700d0b55036d186eca82031f1d38883fbb3e2e98f0b44269c914f5a2912c026bebfdfd3fdcd563b97d3167fb9908bd0e29422b02e9314392b3ad2281c5 SHA512 e274c0e50fc476bc071fc4d77623b75cdfdda51951f541f56bc4f8ab53da17e67f615c37d35c93290d20b51d3ab2eb923a8e147daec4c59d3d1c87d3e803beb0
+DIST genpatches-6.1-45.base.tar.xz 2851860 BLAKE2B cd512077ba76f23b7109f30f9a981adbaafeafc3a2b69685620b0d67bf21b3d716cfd9c6328ed7c1d6cbeaef287876b7b63b112644546d2cdb63bdb85e4b082d SHA512 1c1fd3a35c6544a030856161d902895b90fb75ad315247204361cc151190828fbe99abc87979a9df24b3e8e02aae944a130cadee5fb059e2ef174b6bc9d1b037
+DIST genpatches-6.1-45.extras.tar.xz 3812 BLAKE2B a3355cc91c618303f9490eb306639325e1b46a7ff9f6fc1f546ac1532d110d981ed316b9bc44abc624f70cb8e63ff512af2708b4cbc379a69df438c6792050db SHA512 e2413fc03401dd1dcaee49bdb2cf8cb7008451cf2fbc8635854da2148464ffe1bb49127d73e534c054e5e56514bf31f5ccca507f52845334133fe26846e244a9
 DIST genpatches-6.4-5.base.tar.xz 29696 BLAKE2B 0e882d51de63cce7a7edc96c29fe46c27f607abddd0a70d2977054838d51ad623ec5ff3f4eac8e18b016f6c310ba79d326967947c17cf662391638d7fd2ecbd5 SHA512 3205df0e92db622aa397953de85605e58b4e977262a8dbb9e59174c7a55ad2c784ba417069f948dcdeddda8318389be45d54a516d9b2f45cd2948938942d7e5d
 DIST genpatches-6.4-5.extras.tar.xz 3700 BLAKE2B 701f2bbb493087bcd8de7c7293c802bada8965901838b2eae998ec14749da6c46814611092b4120c25dc9ebef2313e36bcdc3593110d06c510e9db1dcf575f53 SHA512 0be95fcd6ce4ca750ea97c17bd897bd8083de63b8573080a2f3cd41d07c951293083afb739153a3cb29ea55e93b7d2063089119080b26f932c6a74e9425a1920
 DIST genpatches-6.4-6.base.tar.xz 314708 BLAKE2B 815c36a6185cd1006596a4829462900041bb2ab5c89f28c9c26c5a10e8bf4d4907ce4f244044e7cd95c0f790112bdadeba8cd363b276aeb37ec20270e2a9162d SHA512 d0d97bae5fd34e41d2236fbc9952c90b2535b62ac9a5a5dc259cffb7f927bda16a04175be0a940670d0a0021f6fd3cf45ecfddf0e22d7a9253c13236a9b29124
@@ -26,6 +28,10 @@ DIST gentoo-kernel-6.1.38-1.amd64.gpkg.tar 76677120 BLAKE2B 70769f68036cb0361eb7
 DIST gentoo-kernel-6.1.38-1.arm64.gpkg.tar 69324800 BLAKE2B d4420e6f8333fbeef890da6f94989ddc1bf8721cc6ae23156e71afff6a8d50c31df1b5bb715d59d2a8cf0c413ae5bc28fd07dac68fc44cd7a99ba62f327ca7b0 SHA512 95c8f3ca88418bf24359430079d3e5023b6a47aabcff4bedfb6ac8e123d9a947050f4d443f6219d06a1370c01f6cfd0095a0645c83b84e1acd983fdb3e256ef0
 DIST gentoo-kernel-6.1.38-1.ppc64le.gpkg.tar 62740480 BLAKE2B c958f52f210d174ce0c38ef9e551b4ed1307154170ec329e7518ff9569b933f4462a6b48ff608c5a03f013170f5d2463c709bec7f68e8868a85de0393fbd1a19 SHA512 9528c9dfabb83c24293b75ba51843e5c1e54bd42ea74165a33daa230ddcdab2226e6897a7f274c5a8d7419d7d71b1b71cdde4b2ba7d3f1ccdbce925fd11d40a1
 DIST gentoo-kernel-6.1.38-1.x86.gpkg.tar 66078720 BLAKE2B a1618a37c735771521be4bff4e0fa776c8bc0c4ef8f1048d6ab94b5e858b5f7a765d6e2ac6d1e0225cdc04a0b8f73c490b0ee08087ad2436e59fcb80188cd90a SHA512 63baf4f5ca3677975e788607a247a9ee0daf50ed60cd21b1588ab13cfd2ef2336afd480fdbd2e7db60cb9158374114ce4cab72390db36c833de581ed315ddaaf
+DIST gentoo-kernel-6.1.39-1.amd64.gpkg.tar 76646400 BLAKE2B 807dfa9c621bbd70dc4d255c192d05f566e4e42cc21fcc58edebcaece426701e6c0b92462a2f730e6038be83c42639b2bb058af32a45cb75693edca83543338f SHA512 37296bc293053824a5514319d03ca280124c2242fec18f7cbd8062acebfc1dd0224663f7f8211ebd14182172dada4d8081ba9432726c43c3203ea681fe9040e4
+DIST gentoo-kernel-6.1.39-1.arm64.gpkg.tar 69335040 BLAKE2B a39774724f3980fa9033ac55ec53cd5b0e468260a323beeee6422d164fdc4ca85405f0e77231acb942ba00cc803666c3b4628d7f5cb8453f997e8db6ea163d4c SHA512 04da4f262a2cc0feec3310ac0db3ee26f19e15839a4ac12eb4e849599dc9e7e2b32748b1f30f21334674e2708032fe5e9640fa26cc40bed0d613c68863904ee5
+DIST gentoo-kernel-6.1.39-1.ppc64le.gpkg.tar 62740480 BLAKE2B 2ab2a4dfbcffa0a078ab8a8b26d54b88f5fdbae256632f595ffbe39908ac9b5092fb8625769b2864ca54254c5c9af17164d048fc0c5885b0b5d7663832b24ef2 SHA512 0ccb15a5200a45522a831a0f28141f0fc790e4189aeafa7f09a331f5ec8587251dde7beb0fd6a151d23c42369ea352775535cec05d8311435bfa76c51f429a02
+DIST gentoo-kernel-6.1.39-1.x86.gpkg.tar 66099200 BLAKE2B 9bc929e5ec84f3cc46a3f3da5ff9b2cf3c0bf612b6632af5a6f50ff1a13f72eef816acf18f9012a57595c27b174797795b30c74a3abbbfe65bb9639d5f9965c2 SHA512 e57445c73ee932cd9a013695f6f01cc5c646b9f155e6b441799dd4d12df5722fa88ffdf8283e4f7be3e8b1654b23ae90b2a2e02f209a09a4b57ac0b6cfb7ce42
 DIST gentoo-kernel-6.4.3-1.amd64.gpkg.tar 84008960 BLAKE2B 10fd671edec759a7ea7b0a8cb801b41936bc20fe9521608bc75d06adfa50484ea79eda2e3a9edd6d52dc39f797e5a23cd0c0af3bfecc09365e3d85560a4b8a75 SHA512 27a4853e687c3791cb05ad7841716104fb8f1c765f83a071d921357349f1e1b96076df33e9a11696f1f6a9bcb8f4c3cc3c32c3b3ea6152b47602b087bbe2add8
 DIST gentoo-kernel-6.4.3-1.arm64.gpkg.tar 72919040 BLAKE2B 62029a052a591b967b6cc0c8e23c32b0395e7d85c1d2d698a2eebb9399e0c3b2c3133e3e084864b74edd87e99c869b9d64764e6964d50047710ef4e79cce1366 SHA512 925dcfc831612870fa80a7951fa0b63326bf8e67593dbff21a45149f77ace1e3327ea32b764e278923c550cc09e206f20387143005e99ff9e24d52a6f0b296e8
 DIST gentoo-kernel-6.4.3-1.ppc64le.gpkg.tar 64614400 BLAKE2B eeb487f9d02313f8b4ec5d031a862e5211801fffab22fd85dfc2c71be09096151187bd16c6b423d6cf541e4825a9afcb2fb8b3853f1ff2fd6a03d0b66a73ecfb SHA512 c3d29660fbf26a10fdfadd64c6b4865cb0597aa5a6ea89ae5e63e8e96dfb605da56ea7ae6fdb6fb1da54f77a8d476c1edccd015691eb77797b13b5801178b2c4

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.39.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.39.ebuild
new file mode 100644
index 000000000000..83c6a5e4fa8f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.39.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=${PF/-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/~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}.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
+}