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

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

commit:     1048bd0adc44e92d1355e3b9c5ad639de50d8579
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 22 19:30:08 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 22 19:58:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1048bd0a

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 5912f12a53ef..74ba7a642026 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.15-107.base.tar.xz 4209440 BLAKE2B 48fcb9a837d9f13ffa96194e2ec
 DIST genpatches-5.15-107.extras.tar.xz 3932 BLAKE2B 59b1279051d08009a8c6e15c5083d7056f7eab8b5beed72dd3421631e9730c7306ce7cae8c3c82f508db261c2a4b2076a2c6c7d3a5fe98419b240e87a0d1e636 SHA512 8897cf7b1d42fcb4a0a87417913c624dbc65b9ce5689dee3998b65cba54659e7ecea759c97f4993dca4b928fe7844e025aa8dbe54f5ca492d8f858fdeb9ba3d9
 DIST genpatches-5.15-108.base.tar.xz 4254892 BLAKE2B 9c13ebe3e3bec8bd90260432b8cfdcebbdbdeeb00d74a852a4dfc97fbcb3358c581ec38f50e03e1426c0d81afe469618015486f3edcf0d2fd4a3a7b31ab59f75 SHA512 2f259065760edb240ddbc43634f8db2e7cd6e399a2d3afa3e2f49219152e255c58a30ef27562e9b0ffb380f40fac16b327bf261be741ec851d3c2d562626ed5d
 DIST genpatches-5.15-108.extras.tar.xz 3928 BLAKE2B 544d4db829812206b568ef6167907b94515c69b2082954c1e842180f29b58792369bb40e1f62e6c882f9f6a805eba82cbd69ddcf0c1b8c11208f9013e68386ba SHA512 9006fedf585cafb238b0597b3892b549a4574d4188c1f8d2773dcb84ea62bb1511071a8649191a41f07132c74ada13f2753b23f72ff957899d0c7fbd3c1c4cb5
+DIST genpatches-5.15-109.base.tar.xz 4279692 BLAKE2B c9e7ad56a99a9d9fa3ba2553e35ea87b6a8458f370a88c630104ea6f6c7a08b9c3ad1f2b27ac5198467fb90b5fbacdec6422557715bf6fef60488ca4ff2df2cb SHA512 f426d1e2021f80af5fcd705a289abf22c53a4d79faee620889a4ee3edf6ff1e5f07c5a04e26f74c6f18010446e2bac50f2f7eb96e951b4dc1b2f77cd3ff65d25
+DIST genpatches-5.15-109.extras.tar.xz 3932 BLAKE2B 7a89a0a5ff1f85d4d734dd363497d68032290a762f68c65f1648374a01b94c1890b6c60aed8aac8af5b191d63db586b0f7a7a0e581e8698e0d944582f026a42d SHA512 fce3e5cedfd3761eb768613d7a1583ee230030f214b939afb49797014abe51145c564ab39de330340d97d6ab0abb3abf645ef94cc6ffaa886d27957aa7c4fbd6
 DIST genpatches-5.15-98.base.tar.xz 4003192 BLAKE2B 79d4fb60a5192137571109ffaefdfba23ac589102539cdde89046f627f39e65a52a44a83607232b499509b8bb4c341e2fd26ae971587c9574d4ac87d8b220893 SHA512 946a7638d19d5fd610075520e529a6c5a47aaa433b7986493f62571a7dc541278013a5006bf1e745496e4eb98de44af56f61d23679c139a719a8d5bc20c9e734
 DIST genpatches-5.15-98.extras.tar.xz 3932 BLAKE2B 4e5dd4f8ba6d14764a6546cf7e64dffb3ddcc77678b7d96d2498917f30561792c904c635b0fce7191b7c0c65549fa769e89befffbea5e53a3cef64c673937c20 SHA512 337d95159432cba3b85511cf80c350a8a2f67c65b72a90b26ddc98c01d2d8de70d9b6067e0573c5c339a5bf64973d10c06b42001ee19a7add3d672e4577d0622
 DIST genpatches-5.4-236.base.tar.xz 5467512 BLAKE2B 5c2ec5abee963eda0373e04d4f0da94d7e49b7a1fdc05f7a2f7cafba61771124503f1294289f79629afb62075855c176887f525a95a73bef4247b57915dd4877 SHA512 0a3ba2742ab21407ccc9060f37d528cdbe64dade85927aa1908613221973f14765a78ef6a71e157a71defcf1ee9158ffa1c2e7c082f508fc1140792e2311a073
