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

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

commit:     ad7b1c14e52bd742085044c13e6bceb8dced253d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 01:10:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 16 19:54:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad7b1c14

sys-kernel/gentoo-kernel: Bump to 5.4.194

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

 sys-kernel/gentoo-kernel/Manifest                  |  15 +---
 .../gentoo-kernel/gentoo-kernel-5.4.194.ebuild     | 100 +++++++++++++++++++++
 2 files changed, 102 insertions(+), 13 deletions(-)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index c61e31946100..e9493f8e709d 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,29 +1,18 @@
-DIST genpatches-5.10-122.base.tar.xz 3383656 BLAKE2B 78310ae21efea3a38f91ee0a511b08be4f46ce75b0f265c7fef1f758f7aa854a69d05195e7bcd541e19712be59b80ba9b6758390630e716886164437020ac014 SHA512 52cf938fb005379f27df23d59056330b672aaa8c732fb324a0a65fd41a077305797440b95b95300c0577822e64bd557173573c543ebd83d1aefe6c4d97f51a4d
-DIST genpatches-5.10-122.extras.tar.xz 3864 BLAKE2B d8525daea96a3cbbce6eff0ff46be6a7daea3e5008f6805e2a7ede7e4aa2211b52da3b413fb2b542e8720410471aa938a5733305d925e8606b6321c39472b021 SHA512 452582a28be8c6c340052fa1d58a0259c11bd686abdce28b75ad117586f557e5bb188670599a8373a8b3ea01057a8344ca0f70cff13e854adbb8b9c3bf1edf29
-DIST genpatches-5.10-124.base.tar.xz 3428172 BLAKE2B e1393b6b91c0a5ae3cf1ef74ed569ee5bcdaf3bb5bd290caa65004d9de3dff216e3121d5c6de7cba454ad6ed0f9df757d55fc31ed781531d222ddedfd800fb29 SHA512 1b2031bcd2f01db14686d9e642edfcb47c2ebd8e740b8d4af9310e4e9cad5a14e48ed7a72ad17ef001f4db04d519daafa4bc18ce197f97bf3ec6cf7a53cc61a2
-DIST genpatches-5.10-124.extras.tar.xz 3868 BLAKE2B eee2a113c7def23275fedd1125da016cfdd468683ecbaf187f79bbae29ed9d8b1c93d36d93c4e97aa4a8f2735dad29ad4cf75447cd5e5908dc0cf19661a18358 SHA512 83612ba5da23b29037f6fc24949e7ddf9169cf4ff444f2d3110ad7da09780932cf50a763d5bd6bf02e318233f4d245dea835cd25cee954fe77bccef43432dc56
 DIST genpatches-5.15-41.base.tar.xz 1716640 BLAKE2B d2a37f5bdbb541bad670240ee6fbbe9bbf87d9041e86ff6683c92ba2566b2dc9dafbad7e254146f8ecb23e3ba32e0c0d6f2e5955ea4ea6bbdff4d7b8b74f1e66 SHA512 b9a3557fd641adad0fe875382082a8cb44f7b879d19acc57fefdfe78cc66f8d3d2ec7ca7fcdd125edb56a4915f63922ed2f7e3ff006017bbf6318a6eb0f06ea4
 DIST genpatches-5.15-41.extras.tar.xz 3868 BLAKE2B 11487f062c49431af029fadde1f01a95386d42e1349a658bca314bd26d356eb82d0292ca68ac34d4ba4593a25d7422458a7dcf306431dbe46e68c9306bd8ec82 SHA512 3153848739687683f02c65d1dc87b4aa27d0fead27ac9fee28acd2f8d0fdc118473445059bf756650512c5f3fa79b8a4a70882c2ab2d4329c4d7aef982e5e4d6
 DIST genpatches-5.15-43.base.tar.xz 1785824 BLAKE2B 435e3a48c6d8b01d71f203e7373ca44b03794f7ec5dcb84cf919b0b0cea0fb06edadc4228b0c53cd71ec6b80f7a0b2040e60a3223dbad0d9fd444e4980528ad5 SHA512 b78e665d7e43f5de92f83e9d464da953aad3136dc35a63cbe1a5f098cc8133162cb5d47a7e9cd323d86f5835194c27daa48a648bef4e6fce29d706e5be33a0c8
 DIST genpatches-5.15-43.extras.tar.xz 3932 BLAKE2B e6ad29d61c10175e8e31c91edbef3056922aeaa50583c64770fb1df714dd6764099b213a85c109d1057bec95aa5bd4485e8dcfce196ce7a6a0bbb682a7475965 SHA512 f85e4a409d4240bbb17ac3e3ca38afca1fa1a3ff8b31e9e2f7b4d5dfe6a255be38073f3e2dc02657bc309229281862d066851d4f57cf7213d8500c7efe64af8c
