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

["Sam James" <sam@gentoo.org>]

commit:     67aa0ca2f2e3fb3e489e9b95eada4ab396941ae7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 17 02:53:54 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 17 02:54:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67aa0ca2

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

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 9183f788c828..b1bd342d7630 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -34,6 +34,8 @@ DIST genpatches-6.1-50.base.tar.xz 3084144 BLAKE2B 7b66d8775f85ab8b4c13ca7dd204e
 DIST genpatches-6.1-50.extras.tar.xz 3812 BLAKE2B 0804ac466e90a72d32d843e382f44e6c1d6b362e473c3d1d9f64b848eeb558fcf6d23cb01d560f264498bc6496f46788e62ec982de8d7d00048b6715119eaea9 SHA512 1c1207fc13a76b5d620fea1db9328b1c0912a0aceb9db9076905c1dad4face0d5e345e02834eb1b7343e71c3b134222de40ef2559ff71f05c186683f58d54df0
 DIST genpatches-6.1-51.base.tar.xz 3127240 BLAKE2B 047b00560651226a3514417f10e55603ab2f33429993fb3b567b9424640a413419523f42bcd6175880a6ef87555422a4e8ff94f477cc7c17c52b4bcd0673bcc6 SHA512 a1b252d6e64b8dd907abaa6e827f7da78039181fdb620fb6aae10676a5ebe1d2c9759235d9f71e59f1af5cc553af40d3fd911b236eb2919dbc5b8999f7b86fe1
 DIST genpatches-6.1-51.extras.tar.xz 3808 BLAKE2B 2f188b3f2062d491118bf96735420e63c7ae85467a6789cd00316b133d254677656229f7f4b8d364bf37713a0b8f42f77acb580db0b4eed9c183008074b3eee4 SHA512 984b4c9a7e030e2687ac574dbb743bb40b0b031ca8ac55e1e632018e174a70567e3d94bee85ccac66212458e7772be6d39f119181a7252f9bca662646cb492ff
+DIST genpatches-6.1-52.base.tar.xz 3173368 BLAKE2B 429b5bc3af457d91b9c178737e573d150e337859c0f07a25043c86b834829e749b92c57fa2d80b2acfe9864f916ebe77c830249be23391d6553f5469b1934708 SHA512 0f003893b6c24fa9bb79722d6d83edb25e77fff11a526f86052980ee175d6dd599784cfcc7ad82055de9663a178fb9de38a766cfe61fe17fbde696a5292f023f
+DIST genpatches-6.1-52.extras.tar.xz 3808 BLAKE2B 6a67986309840e14bd4759c0aabb1af5d6b3653660d1a12d8706567470a28b3a56d5a09cbdd3df9068bed7a845206b5a81fca3a1be0ffe7122579d9b3ff63401 SHA512 0476ec7af5906dfd4dd48c96799568f8ed7d24d7d43717979e03a16219b732461e0afc7af1c5a4f528a08c4b5c2c35d249e81be1c6d0f854f7993da2e0c7aad3
 DIST genpatches-6.4-10.base.tar.xz 568848 BLAKE2B d9f28beda8bd4f69e1e5d586e274df43a8661bf51733a25f320469c1e3e42d9602b0911d4e98a40942ff182f076501ce6721e534cb92aefc3d453fc43ee499bb SHA512 218c38f99a07c2be1fb25737b0a9604a9a50fe3f72c507404d92da1e8dd7823142edc2b81110e510aef7e645edefbff2265aeb3ce7f376131801c3adb292b8d0
 DIST genpatches-6.4-10.extras.tar.xz 3696 BLAKE2B fa0b8d593543f3624b1cff626e2cb2dc93ff0e88fd54ec71a7e467c716481420da7f361c1dd353e36111425a74f6632f1c491e618dec47fa4bc15c6a6d9e26bc SHA512 9dbfcd1d65daca0b56360290f0a6369fa007f32dde0f1a62657d1697fb50b84668e8a14c62efcfc3d12ba6a4a911731825df260421506639d2ba9b8764962e87
 DIST genpatches-6.4-11.base.tar.xz 587148 BLAKE2B 19d9f8e9778046dd558bdf21550f300e9c3c74faba6a8778d76e56490f379d615aacf14a930eaa57348638440fcfa6da17d5dd1a1d3020b5544ecac252ee7f08 SHA512 81c854057b1a0119cbae5116090298be72a1c30a0d2eab2cf4f0cc1d4f8476eeebe183401aaffaac92e83d2297d0fb707315254a5f5a77bfb3d8c953d04d448d
