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

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

commit:     e936b09a1ae09b2bf0bf50f2361f7b2d8103c2bf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 15:34:47 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 15:45:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e936b09a

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   7 ++
 .../gentoo-kernel-bin-6.1.1.ebuild                 | 127 +++++++++++++++++++++
 2 files changed, 134 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 5dc149dc73f1..f02657255da8 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-6.0-14.base.tar.xz 701288 BLAKE2B ae3560178c3b887050f51e7bafd837
 DIST genpatches-6.0-14.extras.tar.xz 3804 BLAKE2B c12099272fc09f02aae38288969f12057092c6867728080744914ea7c9f41bcc0f80154afd7de2f68180e2d3f7f66899d2a8523ea0bc9850516110781339ec2f SHA512 a639231941c13bea32e4c5ce4f56d6dff2b56a164af8481861f4ed3bbe90d406e2d1eb4242b4ae5db9ff735924e75c2241edb372ec9e6a9a3a0df7a99fca2e4d
 DIST genpatches-6.0-15.base.tar.xz 709204 BLAKE2B cba74ce5f9a6d8a00991f87fe33771f615640c8c3adaee94432580f5df51cb2a488794a376c9355d568ab4b3014fe23e4c9fb000bb9ed6948b4225211df862d6 SHA512 64d5d04b8c1b3c3967fd22cfd975b7f9bbf37e7d7d4e966c7017b589837cfa02200a80880f13ac52942fd845c9835143d809817f5517c91992e30e101b15c775
 DIST genpatches-6.0-15.extras.tar.xz 3804 BLAKE2B 84856863ba0897a7ac9238094fec3d46a39cfed7db81d1021b236fcf0bbd4bd893ba44af4ddcc9ae955ab66424afd70ead4fa714a1b68e11d7e66539f94a6cf5 SHA512 7e49da632e9bf5a78c80a0817708e571452f92a99fa91daca8495282fd0ed955bb16a5fb57ebbfff68e9fe6733655c4d04967c6931d1acf6dc6102a44bd9b04f
+DIST genpatches-6.1-2.base.tar.xz 15048 BLAKE2B 84d1f7b4cb2c13e70b0d542853856f05de48739400f66253fd277167144ae0c259579e539d43ce65d2ee206a2820ec2ef288d9296c68a4dbd674c43d378102b9 SHA512 e349b8b535e8ab9f70cd01c513480cf75bd10dd2f2d5ef15f97734ecc9e481f137dc1cfa4c50f8a1a2f3549bf0142f83f7224603f881e66af130cbe1f8023496
+DIST genpatches-6.1-2.extras.tar.xz 3808 BLAKE2B 70f549904446897e8f955146dba039b43681e03e0d72049e35473ac6ff5d05a1a72c124d410fdfe065d5652c0f0312c6eb4907afbb475e3cd9828c3f0edb6fa2 SHA512 9f92c3b899a8b106649003acccd33cb3cfaf9838ec421998d3b587893b2e6705068fdc0ff7b52ae78203dc793b6064742b721e68bb1e8d7160c48b419062448a
 DIST gentoo-kernel-5.10.159-1.amd64.gpkg.tar 66498560 BLAKE2B 5efc48f3421b994563e3ce18b030f3efa35cacd2bde2387b533b79c46ca94bd23d8bb60df76f7692457a5a5ec6e550dc68182059dd98758953fe28a0a76e6cb2 SHA512 ca0377adad52d0c64f3762bdc7dd749cb1733221fd0b711397dfc1323d307e216dcf0ab66053fd58c0b70a6696f2b1bab47b220670cc3268625d609da0bf233b
 DIST gentoo-kernel-5.10.159-1.arm64.gpkg.tar 59658240 BLAKE2B d827003d70911c5517bd4f95cab3db91933dabc4d6361daadab7e4ed394b43d7eafbe3934e641d89321b28eb6fa15ba162eff6100f9a8f1c12951a6ac331b35b SHA512 2584f568f0191d417e1366b815ac57e2e35636fdaf50e6bc1281552e1cf1c61d1efdd31f3f2c3e00f6ec062a97b940c2421eff51ab948e8f73134fbd03f5f926
 DIST gentoo-kernel-5.10.159-1.ppc64le.gpkg.tar 55019520 BLAKE2B 77d2850555df170f737d23fd5ea09ee6782be404d25c69fe52ab8dcecb26ce2be96c8d43bba5e70e666fbe103a23b209b355601410cdeb12d688698a22c6d259 SHA512 15c4a7281db9f86ea4bcfdf734429b5a182db1381fd1df75799140f4a2d341888cd9fe0ba1507b2810a329f1ed2c8f659264d25920628cbe5c8674adc87c2369
