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

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

commit:     a066df85d5245b9e6d443078c86a4f447f167d99
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 18:07:53 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 18:16:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a066df85

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 9ab4c30b19d1..90eaa592e7ad 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -32,6 +32,8 @@ DIST genpatches-6.1-11.base.tar.xz 672088 BLAKE2B 29cabedf32ea3f8cb1ca75bde23955
 DIST genpatches-6.1-11.extras.tar.xz 3804 BLAKE2B 9ecd609350e0ad98aedd70e1bd6838fd2d933576dd2236bc111c13b46623adba926bb1547349a1e9e35f3e90e0ef0b29fdc10bd38e3c4c5aeb3cf92b2cef9ff6 SHA512 f8aa9ac57c51f229a8a940ca57b401ca7c5b46cf40cbc1ccb427b341082c2f52e5cd945c548b2fe809935ffb94d4c8275fa4011510239d38ae13b338d568253e
 DIST genpatches-6.1-12.base.tar.xz 678732 BLAKE2B acc67136abb35e0d9985bb55002467e9d29797bcd560306511a58093ef56f86251531e54ff615dc3fee71f99633dfc372ad7bbe5a1ec2ff03d9fc23be5de04a8 SHA512 83fb419934c6314dc700f5bc9eaadf1909fbbd45dbb0e86269d942ba7f18162cbacf0acaff705144c271eb29b57c3a8027af03a73485dc887f551c002033326c
 DIST genpatches-6.1-12.extras.tar.xz 3804 BLAKE2B 59da490e3869e0b9c715453837cdae6d40b67156c966166e4d6f809e115eb9f621668a46f2632bd5eed894cdacaa5e85d26a5ef0467f95fcdeb3da3f9319a1da SHA512 d62321a73145f6275753245cad5d55b06e5fac89c7c7ed613a376c21181644e88bda7d3f7ee6f54c686bb0e534f6fdba3fdef8c9bcb06f15117276253b3a7e36
+DIST genpatches-6.1-13.base.tar.xz 739612 BLAKE2B 733d2ae5d8da2f92ea2acb01ef40b5bb49e621d80c5f2602790a0bcda197a52ac998374979d20347e545a70b8b8737365b3d9c2850ff8b24543dcefb6ce17641 SHA512 0b5495622526072e8dc7d3e5d81071340a133857c9e13afd128495809cdc7787318c2215fd996131ef050472847f207b074f3a0eec26b0b4aa45df4ef51f6a4c
+DIST genpatches-6.1-13.extras.tar.xz 3808 BLAKE2B 7781c242753f2bebd8f9bab0db85f38372b4b3d7111418f2ca6a027ac056eabfb2cc0f9da84d4befd6f3b5936d9424710e7e802e5c5e51ffddac3fb32505655a SHA512 175422ae5831f7aa07bad768809443da83af46bf2f256f7ea06bae0695899e47cb653f8bff2a3a9346e1b39680b318537e6c17f7851cdcdb8b7ca4f2ae380ca0
 DIST genpatches-6.1-8.base.tar.xz 477364 BLAKE2B 29fa8d45feed6333883e1f4733ace6ed52b5424aeeada3e71917a0e3d85f87a7b99f0863ff468e678ee5631c6e0f0dd7c3a0115a58d80512ac1a27d58a2df149 SHA512 d1f32215ced0ed39cc1c6d224b1a12ae3f80bcc19f1ea23189e853367ebc661c74d17d335bd615c2fc1f3c21271f6f170a35caa38194b2dfd09f78e405739ae0
 DIST genpatches-6.1-8.extras.tar.xz 3808 BLAKE2B af83b01895f1b3af4c0220a89b0dabc3642e578920475402c02dbe0300c520dbc621a2245eb66842addac48565c8b612198138c49491dca7909d594a9d2ef818 SHA512 22f9378bc7b4413d60672656c2e73bfbcc6debd10179a0eb2b523bceb5f3adeacecbd433ede3aa057143163a9cc2971d5023d73ac8187eaad59508dd229feba7
 DIST genpatches-6.1-9.base.tar.xz 544936 BLAKE2B 9152c33c4145f99daff4f436afcb621883d21fb05be5821a045b47be2880250d3ccf1210f3ecec0241ac41f57581da737053b86852760cd11efc524719fd0f6b SHA512 88b6bd131dfe53a51a9a0dab13ef2bfaa4818d4b0ab93e485346f96fe58a64b7338d9aa4483c751d9d1886818ee8700918721037b03f868a3b2cd9d5ecdd7799
