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

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

commit:     b79f336e8aef47e1bfc610e12d76ea03cfa93442
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 20 16:18:30 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 20 16:55:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b79f336e

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |  6 +++++
 ...14.ebuild => gentoo-kernel-bin-5.10.144.ebuild} | 28 ++++++++++------------
 .../gentoo-kernel-bin-5.4.214.ebuild               | 26 ++++++++++----------
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 279abfc4d21f..7c4ea967fc39 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,5 +1,7 @@
 DIST genpatches-5.10-152.base.tar.xz 4136848 BLAKE2B d9a29db5ff2e649e3ce01112923a6e3dd9938fdc06eca1010adf725bb1d7ef11e66562f81349cd3df1191d6c64b4e5ff0311c7b4a0cee26a40d024424f91073f SHA512 c0d642c0d56f3f93e7250d548afe417e9f2fcc073f759d54a33c5a70f8c781075d9d77bef76b92a52a9369a60df5d9cc7bd79e03b0110d8bd5861b2c0e848d4d
 DIST genpatches-5.10-152.extras.tar.xz 3868 BLAKE2B 2e24016827949d894cb2623e2a9271ec6a7af14e655cbcba65c3631fb3b8aa9ad673fdffb1a767695068537c95db722fce9dcec79d5f3f4d4d5f87a36290f017 SHA512 80180e2869f27b6515c54a7ef6411fe76eeaf777936a13648488469021681fcc01c462a0a933f9446b618632ee3c139d8e1355cda30ef2ac3befad33c79da7ab
+DIST genpatches-5.10-153.base.tar.xz 4142480 BLAKE2B 18d28cae57ea98f1ce9faf8e88aff46b4cd2ba64f98427287a0bf2323de35b050c2673a92c8f783757cda8068905cb940fb468269a624739b5222f815842dfdc SHA512 c8e5b49389eb95eb789d2d6078631feebf87571c69e0b5abffb7427db501030558186358a09b20e709d2a52ab56666285f29f5d9a8bda7a3c8c0355c38ff83a1
+DIST genpatches-5.10-153.extras.tar.xz 3868 BLAKE2B 4baa8ba350a6b0f02715d65646b00f24142e6c6be6a2270204b4e98ffbb3900b1a47bdfe741266013859b9119719c7b979e0035eb1bbfb154b39318727f56ca0 SHA512 b367c4dd3a3217d3d39a7e2f8850ed21fae2afaf508939b2da897f597f10b36a1a4375af20f07e305be0bbee89ae8787af3cc842562239af5c45430f2872cab9
 DIST genpatches-5.15-72.base.tar.xz 2987972 BLAKE2B be108e6921f5a04605ab7c557e1ed50ce092a85eb36e6d60b4edc630457437eb89736dd992fb823522f3ca9c3ca530f3e437ad8f8b38a130bb56bc887070e1a5 SHA512 fdb5806584961dde27c7760ff4c20f6c7d08682bb998522a577dfa52a8fa021cea991c46db5efd1ab76e060e73bc38fb5728d0fae2c65f0846828c57779d6b39
 DIST genpatches-5.15-72.extras.tar.xz 3932 BLAKE2B 00c700eb5307d1834977c88e134fc2bea16f258d6eb374e6cb6d85c522cbf1730d6e2e937e7abb392350de8aa3cff6811f5ac0d3b93822fbd9a43c20abb525c2 SHA512 a08ba388711c30d3c101ebbdfb671c63f85ce3d07ba4545c3b01b70687d65f31fd9a1afadecdc49f0d9b113c5596df878acebd425b868ffd9111a555d4ced47d
 DIST genpatches-5.19-11.base.tar.xz 766852 BLAKE2B bc8fa5969dd4c75920a094b5135f60d728a36a431fb5213c338f6308761b7f8ce24e3991a2de70b7c2d87a9256cafa3b22db7c683e38fe10363b15043073092f SHA512 6cd414842f48d9ecf85e0f07fd930e526db089720efaf95916b8ec9394f458a6b1bf178c8e55d6ecf9a7ec5520cc43c50cf1248a8c3467ed069594123586ee1c
