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

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

commit:     a9fac89ad6b69e2a89a38aba0c3b609f0583465d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 11:49:54 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 11:50:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9fac89a

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 22d2304fd5d1..f25b23b06a98 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-5.4-226.base.tar.xz 5186832 BLAKE2B fb55ce4cae1d02a54869a3dd5e31
 DIST genpatches-5.4-226.extras.tar.xz 1812 BLAKE2B a477853adc62b2f1ee5d2093966c211638d4f0d3550de98990261db927a1946ee6a8163502f0a5b66b57d326521cdfe18ed1875bc126a63ce662e4442abaa9d1 SHA512 821a81cc51ecf898420e480860de4a7083fa2c6f1681e468f9058c7de403af07f72351395791facc34977dc05b6dedf4b2684fd29914bfe6802fd2fcac3465df
 DIST genpatches-5.4-228.base.tar.xz 5198204 BLAKE2B 35942e1ffbfd792f2479ce2b97c7f191cf5fc5712ccf101ee1f5f7f0486d53da2307237fc2d50fe0353c82557df03fbdfbc669949616dfeda69970628ad98ee5 SHA512 333dd865d3f10083566ddf43ff4d159a6842c3ed92c703dbcebd0832b0fdbc53c0025856eb1608ac485c805702608e52c600e08922fb831536bc6a099f74f1d8
 DIST genpatches-5.4-228.extras.tar.xz 1812 BLAKE2B dc4f0815c8915ae371db4da0ecc1066a269547ba1a967a6067121de25c06445356b6f1339088d402e7f9ca5dbb91b49ab717dc3168760cb26ff3e279177e16e4 SHA512 7ab2f0466b677b3506c080bacae1217b54b35ccb45f65000757bfa09e3ca2834a3b78c4b03730f11c6948be3e3a04c1fe3bc562585248039185d94ba805adfe7
+DIST genpatches-5.4-229.base.tar.xz 5214840 BLAKE2B ede38de7b09b59ab96596aa4e47f7d2dff06e8e3e403e0b3a15092991bd21504ccffdc21b8fc5857fbd21ee89842f7a6d74fd88b5c7426ae2a5dd3d50ce8db51 SHA512 ad086f2b00e870d54b1605eac7fe537654c09830b69c316cee71a7bb5e621e6ada37ef780c4d2c3ea9678e4a72c19355acac2648e16943ba0dde4e711909826b
+DIST genpatches-5.4-229.extras.tar.xz 1812 BLAKE2B d5d084cd21e2a4f6235f0438e8d92746fcfbc9f86170247b00ade3d2aac99e06c4b10bbe725780e8f9644c7404e8defd360c3e9d360cac1e5c5a8a2ffb17adef SHA512 c21105638451b761588caaf266d901de7a5640d72540954c3c559b675dc265cca8ea5e56de1c3c644bda4c4e09fe174ece02ed6e506d12e718e035825dda3e0d
 DIST genpatches-6.0-5.base.tar.xz 279980 BLAKE2B 72e3445a0d791825d6aebfed695bde22454c1d3891176756d90b2cd6aaefa8051bc22a8c7b39326f2889e947d2f65112d386f8d158d1a5327aca142a9d2312fa SHA512 e74152dde7f6c6e511c500ab1038f5a5bd2473354fac8ade6293c43c288ead3e2549fe8f0a02ff205fd72f5947401372cee34425dc2cf23ed3bf1198ad7b6123
 DIST genpatches-6.0-5.extras.tar.xz 3804 BLAKE2B 36e9a4a81f9cc9bea2dab9138bbfa9e380ef6e6d1305ff27072f96be23a8be691c20505c07d0034f0cead7b0f955e463485fc7d488b04ccb951a27eb3aabfb39 SHA512 b0c4a0640f20bbad1c5a5ce4a4c7413c1bd3fa1463be6d8dde3447d0131beb0a5809be53d2df7660516affe4b35f9b88a6ad8ff1b8575cf76f01bc086e4ccf60
 DIST genpatches-6.0-6.base.tar.xz 307564 BLAKE2B 14e3d451ae6f21219ed86f8fea2cd8c4888e8b8d23e43d6d855ccb3e07346348aa267e0e20e65c0cb782c3fbb0adc98e3e6728dc83d58bb8dbbed656b3273076 SHA512 1ed76b47ee510074787be882b999dc60c108e1411f4704c9104936f808b12bb97700883f2eed9e41d6da6a0cb5fd00cdd47f267cff1c34173bed49e1379a8786