@@ -62,6 +64,10 @@ DIST gentoo-kernel-5.15.103-1.amd64.gpkg.tar 69632000 BLAKE2B 868bfe44cb45e1631f
 DIST gentoo-kernel-5.15.103-1.arm64.gpkg.tar 62576640 BLAKE2B 44a4c1e32cb409d3a8df8e40c3714634558187b4cf197513e1fce46293c463c36fcf2c39134309d425e5f14135af36c3e8e6d4796c0f44d3b28e7792f94892d9 SHA512 dbab04ae6b9ff38a76f15fdf96aa4bb50ddca7a27f70cf648d73f2073cb939bc8cc89bdacbe8c96cd0ab58e0eb469cc082ceb80110a390ca4d6d0979f29a5d14
 DIST gentoo-kernel-5.15.103-1.ppc64le.gpkg.tar 57108480 BLAKE2B 4d4dca697f57858dde3b136f1a86995f98786e50b60a9ae7a808156f7c31209c70a75847bea6714e395d4de5a2bdc9dc60283e118cbe266644e6f0ce1cf6cfad SHA512 df583612064b049391cdecd2b57c642786bb7759580c3a2f89c02a9847fdd0c0ba2b9305af8a7ae15ce2fadc608ec072efc781cf73c7de201d8f6d3a7288d295
 DIST gentoo-kernel-5.15.103-1.x86.gpkg.tar 59176960 BLAKE2B 5a310c42fcfd81fd0ad4630dc0aca2623966176833e47bbe448234c6289ab22b3973373f6d28ddcf2fe8721965ef3979bdc9da268f348288fe6ff6efc764bd98 SHA512 d624ab43f9f79b620d34591051749293ff03ebd2aa218f60552bdece75fcd7038c0e5f61f8f8d7d8ac72fb3b9506df0b7fa1caf24b85fb4a1f23aa9d5941fb90
+DIST gentoo-kernel-5.15.104-1.amd64.gpkg.tar 69652480 BLAKE2B f0b8f76d5923139400bba21c59aa4329fba56941a7ff9942100d8c483c57b938dcb7c6783dc4855d2e1f38e928779dc97f79b5dc94bd3b573c64b3c726888bf4 SHA512 0ee6ed977e21276f902664074e58f1cd5fd710cebdaf80b5328fe573674c7f067dd7573f2a02a42fd600e6f9e5a5c330c6507a6935e466efeccf7de441b1d6d1
+DIST gentoo-kernel-5.15.104-1.arm64.gpkg.tar 62586880 BLAKE2B cd150048f063159d29880fd799f6be13e4364887544caa00d8a97a5a290e394454555763762f767be5eeb550fd17a19ad20e0e140d20a47878829031b7f27553 SHA512 76ffc31120419c744cd976a2f00bb63a22f42832541cde96eaf23be4fdbae6fdd4472100700deaf0f766fdfded41b4e978e2d25d210c7ad5ee7c31c77c082aee
+DIST gentoo-kernel-5.15.104-1.ppc64le.gpkg.tar 57098240 BLAKE2B e4d326e3dbe06da57132127899533b0e57c816ebfff1ce734b167017a646bc10017f9b7cd91c94fc07b206d30487eb7d918a33ed9e73e8144530f61300e3003c SHA512 d0d1da55ef7567b89d1c823f20e65c77100c6e3d7f1e5c90c8ecf98a00c75fdb1e42dd47254989ca7ff8f05ddde2b281cd656d835b5c8c70fb8c481e8206ff16
+DIST gentoo-kernel-5.15.104-1.x86.gpkg.tar 59187200 BLAKE2B 59f8bb328302103746d7fc582a53d9e3e29d0c57d47a748780faf44944b6809723ac14bf3172f6e11512602de098ddc248784572ca345f54e75b01e511e0a14b SHA512 52d9137a910ffb1b02907b0decdd6fd33e821d6e1e5d3d33591b20ec0472d90dffe90132071638f16038b4b00f7d6c3378741f9061b7d4ebf7c6888e5966b1ea
 DIST gentoo-kernel-5.15.94-1.amd64.gpkg.tar 69591040 BLAKE2B d8659c0584ae851b05d933fed2a94f05eb8c93591b07ae77b8160d397fcf69d2ea8819cbdeecd294d3238377a4450789c653012a9e50223ab98aa5a229a98f11 SHA512 72bdc70aa6c8e51b1896b5872d9bea372305866509a34fc4ac99cd88b01d191041d02c18a0499b03d119b79499825eb97d105460968ac96848274b8fb8175f13
 DIST gentoo-kernel-5.15.94-1.arm64.gpkg.tar 62556160 BLAKE2B fc2122980f798c1313913adf8a28436906ccdd7bb565166ffc5039fa66360b2a7ff1c2e97d579c85cce4dfa6fb471f92d973991998fd4b2a2637adda55130921 SHA512 9f8566bba0bde6ede619a9379e8acae7d3cb1364c888509755cabf0c64daaf3d93ff0085102a2301b0d5c38aceed44e609947099ea9d9d32edb1f04e3b0ae54f
 DIST gentoo-kernel-5.15.94-1.ppc64le.gpkg.tar 57088000 BLAKE2B c5533a6a4842a765346270addc6ff1590ad60ac5df94be8ac0b3209098ee058e09d54d61d8c639bc09e652cb38b179257b62eb33343adad53d5c7d076c5b852e SHA512 4c4385f4b4a2776e67c95d1be5f59c1f00e312dcab740a07344a9118716f574f97064032c93e7b1c4ef97b9ce29efcfbae598297674f4768c09b787b5630db4e

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