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

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

commit:     54eb44a8ce4f18decc7e0f363c41c9c1b5e34a59
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 22 19:14:28 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 22 20:16:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54eb44a8

sys-kernel/gentoo-kernel: Bump to 5.12.6

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

 sys-kernel/gentoo-kernel/Manifest                  |  7 ++
 .../gentoo-kernel/gentoo-kernel-5.12.6.ebuild      | 90 ++++++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index bd98067ce09..51900cf095b 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.10-42.base.tar.xz 1435860 BLAKE2B b94289861c81107745f259905e2e
 DIST genpatches-5.10-42.extras.tar.xz 1772 BLAKE2B f53190eced945d803d029a643a27d33f56836be87fb7809a102a8e9ddaa9355d2dd49ec24e833b234f4069127a8c3bba98cec956e7126cc33bb2973086554449 SHA512 c8e32721135178c3c99323f02c97591206192880f77c751473f4094fccc01f7a3bb4ccf4d8dff82f8d1a535b2845449e7dd381590c4fc8b0adf75f212fd336a4
 DIST genpatches-5.11-25.base.tar.xz 1030312 BLAKE2B c3e0f5840c32292d36be31a8606934bfa1ccb7e31f04cd214574009577907d00912bacce1f85dddeda77ba99f40f61fa5aa5259a693c74abd63a05be5a44f2aa SHA512 5adbe3770562b57d7180a44ccca8e665cc5b0d9ba5168c4b3555b348708edd7469464bd770124d9a8641095bdbe786d843ae3da64b845d577999c9e40360c970
 DIST genpatches-5.11-25.extras.tar.xz 1772 BLAKE2B 0bd2afbd93cd7553c8e058f61c515ed9d47e9f328529e6cf36a7100b363dc8e4c3004afa06a0c0b95963bcf69a216ae6a7bf595062401725a4a25f942f44a3e8 SHA512 114094a87bad0dc4a265847fa18b88a2795daf151de8451bb4fbe4af70f3f4bcff8905d8d90522f85914bb7ba7227ebab7f69ab59112afb2187332b393450fec
+DIST genpatches-5.12-7.base.tar.xz 447756 BLAKE2B c7d1f923bf45adba7a60ae56eab5e6ac3e132f6fc9186da1bc10d48c19dbf7ab39fc07cbb93112b39b13fa921223b1f6aedb28e2d053600b7787a2bc2b55defc SHA512 ee12bac503ec5ff48d918240b5e16c03df01378d572421d648863d82db8c89a79316d1c0339b6156cc5c1a0de64cf20e81b2900fd23b96f0c274a171e90aa279
+DIST genpatches-5.12-7.extras.tar.xz 1772 BLAKE2B 3f593739f9330a6dab17be9307c163d6ca4e39e821d79db2b6a3f88b3af8c973c713be26ebd11d155d18336f9613fa5b0c9c44e43c0674bfc4f9e0c5d7519874 SHA512 e273b619d284246670381a6a6bc5f9835a6ed7023bfae14b31783242ce504d6909a5dfb47e6a5cb5d81cb499fb897daaeb8e5d0306359a47ba22e0818d499d25
 DIST genpatches-5.4-118.base.tar.xz 3359396 BLAKE2B 5617e29367808fd5be4d7cd95bbfa2680f07fcdf0c4b02f3a5750f715a0e728ba3c1cba82254495cf1496a53a174c6209821d57984c0810c7665ce325aad90ee SHA512 496d33188a6fa440cee3997b4367c57f46e398b35799a2f4a349f34f5947884e7c28df56c4990a48ae1c8cf46932bc86c7c1fcc9593ba7e1e786943b55373bf6
 DIST genpatches-5.4-118.extras.tar.xz 1772 BLAKE2B 0da077edfd1be718e67ea06824f29b86c645597be80c9b7fd99fbab25b1638bb3e95d2a0ba3b0c6c31beddee7d6dd3fcc89c640139ff787ecdff1e7d0b5eff72 SHA512 9b99f9f6ae84f10db1dc3b75df6c4d095e6624286bd1de888efe3d063e06c9ff44dd51f18ed4d153c935ec6be48d045f8286db1a49ead4abe120e20620ac2307
 DIST genpatches-5.4-123.base.tar.xz 3488228 BLAKE2B 0fe5c3056c3cb060f4921e3b7a4046e03e4e777d033619f0496eda68c645c6209fb07713a4bc2565000f9c17e6203a8bc5392fc597dd49167bb0348988b53026 SHA512 e71b8f9d622d3ea2fa8165a39a27240ac007d899d7324c60240221d7761c1287f14b631b074536460702922b8daf00bc2714358aaf7f69ac257af7d5d5b18bd1
