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

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

commit:     635cc6a9a727bbcb9bfc38339ff4c7be2453c84a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  1 22:03:30 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec  1 22:21:31 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=635cc6a9

sys-kernel/gentoo-kernel-bin: Bump to 5.15.140-r1

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 32d0ebea0c42..8812945d5145 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.15-145.base.tar.xz 5716840 BLAKE2B ab0ea42db784aed619fbbce1600
 DIST genpatches-5.15-145.extras.tar.xz 3936 BLAKE2B 3e0d75d0029aa817b3e7f184b34150adaf337c05f37122a46290b24d4769a1ff1b5fd82adc2a50b09f2b0be235ea9f4f06a4c3111dc68cf2acccae1bd39a0d67 SHA512 4f3e94e59bffcf5a9f6f7ca98c34c7302ad843860532e6022f6ba33d1d9c1a89b3dba606ec771ccbf063f01808fc51b9a1162dd8aadbf898d17759488a04ef5d
 DIST genpatches-5.15-146.base.tar.xz 5787940 BLAKE2B 7926adb4f543d2cdc99a4ea1340d58599cae1ddc14c6d0b21701700b6d63dfc8814714c964bd955d86d42600697c5a45b8fdc6d26eee7ecd21a627e20c230025 SHA512 c3354b3b5a9ac108ad8a6ec2db9d69e6633bbe464976cd9bf0c91f3953891b1ebd8b501d4318161849cee4a3040b61c711f8def3cd66f4a2c5aa03ffa3e7db54
 DIST genpatches-5.15-146.extras.tar.xz 3940 BLAKE2B 4eefeda553205910fbcf214be699eb3ef7e99fd6d5693f50338262e99a5f0fbdd42321171aa29e18792af5de5e86d45cbdf538537b0bb4282695fd5b07414e87 SHA512 8855066d40f32931f768588c0f660fdc216f2a4b8a1bb17fadb7c2589e0764c846cfce70499af429b048bb514e51ca89e88c4319fb56d3ff5636baf0e638aedc
+DIST genpatches-5.15-149.base.tar.xz 5788128 BLAKE2B e8ffa65bf991542507f5c890ce96f9cf2a82fe4e4f996cc3fbf38d744c231f1d6c05d337bd31777dae9ff6b6b354f99d338262fc7ee479ad11f0bbce8be42c14 SHA512 afb377cb6ef87b9a23a6023d7832fc97928809a45ca01ec2cecafa370466a7eec5ee5553285a3b1477d0e48c8746b7cb61c23f619f5ab3566132f9e575ba131b
+DIST genpatches-5.15-149.extras.tar.xz 3936 BLAKE2B de630fc5c43b2fa8cf63faf881c8949a07fa3adbf50b2b11b1e390835b89fdd04c28ca18c097d35164705527e97aa4750c58e7ed29e92248e9cf45f6f4154fbf SHA512 25a85e0bdbfbbe10e0576445032ee49e3845beb83291d10352409da14a612e0c48779e4635003752c9e0befddaa577d2e58d703452e7b40de7ac042cc840f612
 DIST genpatches-6.1-67.base.tar.xz 3816044 BLAKE2B 9116263f1f3cbb472ad09ad785eb643cc4deb16f94936196c1dbb3d500b6e20447d07d434f4fbc59fe8cfc03076da0aa0ec22a3c6d93e09d0dfed6d6fdfe7add SHA512 609935fec85285a34e4fa6032f552230aeb7aed1caa867d34810a25f68c2295e0a8f886e0a093f111b1623ba364cfd6e17b237d670d42c8c539778810a02f681
 DIST genpatches-6.1-67.extras.tar.xz 3816 BLAKE2B 6aa8e9614221c2b9d84df9f75e5b8eb530ae8752b406ad698be86a8031b47940f9efb1de9bedfa0e466d0bad32dae60c5c639815785353a49e4b439de79a80ef SHA512 a911476dcfa9767f4adb946bcdcbe475e78f83753a7880a7e3a96aed347f1ec520ba8d75fe4e5565b2aded25965cecd3c7f79fa12009af043f7408200e27189a
 DIST genpatches-6.1-68.base.tar.xz 3834732 BLAKE2B 3fc3dd48708491bf32a17cbb8c23e531e2b95e60ebcbe3faa6fbe2c60e610aad9226d1846774ddd2af56e985371780e10a249a50e2ac46d7e482428f67b289d9 SHA512 28b810ad914e12035ef724f7dc4b3cc6226cccad4997804a9e3ba5a4f4a420f5f397eade002dd7a9231efc2b0c1850c40c44bf5daa358c24e42bb50da05141d8