@@ -96,6 +98,10 @@ DIST gentoo-kernel-6.1.10-1.amd64.gpkg.tar 76779520 BLAKE2B f5b3dad23778cdfc2092
 DIST gentoo-kernel-6.1.10-1.arm64.gpkg.tar 69447680 BLAKE2B 1217237f5225399146382f08c246f0c90e60f3c4fca41bfecc21203a418cd0d595a9f8e4275b9110efc6d04b6b6929d5a31c94122b72cc5822ae55672f21d4d0 SHA512 b8c94263ba70bce31e1a85784575a9c1086f49a0ed2fb94e230d736e081451df0229643ece9e5c7992949b82cfb32e6a957f99d32182dd89092873bcdf2d6092
 DIST gentoo-kernel-6.1.10-1.ppc64le.gpkg.tar 62781440 BLAKE2B 806bd79abaabcb96fc33ac8d4700d5ad9bc8b86822ec30080530038d4d255110acf1747bbbb665f7abe1fc0d435a5ee530f2c510f9e23ffdfc255a3d07922780 SHA512 dcec07bcd6b888d4204cea847249b9d2b4f16405d79a2e4d21907229274d664fa75be5f438d86f80a772f64cab7e22c5c1fee3f3d33f41f16b63c7aaa4244be6
 DIST gentoo-kernel-6.1.10-1.x86.gpkg.tar 65935360 BLAKE2B 6ae749b92911edc58c15d41b709bb5e554091d21c15ed1fc79806284f310357ba6937c8b7f4262d0e9d33f6cb2c12e18bbe4d006568259df28728a5d0d441a94 SHA512 1fce797eaf1c96488de817d3beec8f6423f21c4ca0c7c85cfc8149be4cd96ee9469c60957aec2a860ddb3eb32a4352ef52a4d7c4bbf2dfe721baf298d451db54
+DIST gentoo-kernel-6.1.11-1.amd64.gpkg.tar 76769280 BLAKE2B e98c3a0b67e653fcb583d7231cc36246cea932d1367bc532b8d0ab168cceaf72cc59b8c5ba34719a03fdb3f2bc7748cd4a1d01fd81d52aca4e5b404f26291bc8 SHA512 06c1a4a2550e6a2a5db13cc1d13eb8eda88b1a677d052fc328855c91ae030e8422580bde69d87989a89cffd6c175f017d29acf6dfe41e6f9e4c3bd74187827cb
+DIST gentoo-kernel-6.1.11-1.arm64.gpkg.tar 69447680 BLAKE2B ee5383800f98cfd6d49142d9df4150879d59422edb155f5f73987d56a0d6a4df98835b727db5e6d7d60dcb68d7aff3336526a45aae955a754bbd1beaa917eeaf SHA512 cd28f939428e97e5756b610b6b280cf644a5e041d6ca6e5702fd0e37f9b823703bfdad9581ec8f0e2b1f5d0282dbcff9bfda3707fc8304dd6bd60cdb30f9e46b
+DIST gentoo-kernel-6.1.11-1.ppc64le.gpkg.tar 62771200 BLAKE2B ab7b9fd269308f3b3c50b3d1c800b3aa2790b08459e744697066f85407af4798063f9a8f3c7150538f6682e16b27706dcec9f66038ee32e48838d7a1fde98fd5 SHA512 7c58a66833649b01208c2884e272f52c9e406327e9a1b2f499f55a61f3892861ddc8786127d401f930d73a4921d7b153334e5e362d4a70a6127fa0d73f85c2e5
+DIST gentoo-kernel-6.1.11-1.x86.gpkg.tar 65955840 BLAKE2B d458564e123fc4d0311f5d737920a848bf58fffbe83367a10627399eafbc0272e1e80b64b08c5298fd161abc7eda0fcdabce743a0d23f5089edb575743ae3513 SHA512 c4daf79d7e1901bb327b205fa5e2d4f9bfed4f3a7e087604cb159d2e2f589e5e0514dd19876297710d1ed1a300f597e2b712e54a245303cb553ebbef0dfb2106
 DIST gentoo-kernel-6.1.6-1.amd64.gpkg.tar 76738560 BLAKE2B 24d6d3f29b4323d3ff080d05c14374f203c7086527402bdc042068e350df9ca596f0dbe07bd985c74326dde5652ca464ed093a9a0fd90ce98862dcc2dda9978e SHA512 26ed6dc543859a9b842e19e08cdd715e48143d7d3af76713fef0e18c12298432b601fbf2eda0c8fa01485492c97db37483634b694ff51cd5a00f2037867ad730
 DIST gentoo-kernel-6.1.6-1.arm64.gpkg.tar 69324800 BLAKE2B afbbd8f02b7127f95d9ca3e14e28d594716d17e472514886e83d4ac4a07e55aa6f1aa905a3328d55eab1b0857b6510ae9c5d2683a24f806136937ffa62e5fe35 SHA512 fcdd7700192661cd8b010389bef50c516f5f47e425c2122b3b2718a815c209ba5c64c54cc88c94dabe0968d65f5f52e8ebaca887ca1b3f741938dae8a384ebc5
 DIST gentoo-kernel-6.1.6-1.ppc64le.gpkg.tar 62730240 BLAKE2B 3a94df5fa51cb826a8501f12dc47deb77ea124ab59272bcb2d4506a137ffb26ef3f0c75d6efa10d08aece61064318642bf40257a7e3fef3766234725ec16e5c8 SHA512 24c267ff67fd980913ac7f7b494224ef46b0d102537ad89ba1a0e08f388a95fe9b4b817a0e9270a187c24d42d7b41f96a2c906079f9c06fb4fbbd8c5dab140f8

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