-DIST genpatches-5.17-11.base.tar.xz 684208 BLAKE2B 1c1f7a450a1f30d18f8e3eb7cb2db8b170f503a1b17343b25130408725f08c6ce0db7fe91eddb1b8d562bee0b6e60360baca4429aa09ffc1e7257b531ea6ed4e SHA512 5e0f2c89b93bd492c49d36627e6c6ded98e49f210e4c4880f84717e4248b711b5bce3d0db04ae78a29a01a47b3a2ae3ae5949cc02d755a22d63e6b7117477398
-DIST genpatches-5.17-11.extras.tar.xz 3932 BLAKE2B 8f65276ac101924b918379e84da046a8fc56ba293ebf5c9ace449917e58400ef8ed5cd947d9de558ed95735996eba42e01053c8e71f1a3782696e1ddccfe22fc SHA512 d7baa2bbcf982ede22dbc06dd1a452759c876357ee65750b21bf5a6b22939e5a924311c6e2315f222a65386ec028399d5c82eb0a1b8a215757bcaad1d83b001a
-DIST genpatches-5.4-195.base.tar.xz 4639264 BLAKE2B 7a3558a8bb125d616bf10dc29045ce0e5b6432eaf4e38326727ee184ae38d90937fc0168bd2654a8c871b7a851a7977cb9ad1b6b258073b20988b51be189235d SHA512 7add11fe740fe7ebb785f6dd2548ce908a053e30fe5ae8eab3e2b95eb6c8da9f9c5dfaf3d2e50a0a319389631162018ea2675ff8770779e8be39bf10a8e21890
-DIST genpatches-5.4-195.extras.tar.xz 1812 BLAKE2B d285c26f84b2275007c3ad4aab1d7fde0ba467ec07863fdf4962737b06bbedbb452a8601f3aea28fd4086b2e80680422e6cbc749cebe49918a37e1c790532359 SHA512 f1cc2db130045affd76c6e2fbd8c4d2806b20faa2feae80e8f88d821d4384ab0ecab3ae66d692666107e23c3deb6cb70231b6251be1e2e5f00e880af48228615
-DIST genpatches-5.4-197.base.tar.xz 4667616 BLAKE2B fe777dfe7e9301dbda973c6bbb1459c9e8ee245a729b50e528b8f58f8cccdcebe1d572217b089910eb7402473eaa6cbc39c0bdb11cad35d417d3a32d29ca5456 SHA512 eb05870e88d1b1e6740abe669ae5de2994283e95e427ccf55c7f184be5e36e20bc52d74e5ff669ea316add4d62da6a59bacb1a689c0f30a8c0a0dfb3c139b639
-DIST genpatches-5.4-197.extras.tar.xz 1812 BLAKE2B 8aa22afa5b4f9cb1cf2a112095a694f6145ec9c3b4be99daff9a1fbfab6e1742d45a8f34bfb407d6f7622bc9f934bcf780d8ddfb4f2add165329cf397c0f08ae SHA512 0b51076e9c9d17e094652288c8c0c0482a80ab233658fc84cd2db92414fef3965435a6718839b27361f0de802e70457f8ce32e9a7db33b30858e681a392d5355
+DIST genpatches-5.4-198.base.tar.xz 4675164 BLAKE2B df3392747e2aa0cecbfda049c124731bfb16b4ef2cdd3f973128c0f9b8c1160e941738f48092a0dc5a11f917fd6c3becd73dce6150c6d1ff17014b2c4c8197b4 SHA512 1e1a8dbe948b8a765b5ae4d98954a721586e5f7e0d4ad4bf579fd72002d78dd7074f535dc3c4a039c94c1c18506a2d000ef251318fd49913fc2fc56f710b6e59
+DIST genpatches-5.4-198.extras.tar.xz 1812 BLAKE2B 4512e1007841a16ddc3ec986778def8ccb1b144758c0edbfe004e547332c18266e38e016d8b098985d2344ab0c9c516b663c8af35f0d5896f2ffac01cda3a94b SHA512 ad74a36ebf4b5eb734f896718ee7e3f25a493904b30717819218638beeead2a8853bc64c0d368aae8f2c5957bc222ca2a296153aa492ef001ce9abc247b507a8
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
-DIST kernel-aarch64-fedora.config.5.17.3-gentoo 238977 BLAKE2B 5f3a43fff7ddfe4dda03f00e7f4af761ff978bbc9c6d2fa73b605f60755a0d40e494428725a7728f5e2f5f58c9931d8d60b048d318e22c635588e546209dcfb2 SHA512 4c22514ec7d2d4ce87087aeae17a5f68efc3e70f48298895262d5dbc47623de6ada4254ee3a7f06a302d37af73d921470903f2f3a86fe5224e638bda882be7e5
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
-DIST kernel-i686-fedora.config.5.17.3-gentoo 218090 BLAKE2B 1d972e6ed16c7dc1dd9959ae406af52d1cdc15f85f8ab376e4d7abb79d9e284a9a68442bde975f5f1a9bc64fffdaee96d1f41392238538b37f1b6f9652ecfcd6 SHA512 2c32cca1f20cf54f3e9b394f6e3f14f435bdd72fa22868416129bfd4253a3cc8f3164b6868e31292c2404a1c433944783279e03b45cce9bec3b2813cb4675b27
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
-DIST kernel-ppc64le-fedora.config.5.17.3-gentoo 209239 BLAKE2B 7c6fd8bdbd8331def5bb658359aeb3d52a9f0e72d9312699e00d852b6740250edb1c7a77ea76521b0be6a8ce41888aea4ce8734bb267cc1f3e216f2cbd6ab8d6 SHA512 f25199dd6cef4be45049fa7d6cc1dc1b8a93ddfeb3b3824e6ead76443c1ea30e31dfcd4ba66625eec74ed43ab255d1e21cb2a9011160cdc64f30c4b1fdcdb9b3
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.194.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.194.ebuild
new file mode 100644
index 000000000000..4a10594a85f7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.194.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built 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
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}