@@ -16,16 +18,21 @@ DIST gentoo-kernel-config-5.10.32.tar.gz 1269 BLAKE2B 4a21a57d567d9a527ef829f375
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.11.21 225958 BLAKE2B 69f8cc7bd78ecebc08aace077af06ca09d0a891db5ad8e3d6391024eef3e8fc9d284fc8b9a9cf9a23d9494edf31e2e51bc7b4e2752e7f207e97cff31748e81f5 SHA512 57eb0b3add7e8348fd62557598c2c8ff412812d40438121cf0f14543d2046aa4a7b87f6f4e3c34c9f471b91209857f54c5a540de48df4a7a082ddec125558467
+DIST kernel-aarch64-fedora.config.5.12.5 229203 BLAKE2B 056ab111c4bf623f4476ebb38d409048198442040611af2d84801106875e5ec05506ac0c4e1c1124bf9f3700e59cbf94e6d467be22c2c9e1a95619461a1867b0 SHA512 a2495ab8ec406a3b29a099b0e2285420940b1dfffeefcaf8bb69e4ed54fb2714b537e40eb2818468be2d1d2e8217cf8d7b9f123b791676866a2a79a98407e4c3
 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.11.21 208103 BLAKE2B 3320a1249da7945f82344001210d9eb3596b71dab764b8e29835d936f9f9c9ba1cc270507544db0b7a4d26b0c6586ba8bd02a0905bc4f3f67aa077dec6551c87 SHA512 192eb33bcf0fb3a4b402d82f684d5e06a6d1cca01c6bfad6daa87057d6b593a34fc36f92a2c830dc7711548a16546de9ec97250a4c15012982091b766d205a4c
+DIST kernel-i686-fedora.config.5.12.5 210160 BLAKE2B d06f57b85b9f7d65da47817e5143af804cdbf34625f74d27b7598f3fd0fdec090f7b46479c991d2ec00a35bd5780120ad7b698b89269266e905a135098b40f24 SHA512 21b0fe9c600c5f5302edcc850717872dc8707d1791f87029075be4ab30f2f2fe28b1b042dd9d5b5dfcedc020e4f192a3083c1780dfb3d275aa47fc0f9b1a7908
 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.11.21 194946 BLAKE2B 458f926b8005f4902e03a368ebdba27ae26fcf1820890122e884c66692a767efff86a6d1007fdfab534cdc5821131f73b55974027efc9cdf2fbd5c278a7d071b SHA512 c14e89cc5ec794ab764dae3859d82c30561c21fa11ef8912120750c803da2ce77cacc8cb1a3ebb439a6a638a6514952c07f25e543e996e33fc0aea43b777ab62
+DIST kernel-ppc64le-fedora.config.5.12.5 197238 BLAKE2B e273514c3b4eb29309bf35351127cdc00903e4642f0a4f75633f80041d8c953046f734eaa0f6e8c7e2aecfbbafee86bf945f5a18399a668253fba225c2edb999 SHA512 bb6f71858a41b833491e2cea22a3d724512b41d04bd6b17d16087f4b7747b340354c41e32d7bf234d8dd1a64adc500206d67a030948100483791dc1ec0732a41
 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.11.21 208946 BLAKE2B e3489a83c4c80a5f16c9928417e46cf8cc7b19a0d6696417046911531b23a47a2bd7afcc017b7c7e0d72ce0cd1c7c868f2dac2de8f3ea1c18c3bea7fba0268f2 SHA512 8107291889e464e42f4cbc517b5105cb170e16c3a36131c093480b662103559bc66ba58294697ae27eba916f863d1d3ffc0a316507fa63a1dd97d5a177880814
+DIST kernel-x86_64-fedora.config.5.12.5 211204 BLAKE2B 6276cd8eca1d82933cbd3e95608e334730b739936c27a922ac0a7319f64acbe46294c5920b67213b694ff9ccda5b0ca99e6e2519b496e608ddaa35b27e26ed3f SHA512 c6955e7cc1ad874a3af42136b7ed958f04905de8f337d83fc36d59fdde5a469f260f8f29e9f6ac516b3c138679de0e37949b144773e24a4892ebcc8f729845de
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.11.tar.xz 117619104 BLAKE2B 81300c27bd5476387a83123aaeb4163c73eb61e9245806c23660cb5e6a4fa88ffc9def027031335fa0270fc4080506cd415990014364e3a98b9d2e8c58a29524 SHA512 a567ec133018bb5ec00c60281479b466c26e02137a93a9c690e83997947df02b6fd94e76e8df748f6d70ceb58a19bacc3b1467de10b7a1fad2763db32b3f1330
+DIST linux-5.12.tar.xz 118112412 BLAKE2B 842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b SHA512 be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.6.ebuild
new file mode 100644
index 00000000000..00f0f7b0755
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.6.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020-2021 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##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.12.5
+CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
+GENTOO_CONFIG_VER=5.10.32
+
+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/v${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-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+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-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.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
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}