@@ -70,6 +72,10 @@ DIST gentoo-kernel-5.15.140-1.amd64.gpkg.tar 66304000 BLAKE2B 70008482e1945ffb67
 DIST gentoo-kernel-5.15.140-1.arm64.gpkg.tar 59719680 BLAKE2B dea47e0e3c47ffb71a8a3afdc1644fe9de8d1a83eacf3d73411a9f18ddf605655e1ca91587a3e4da18dffab5638cdb3ebac4343bb0ca1202def45b7aa51a5a20 SHA512 628234a39e3c64182309a202c0406242c6abaf7bc64bebd998bdf887abfb63ba9dac4087c9526e23e56eb25f557df96b7e8dcae3a2da2085a1f6d399ba7ed922
 DIST gentoo-kernel-5.15.140-1.ppc64le.gpkg.tar 54947840 BLAKE2B 141d27d3d46c84370822abeadff59d537b37ae870ddfba435522b1bfd550c92ca748aa12c443d2f7012d816c44c501561513818fde4365e798e9a6f0ccd93457 SHA512 5ce907cae5e4b37d862204e4e17ef5149cb822ebba4ac161b545e6ddf2d1cd10a345893365a35186220ad180028288424d719427bb0c88a0f791f5a266a592c0
 DIST gentoo-kernel-5.15.140-1.x86.gpkg.tar 56043520 BLAKE2B 507e1207138190c5e9ac3a4df882f36f10a8189c98c8cce85c292edae767c81c32f3a570cb20958d6202aa49a75587d703a59cb53c7fee9a52577e89a427748b SHA512 088ccb30235c396564b33628c702cdc31c2a1972cb06842af854a6679031190ee2aad73114782c467a276d5538e3da94677b692a962f33315a92b743c54de9b6
+DIST gentoo-kernel-5.15.140-r1-1.amd64.gpkg.tar 66293760 BLAKE2B 81bbad71e18fff4c041ab8fad11210d1e76a4981312386f98d3749b4dc72d9857840e1ae9eaf4faac2bdb64c3344a51e7584aa2ffb700df11193c83dc30aca4a SHA512 e7b3d55f783c7be949fc5c8d45a3afe67774e1f362a5a84567fd4c67cd9864b9d0a86bad17e9698715da31d362de6c6138493c044c9f9c6de5bb7317400d487c
+DIST gentoo-kernel-5.15.140-r1-1.arm64.gpkg.tar 59719680 BLAKE2B 5ffb5e8f60b99f0ed293eecc3188086dead291f91af09f79ea9b9073009182f8e935390b955e7627d95b2bbfce6936b30329dd42321681471bcec9d153b5e370 SHA512 3a5dabefc392e7fe088201075e87ccd4324c7589bd766108d3ff2a512e905fe9bb4d1d9019988b5e7b50276fab02883c8adba8762929de7edd3dac2ce64b02f8
+DIST gentoo-kernel-5.15.140-r1-1.ppc64le.gpkg.tar 54947840 BLAKE2B 51939635be424b9fe48b7a5ceaa9618d52d5565f186c65ff59009f110fb86469afc62b15fcc5b9c32fe8dfd657fe976ee28f72600dbbdadaedf1e42c3d84aa6e SHA512 0214070ba02dcc2aa4683224212ec5744d73b1963f3139d736dac4feb22b1c38017c77d8ddef4c834b20d8456c697d06cb20a195e8ee8f65b7baf12fdf48a4c7
+DIST gentoo-kernel-5.15.140-r1-1.x86.gpkg.tar 56053760 BLAKE2B 31bead20341a6900c4aaaa234509de41e93b53eec2ec93be93434c2242895856f541aa37c211991511d5f15cd2356ba9c9db30b2e16ff3a3204dcd37a20ccbd9 SHA512 bb731e39dd760528e5feb521fde98e8af9a089e2dafca7547eed0ec82f861523680628bac6da5fa803b155096fdc4dfdc8500cbfe49eedb1cf75617ea74fe44b
 DIST gentoo-kernel-6.1.60-1.amd64.gpkg.tar 72581120 BLAKE2B 3053a4c8707436c3f47921d9b438f4c2c59d0a6a53a9aa68cef873152da6c959027c113e077c8281a2143e7d7aba4113593e4513f4b9e0d842d08432e7e3aa0f SHA512 89163f836e1675fbf78c75cf83c7a8e4845d6233e55c40f194f46fd53dd43aaf2f2a797689481dff835cb2d5fb57b36be7ef94c8c3b497badba31166f4d474c1
 DIST gentoo-kernel-6.1.60-1.arm64.gpkg.tar 65576960 BLAKE2B 77a2d1fe197186620cf9cf6d66eb11e7a1ad72a4ce26783f686f42ddbe18005d38ac98be3ff9369535a9c0c346536325b23cd037e35d24f25a1f58cb26fa828e SHA512 9942ca4c56a3d813f9e38b91b2b1cde6f53e506e7deadcd5f772da008ac658ba5ea0ecce546ce45eadf7008b9dabd8bc09f9c1d046c83ca2632b29a87fe99311
 DIST gentoo-kernel-6.1.60-1.ppc64le.gpkg.tar 59842560 BLAKE2B 6da8e5e5e35f3ceb8bf47ddf6053396d920f484b944dccf344ea102b3ff322a6180b5e1c0948dd47bdc57a0e5b5ed10628a47c59434dac736f44dc5fae07e9bb SHA512 2967b93cf94b77a40d5cf190fd0db855ff15e15d18ac63ea3831cc10b865238c62208ceb68def7681e604b5beef20ac860738eb6e8a2c2421a565156cc97ec82

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