@@ -64,7 +66,12 @@ DIST gentoo-kernel-6.0.15-1.amd64.gpkg.tar 75919360 BLAKE2B f48ea878985b13fdf57e
 DIST gentoo-kernel-6.0.15-1.arm64.gpkg.tar 68833280 BLAKE2B 770752caf91164ce5a84c146de9756150b64459c0ab13801bf540be80857c5b181d1f2438812e7063c4f8b65dbcd795d12ef9f521a679f56e96233ad90d2c20f SHA512 2641b8f0793f710cb08ff3b1076c7fc68e83720a80dd84ab2ab8744d5c47ef0218cf8f4f01411eb6f2379177b798e59708e5e726d4cb345894bbb1fa7d248aa8
 DIST gentoo-kernel-6.0.15-1.ppc64le.gpkg.tar 62156800 BLAKE2B e9e0e2f559ca57a51d0cc4f17278fdb70415e514eb7e816c351736bfc4e65f5212245cd3547c0dc2195419441484e4c2f35ece975472a28b569b880d9e41a679 SHA512 4af5fdd89ad8171990f4b7c0b6dfddea43a5e021a26f93058760c631f6ded682572482265f12c42be23fb389cc88215ac7b2d34e2278df86ffa86487528f258c
 DIST gentoo-kernel-6.0.15-1.x86.gpkg.tar 65320960 BLAKE2B aca1cb512c6445572b844e7c02243275e5bd8863d62b1b42dc2d7ffdd0197fe24c05e6319aec18e591ed7e99cfae7aecd4b76b54ce76ed4879c5eb05d8ca7c1c SHA512 9230759155e81b24dc8f2cb47ea7a6524a6598276c1b9f53509a83385d687c321b8eb5116fc4334f36dc8d20ef491c7b3e93454bf3b6e7df711be5a3947f9bc5
+DIST gentoo-kernel-6.1.1-1.amd64.gpkg.tar 76697600 BLAKE2B 77999e02b8fdf5b4071ece990aed1044557ca87ed2999a94017319094c708d87af7ccdc2d784782f9a950c52660fd2663b2b2d336e94a6b0e351de53e9b28d15 SHA512 26c99f5cb710273a6bea1160ba13a01eafba3e7f0f911cb358aaa9f97e6f570ed423152e9bf310aeeb761652652bedec961e8ff5cf9fc589cd41b29dde93d389
+DIST gentoo-kernel-6.1.1-1.arm64.gpkg.tar 69304320 BLAKE2B 2bf8beea4688e5618cc60342fc202ccd4ef5995495768de73276e078260054070d085923afb79e006204b6cdf4505afbfac1ca7c305cb907d63a110909dc52f7 SHA512 d9e6aacf0c861b2febfbb5f00993de78cb8d4bcf743f1b45243c18e19a6785bfc661d2554dccf717fb3df841127ee38a9879274d3ab9f4b29fdeb23f9e5d856f
+DIST gentoo-kernel-6.1.1-1.ppc64le.gpkg.tar 62709760 BLAKE2B 9339668dfadc464ed02b86b69a23d30f4a20ec4e5cb6932c50707db66ef8713b94f8e11a5af0bd110c698d9702030c1983da3acc939afa6eb439205c8cf09ab0 SHA512 6e7416e48a82a902b9fe0f6b642e73552964e6fd615a9e53efc9e2d5bc85d29f18f0fd71ba2b7da883fc431878f9503226676f1bd1c8d06cdad4558815eb7948
+DIST gentoo-kernel-6.1.1-1.x86.gpkg.tar 65914880 BLAKE2B f7b6ca3bfa7c63c51fd3ac2678fcee76fe9649e3301d38a09c4f90ab6b9663c7bcf46b9c3ec6efb4319f4091f5526746d2e034d57887e826bf1d45f74d52e30d SHA512 433bcd0b29eb5688b27cf1649d9239df6807a76faaa7707b54f2b9185143ced429b897a026c2da01638746ebd56fcfb05b917bd015807cac8151559eb7814f8d
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
+DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.1.ebuild
new file mode 100644
index 000000000000..87c9891fee64
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2022 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##*.} + 1 ))
+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 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
+}