@@ -70,6 +72,10 @@ DIST gentoo-kernel-5.4.223-1.amd64.gpkg.tar 60620800 BLAKE2B 1fbd9fdc06da23b51f1
 DIST gentoo-kernel-5.4.223-1.arm64.gpkg.tar 56821760 BLAKE2B fc2ce930c0bd6d3c3efd51057e40bd1c83db3a812c8aac5996d05978aae4dbe6163012699c72fec553d83e1397e6cd9601fefbfe3105c30523ba49f1daac4a52 SHA512 d4fa5d7570c6fc7534d92ff23fedb2349196d0b07b7a8ed8fef43b40cd6a63205ffb30378340f704652b4e3a16b45aec3ab6bca9ae308548197c5c9383a1f452
 DIST gentoo-kernel-5.4.223-1.ppc64le.gpkg.tar 54343680 BLAKE2B dc69045d3281260f370a97e2f77315f8488fc730980e7b3a93cd85ef3fd3044e18a0f8a1bd81d48e33acab8eb41b07fedc3679e4b1a732146d13b3552febb753 SHA512 b0463414a8a1503d393d8446c399269167d871591da08258a258f280cddb81bf8a6f20f4e3a9699cb64f2d7118bd0347b77cdb52f7340486a41b8bcbee1f6ba3
 DIST gentoo-kernel-5.4.223-1.x86.gpkg.tar 52418560 BLAKE2B 508a3b4f327b6e8b20b2b5f7ed23af35fa32506e8979e2b3362b84bc0eee01e088a0b512c7003a9ef130face153a56fda31f8f1cb41a734fe28c0e0c0ea67089 SHA512 f4eb206bab952a8c5b2642bd725c49cf5863b34f3be4a99efe8b162b98e76cfcb96002a3722c9c52eff00174f9250e7bce281725e5ee986c5de6868cc8a39aa7
+DIST gentoo-kernel-5.4.224-1.amd64.gpkg.tar 60610560 BLAKE2B 5bab836c930afb2f77057f05c7cab85584672fe164065c3c8c15a5bc253e32c0634dd3c1b22fe707cdff35ace5400fd423e177cbbeec56d8480d0780964928c4 SHA512 6a07b86d6d836f9b1bb5a12837ec9161fdad0c6eb582aca1318d139088ee00e483997743f94b3cfb4edf90a5f2cccb0c5498fb162da67412a9662f14dad007f0
+DIST gentoo-kernel-5.4.224-1.arm64.gpkg.tar 56832000 BLAKE2B 4ba736f1ce44422ba937cf047abdd8a67ec4249711fb2844eb0e4da6e2a07f93869a35c12a58e3295b83bbb47d55ec1226d9c6510090dff09526a734f65f017c SHA512 4a29438b0de7c6990f28877e243acda1a1d3b997bc8ca443660b2070b578d268637476c4e6de56eef4f14e6845a8e727d9044a43209921a1e00128be7fe7512a
+DIST gentoo-kernel-5.4.224-1.ppc64le.gpkg.tar 54353920 BLAKE2B 18ccca6446f248db98bb57bc3682cee0c0a9048818fbd824c3c4bb7b788d61b1a829563e64d5f2832c66f91bb185ef1ec2cee90a6111e2269eefdabaac87f953 SHA512 332e45d739bcebc657a743681e22479861cfea8bf12a751a411f866d21207ed97e5050bed0786bd037a5359f550895aabb6b49eb3d03d7de45c1ce648716dab8
+DIST gentoo-kernel-5.4.224-1.x86.gpkg.tar 52398080 BLAKE2B b911c83fff98b32210dfd26aa23744c4f307f13e03cc64fb5dc7c92f2a9cdde424cbc1333c4be495f733006400d945be6046497f91e866d31676983eb0ca05d1 SHA512 55a92c55528bbe1b9a38a5576e5170957dcd3e48c4578647cc84d977d7ef92d3f0f670c1b2cebe83cd18ae534be8b236f5d2b339a2e531fe68c0f28ea0abcefd
 DIST gentoo-kernel-6.0.5-1.amd64.gpkg.tar 75898880 BLAKE2B 5f4ebb5f829f76206838eaa9b89c9bab77a08e6587851b2f0c680b56c5ce74eb7a9a33e7d3e23f109f1ab9b61fdc15766260770e79765ea64ac7b07baab06b84 SHA512 72b33658a30b12947f45450c7c9f6cc8aebafecbe7940fcac476e780c46595d9bcf751849139ab81ddaef6eb1587b965bb3d05d7b8d693222cc98f44b71d1d0b
 DIST gentoo-kernel-6.0.5-1.arm64.gpkg.tar 68802560 BLAKE2B 33ed94c2431e6e17944bdf0bb8a50f420914ec040506cbb3ff8ec8ca752bc7b43be165881b85e4590e9d79665a5215639f84b6ebfc8ac4bd405ff26844668d51 SHA512 f34ea6de684e2bc1ac120117938e383446fc2f19744de95382a24a7fb6044a89711b86fc13479b5e5536c71fde4dc0ec1d9de6939a26e16e254d3ed1f405da8c
 DIST gentoo-kernel-6.0.5-1.ppc64le.gpkg.tar 62136320 BLAKE2B ae2c5b8830f123c5c2a853e5826e701bb46370919a24fef527f40d530e7fac9be23050cd36ea149644c9331954aaea20f23c44f8341d05b9b170adcbddb1bf2d SHA512 70635eab0375b229ae24efe2f2aa123249e8a38bd8fc864cad8afee0643c98f9f7ae7d4b10ea341a8ed14af4616bacfa2e9cf2e12d1aa47dbaaa21b4df619fcf

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