@@ -118,6 +120,10 @@ DIST gentoo-kernel-6.1.45-1.amd64.gpkg.tar 76871680 BLAKE2B eaf93fe9b42a39fc106e
 DIST gentoo-kernel-6.1.45-1.arm64.gpkg.tar 69488640 BLAKE2B 23824eee771a903042c263db4ff5eba5526da86cb2ff0109fe872c7dd6923d8ddcab4b5a137c0fa5156900355c1f0484844510f8a44848c878af82d12085a197 SHA512 d4d379da6d6adbbaad13f056218f8a08aa2ec26f4bb2252f2064e8d5034536610f126adf41993db24352ab7ad092dfde4dd7e5746f611b89660d2e07eb0a69f6
 DIST gentoo-kernel-6.1.45-1.ppc64le.gpkg.tar 62842880 BLAKE2B f2f04bfc6f74c336d414216d3d64d30062e65546d0920c0f728fd9392cf7e2479abc0e170cfae02c80f64c5e67e4a72fdf47b65f9998df3230138437cb9c2d2d SHA512 5d0e5a43684f8c5427c691e7a0ebb8ae31896a84075eeac4f76abac9d61514d33fd3feff712bfa202fcabc87226dae7079cb814718b1d78e2918b3eb4f135130
 DIST gentoo-kernel-6.1.45-1.x86.gpkg.tar 66222080 BLAKE2B 876041ea3110354c1b8e512fc35649c45fdef20498e148468bc19e5c4ac3f9e8509e5ea7254cb69daee116ced58a0393607b736fdc1a8255fb5eefd9f71c0a6c SHA512 109c1e2263cb26af158bfac950c10e3d4185c3f85c5e437169c2a980a125ecfebf632c6a0d02ab07bb94a8aeb091682dab682acd070658dfb548652bf411a94d
+DIST gentoo-kernel-6.1.46-1.amd64.gpkg.tar 76861440 BLAKE2B e9d5b7c9017adc5122759190368abfcff3db9e0dba72a091c3f44a3a2495ddbadc464eb4bd9f0a89a7629cda56e33103523f986bf05439c3a9d1c9b57a18728e SHA512 17d55b018b1f196e6dcc11779fb17c02c47a39d6b88fcd86a0f967ad4fd8ec44f55105e1425b8be07750981ec92dd21421a787861f50abba65f590210e0f2e2d
+DIST gentoo-kernel-6.1.46-1.arm64.gpkg.tar 69488640 BLAKE2B a72e190c5455f087b811ad68eb818a67efae7be3a2f7f2dca41c1ad4397c1b5f45db58f02360bf05516b61e871e0f4cdd1daa0c0ea3c3aaa0d40f88673e890af SHA512 ddcba28035f1b084097cfb3b58bb90a37e29d6abe3043d3c5464363da095750a9675e287641fd782da29ee02077bfbaa5ee784f579df09a90b01728b9c697230
+DIST gentoo-kernel-6.1.46-1.ppc64le.gpkg.tar 62832640 BLAKE2B a8e45f7ecde91ed96d440e4261ef00fd7e27d4dc50d5f92d9b530d2d1f6438e010c76caea95e6d5015c617fe71cae541c52cfa747ba7388b4ccafd592373cf75 SHA512 60295b457d4bda5dfdfceb1a28049522238c983ec951eb0b46c42192408574131d82eeff515e97862160050b4b2f77bdd1799458a238d75f724f8d652c1758d0
+DIST gentoo-kernel-6.1.46-1.x86.gpkg.tar 66232320 BLAKE2B 427a224134aba2008d3da27f31f86c060132715c9e1de3f9f77be626d1ebfa3aacf63e891428a755ca81e03a7237099211ba8b9e2959313197394bffb01462f8 SHA512 a5ec7c7148cb650370c73a50b453c99c61920ff06df1b30f67644f6b3b4297866981cef15b88016b8cdfcc97eeaaf91020009be1a8892e0fdcd9b696ac566acc
 DIST gentoo-kernel-6.4.10-1.amd64.gpkg.tar 84060160 BLAKE2B 5b76a3397d57ae952e5c27a75e97b30acf76bb202b2de1065e59833bb1910dba00bca8fc6d875adadccc0371877866d36d9e5b99acc92016d380613ac7dfe1de SHA512 9c06a3b66c21aae7e2b9daeba22b9326bfa5f365d1efd90e242ff821e4cfe53e91c26a3fc4e82c5cbfbf67eb5c713a71a8dffa26f40819d1e915e0c06c1bfdf9
 DIST gentoo-kernel-6.4.10-1.arm64.gpkg.tar 72929280 BLAKE2B c5ede9022d3a50721e733ffa5522df4bf2a2bdf1fd393b13481cb98235e2ebeee32dfdd7b8e6e75e2e0411066798ced828b2dc3601fd0a924c6ffb87af9b82fe SHA512 a82002855f561d60f07b3da22dd9626aa33139ceb699dfe7d9590e8a06b1da22337fea60b3e0cd64a394855ca749b4447682605d3f86130accd9f1dbf91686e5
 DIST gentoo-kernel-6.4.10-1.ppc64le.gpkg.tar 64655360 BLAKE2B 894dd1b240aaf449d4531a157aa395ddd8d471280e079a27cb927f88fc459c4e92b1c392032de93d2ff35280e2a1da740765220b5305186aa0c324f53173f4eb SHA512 410277f9548bcfc8c986b7f44b06c65556f14c54300b3db66d7726956f57896dce2233214278fb23195d3ff19028f35ce49780113b39a8097a5f8b0c433f1be1

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