@@ -12,6 +14,10 @@ DIST gentoo-kernel-5.10.143-1.amd64.xpak 67552763 BLAKE2B 372669a3357d82120996ad
 DIST gentoo-kernel-5.10.143-1.arm64.xpak 60975781 BLAKE2B 611cdeac6eca2c34a2535c4516be7d585a780571a0cae4f4e23bbc5cbaf3b3dfec37b6c416d6edeb88c219ff3610127323d8b42923b8b3a9835f1f84224aaaaf SHA512 36c4d474d4af8b36f2b3c9f2995621bee4defcd550cdcb64420a7fd02a2864ddfd18962c081abe2892885ef0915a1c36fb729a2dc3f397d1deae3846d6c3c056
 DIST gentoo-kernel-5.10.143-1.ppc64le.xpak 55999532 BLAKE2B 5ad3e1bdfe807c5cd792d35722346c811613bd164616ad338996e5303f61ac65e94eac1752efa47fa7f42795879c4a230c2f0e4ee13f49803a83a9a636376b9d SHA512 0327bc9fb10f191ff7da798d549ad9e3b364102530cae53f85aec6eb2b14d0a7ec68444a481f329658bd6e5cf507db965fd5598490a40871a674f2e763f057a1
 DIST gentoo-kernel-5.10.143-1.x86.xpak 57463777 BLAKE2B cb4aab4c36b51e1d6519eb2929a49d8a26f7ed429c50d8976170e1d880341efaa621abf67edf5aecde03bbd5965c535b699d92138609b800570f75306dc949fe SHA512 9105198f09843f76a967ec4fe104d29957bd40c6900aa55107ec7d2dd872a5e9eec5e1b21c01daca310c3205744442f8282e432635f200f2b86f0067e23924fb
+DIST gentoo-kernel-5.10.144-1.amd64.gpkg.tar 66467840 BLAKE2B 1a0145869dc1220da60c3126d3cdc1d2e31105f428464903101b4391713a4cd99216b4ad26e489cbbd9c6c3044b973fc3486db310287c248e697744b0a7aae8d SHA512 5c3bc09206c4132d20d612487540b47252c03999ea3f7d8b0719cdcd30082069e68181f8ab5bef4a6d29978c167738b8884bcea8e4b37b8e36b1147ad3fb67e9
+DIST gentoo-kernel-5.10.144-1.arm64.gpkg.tar 59729920 BLAKE2B e8d2b550a686323921f0a8366287e76b52d98f0e1f8d0a1eb96506a4b5a9fa940cf4dc869eb3b33a4c7fa18d44df3eaf9a0eacc298386cc75bd623e86378e030 SHA512 0a50588a05e2242cee5608e5275120457d4d03464bc80e88abd9bf918f76a02fee7e6a588a607bff54c3224bae0e04599aed34603ec780ceb579963f16e1a249
+DIST gentoo-kernel-5.10.144-1.ppc64le.gpkg.tar 54988800 BLAKE2B ff7c476ca7a24d91d3271f460e73863b6010b28b501d0f94e70c72c609a3165d4d5eaa76b492e5b9f95d367f7bed0ed7f6012c7e1ff229289b83eb9058fd41dd SHA512 5e99a2dc9ed580b4aa5a7e8b21846f29da89a6225f3aa208335516320311511f33334548aa89cccf0bed59ff3c7a04b9e0dabb5a48da6bae62e1023dee07cdf0
+DIST gentoo-kernel-5.10.144-1.x86.gpkg.tar 56381440 BLAKE2B 84caa4148ea450bc7545542ad929f77bef73f2993ba005712a7e2e3d3ded3042ad2e92caf00c78bbfdd6461afe9bb9145445f21b613d345e458d2bc8a33db97f SHA512 33ee224432940d0c2c565926862c98ca23620d73c494699393be37dde6395829d52b8733d4b0ce70d877ec42c10cc057fe5881032b01dd5a586ef17d36f2a35a
 DIST gentoo-kernel-5.15.68-1.amd64.xpak 70774051 BLAKE2B a7d9253fbe3df6a133835f3348a07d9fcecb97701476101670cc89d15aa73dae428227d03d9f781c125c0b5930374bb7d290d52c5c604662481511546f1f35fd SHA512 a302c71de66dfe4c14c06cbf4cdf564ff14a1b3fcb0576382eeff0b7f6197096d03cd522f1ae54966a3be74148b52a1aa08967ad1feeff676de0463ad5fb8f29
 DIST gentoo-kernel-5.15.68-1.arm64.xpak 64082577 BLAKE2B 55c448aa22f6d6e839750573578620123680c880113d72c71a6e28ec2863bc91a2219dbfed6a7feaf2c6ce68acc0b9f93f4ac7853249ebc6cc3ee7cc27c5b297 SHA512 6f4279972446066856da71def4c2c4e1c27650de2aefb012312afc52244db5f59c5dcbee514c6b8a5538869cfa8a6cd646ac52986438bfe904ed65d2955611ff
 DIST gentoo-kernel-5.15.68-1.ppc64le.xpak 58282282 BLAKE2B ec060d2d7a544be9b304cc3602568d980bdd5f7adf7d10d93af646fed69d5f5e1df4a646630f8c46d661be30aa86c7fa6b4f2e218e463e8df9a8b0f50040d9ad SHA512 99f796989ea705f3eb04bd16fa1b7e4f10143da3d2a2b977d31052618304dd7d08a0d7b737462b6bb7035c200191ab1dc4d76393f920353d20ee2f82ada04d88

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.144.ebuild
similarity index 88%
copy from sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild
copy to sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.144.ebuild
index 58ac732ca5a5..691ad14894b2 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.144.ebuild
@@ -6,8 +6,8 @@ EAPI=8
 inherit kernel-install toolchain-funcs
 
 MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
