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

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

commit:     ae62d0ffe55666dbfa86c881486998d9cde8e53b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 16:12:07 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 16:21:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae62d0ff

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index b69eb8cf7944..5c6bd3a65301 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.4-234.base.tar.xz 5429360 BLAKE2B 48e1199775c5174a4e25f9611f41
 DIST genpatches-5.4-234.extras.tar.xz 1812 BLAKE2B 7f95873ce78883b4bb1e4d7769688565c5b5574e86417a8f11d822fe5d971f7e0948a08e83af6a35c0cd8d52cdd5fbfb5fa3abf03c233fa3711b3fdf19fa3dda SHA512 2e49f3f75089ed6ff55c007529218b5b68712e64785cb06dcd5b0f1276a3fe3b6a2ebe2f807b586f954698bfd2c73554a462ee592e89b234e6d25c614ecfcf49
 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
+DIST genpatches-6.1-9.extras.tar.xz 3804 BLAKE2B e11fdd580ac842fdb0c947ac39afbbf09ba041adf25cbb8dd2ca5f648ea963bbb42b07f062fe8615daca8c3252423c99f69efbb80a6d22e58b963636f620b58c SHA512 8e21b5a9f17b41ebf8a107482f1a720d5e5c625046345ad71a4ca9d1f43e59e0fb8e7df1fbdc4777eec118d670d73d8ed3a3ea2e180f46c44bd828f46eaa8a1a
 DIST gentoo-kernel-5.10.163-1.amd64.gpkg.tar 66539520 BLAKE2B db354db6d769696f6f708f3329420dcb304954f71c76401594c4c2b02e60d5e3f271d1e4531dc49a267835743eb7441ced1981cf0ef00b0adca30aea1f562595 SHA512 7ca27b561405a5247fa05ec969705f2efa3fe315255aa745ca412c9231b4ec267ea129984aa63d718b2a574cb103a996e83fdd43ed468076db49736ebf12aca9
 DIST gentoo-kernel-5.10.163-1.arm64.gpkg.tar 59668480 BLAKE2B c75893bcc35fb0102c718a1848c1973795d9cfa54ce4b203c0461409e65e6c1eebacbb554a0c859c35c8f87a2a9b33dc2ac5d72859fdc8769e1e64db2efd89b9 SHA512 1db8b0d5b5309755be331d4dad233c02afd6bd82a1b7613e10101a9e8d077299ee967f6e007b11f815a496f1733879cd61f88a861e43623521c1bc8b69512364
 DIST gentoo-kernel-5.10.163-1.ppc64le.gpkg.tar 55029760 BLAKE2B 612963d75e798c2e2e295d7d4e00fd6fd15cf494aca11ee59926cbcbcad5f0a945bb263cb2155eb138fa0195cf85a489e44d1aca0cbe32d5d1ed42d8401eaa6b SHA512 215dd62c513394a4b78f6cf57f4706a71daf4a06b76c83f113b6e357a2f0cddb3a8e46324a520312918c31d5a05d0af260cc4265ea81d339f1b494b2b6c1e3fc
@@ -40,6 +42,10 @@ DIST gentoo-kernel-6.1.6-1.amd64.gpkg.tar 76738560 BLAKE2B 24d6d3f29b4323d3ff080
 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
 DIST gentoo-kernel-6.1.6-1.x86.gpkg.tar 65976320 BLAKE2B f1eb2845fc24c35e5f922dd34181d732317ed8adb853816118c85baa8ff315a9d219b4296062341386c3bc283ac119e05753d3d723d92c206b527d34bb1dd6ba SHA512 4f59cf63d90fc8ad3d1bfa846a51e8218c52109de138e5b24ce91d6eb27c82e3e2f9417e74990e48571dc559639edf8ff5d742d5b4d67d31a804447cba184c53
+DIST gentoo-kernel-6.1.7-1.amd64.gpkg.tar 76738560 BLAKE2B d7a4b75443ba3c93ca390940b8245ae77eb6d50b854019535e51030e9dd045d874bf6209eccda070fea9d9e0b1df0ec33728a092b1fed2ab0d404b39b0f0ae7f SHA512 6d0e2f6d13152242b49dee71ed07da7f4a866fd2d678e0c4707aab24e47d9ddbcb7efc599cb4f44c2fda3d649d1bc6aca5da986a3645cffbf9867f310fe748b5
+DIST gentoo-kernel-6.1.7-1.arm64.gpkg.tar 69324800 BLAKE2B 56bcfa90284dba80f6a3680c84d0eaf7435e9df7aee6aec742f5da8451c815c1c4ecc129806b242be7890433cc6ed13fd43376d75e20f04b983c881347d895b0 SHA512 86896c3f753e95fb85f79ff9889c03130e159d45aab0d2b07493ed72fc3cd128d5cdcb09523213e34088ffe15acb04519ec14fe8860825197deae6af13764927
+DIST gentoo-kernel-6.1.7-1.ppc64le.gpkg.tar 62730240 BLAKE2B bb32818d7444c4deae906c20ecb1dd07fffbd87b1f4cb3a4a91fedd0b092ee0f1ef8abab7699de8ac7ac4a9d95ab3f2cccd5cbfe09d2cfd96270d57120e4c12b SHA512 5e51cda5c7c9955cc686db2c698d4e2d02721c8c6f3b5c4310e6956d826397885bd0dde817fdc29c8fa0971105cb8fbe04c0746dda9dc28c68e20b5a340d85d4
+DIST gentoo-kernel-6.1.7-1.x86.gpkg.tar 65976320 BLAKE2B e55d1acd0eca8133df63cac4b0bb5da24b9d2ed5de642197a830289f8158c464663003d6a98c4da40063af422ac23b3cf328ac29835865b663d8ffdfaa696f56 SHA512 2bca652e54f6ed44ecebc896ab5e05f325187b3cdd796be08c41e3b7f8b36450039bb9d67e0dc41015a8ec4b244e19ea6ffa660ac1a59cea31b93abda8b53e67
 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

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