-BINPKG=${P/-bin/}-1
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+BINPKG=${P/-bin}-1
 
 DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
 HOMEPAGE="https://www.kernel.org/"
@@ -57,7 +57,7 @@ KPV=${PV}${KV_LOCALVERSION}
 
 src_unpack() {
 	default
-	unpack "${P/-bin}"/image.tar.xz
+	unpack "${BINPKG}"/image.tar.xz
 }
 
 src_prepare() {
@@ -102,17 +102,24 @@ src_configure() {
 	)
 
 	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	cp "image/usr/src/linux-${KPV}/.config" modprep/ || die
 	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
 }
 
 src_test() {
 	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
+		"${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"image/lib/modules/${KPV}"
 }
 
 src_install() {
+	mv image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv image/boot "${ED}"/ || die
+	fi
+
 	# strip out-of-source build stuffs from modprep
 	# and then copy built files
 	find modprep -type f '(' \
@@ -122,13 +129,4 @@ src_install() {
 		')' -delete || die
 	rm modprep/source || die
 	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-
-	cd "${P/-bin}"/image || die
-	mv lib usr "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d boot/dtbs ]]; then
-		mv boot "${ED}"/ || die
-	fi
-
 }

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild
index 58ac732ca5a5..6603a0aced75 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.214.ebuild
@@ -7,7 +7,7 @@ inherit kernel-install toolchain-funcs
 
 MY_P=linux-${PV%.*}
 GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
-BINPKG=${P/-bin/}-1
+BINPKG=${P/-bin}-1
 
 DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
 HOMEPAGE="https://www.kernel.org/"
@@ -57,7 +57,7 @@ KPV=${PV}${KV_LOCALVERSION}
 
 src_unpack() {
 	default
-	unpack "${P/-bin}"/image.tar.xz
+	unpack "${BINPKG}"/image.tar.xz
 }
 
 src_prepare() {
@@ -102,17 +102,24 @@ src_configure() {
 	)
 
 	mkdir modprep || die
-	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	cp "image/usr/src/linux-${KPV}/.config" modprep/ || die
 	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
 }
 
 src_test() {
 	kernel-install_test "${KPV}" \
-		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"lib/modules/${KPV}"
+		"${WORKDIR}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"image/lib/modules/${KPV}"
 }
 
 src_install() {
+	mv image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv image/boot "${ED}"/ || die
+	fi
+
 	# strip out-of-source build stuffs from modprep
 	# and then copy built files
 	find modprep -type f '(' \
@@ -122,13 +129,4 @@ src_install() {
 		')' -delete || die
 	rm modprep/source || die
 	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-
-	cd "${P/-bin}"/image || die
-	mv lib usr "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d boot/dtbs ]]; then
-		mv boot "${ED}"/ || die
-	fi
-
 }