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

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

commit:     5dbb50d9d5f93d1ae98ff2952c15603ca58359db
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 23:41:33 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 06:47:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dbb50d9

sys-kernel/vanilla-kernel: Bump to 5.15.34

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

 sys-kernel/vanilla-kernel/Manifest                 |   6 +
 .../vanilla-kernel/vanilla-kernel-5.15.34.ebuild   | 134 +++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 73a8efae66d7..7a18ec0d756f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,21 +1,25 @@
 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.14 242650 BLAKE2B b5587c0e365a00a5283ea3a5184b473783ad6296a6516372c6c79305d2837e782d18fae8ed8e852eb6d946d1dac6c6159231f2249f3360dd1651e4f1f06d5694 SHA512 2a8447d8128a881c08745f58704a9fe46fcfd2048c5d5775a518e16b6f5b5603e22bcd4f04c192d541fc83e6253be3b29a5f0f39ddec96c8668bc801d9356a9a
+DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.5.16.16 236126 BLAKE2B 8e1035d2e2a2147879ab129639c20ae2737f98923e331782bb44c0076b46ecefe6ed0f0849ca00bb2a1ecdea6b53e2c21ad1587ef6537c9024e9ed9450bd95e7 SHA512 0d36c47012df44eb8c83b3bb15326d79ffd23999372acf101abfcfd151c9323c34ba9144c2b75e43f273c60324ccdc3516c136bc78a24fb2723954e67b0ddc4b
 DIST kernel-aarch64-fedora.config.5.16.19 236151 BLAKE2B 2cb9b614db009fdec8db07eb93d4c5e30d8dac6fc0e17199f3f3e9c616cf6bd12e08933e85741ec97eaeabca0c04ab4ca9361613f8be106501462c94a4c0afcd SHA512 6de8af76d4b6c1f3aeff220566557f6a24e96c42d8b52f2c7222e2d55d8ec8668a9bc32f9d6f20327ce3dba669a1c586e80a4dcea29175f9f0321fe38885e9a0
 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.14 222268 BLAKE2B 96e283052369a936fbe0f415d7176bb922bc0e22925fc25a56e6e0c36a723bf7e9ae29bbc661c0a8a6c44a218482896f25c529f9cf7a0d3bc31de8ea88f50a5a SHA512 b5ec452458b04ab316622239ffd98782a10eab17a02697d15359efdc18dfaf8052a189c66729157d2e9eed20aee25a47fa9b81f1da78d42150f10b0746f57938
+DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.5.16.16 215562 BLAKE2B 0e568a566e86f1b98fc85a35412c528d728975f14059c2f233483145f968fc6a02e49f7e14bf393ba8ed21cb61dba9ad0bdf77172785dc5a34546cd5f066efa1 SHA512 2cebdecd591d829a0b8f3ef1d3d7720c25c7c06bd8f3b2778999afaccc80132d8d663931b5279ab52c0c5e3a17714e0b4f422d71bb5dcd7e79b1cfdce59aca70
 DIST kernel-i686-fedora.config.5.16.19 215587 BLAKE2B 709513d44b3062949e8dc7d5d15f82e28c3a738e1f241d9ce3eeb2c11cf36eb11ae1f559ee8edb159c548987a5f348f802c9a23b073f998bb694ef5720ae421e SHA512 5e211bc54850c779869a6bc30c1e6d87aceb1c1fa9ddda80d09b3eea4a2d2b3f3d222af6da7f6c8e8f81bf3ebb9ae2346efc6dd01b4cb144f70982b35712edab
 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.14 213374 BLAKE2B 527fcc240988d111f41a366dcbeb1a04938e8cb1c83406557fd9fefc64677ee7d2539fa21fb78ea66859c428870fd54b1d3827deafec17569cdba9991913c960 SHA512 9db1d852c9385a5771cf9992b1b3ba34a44d95abdee929ae85b6e6ff8baf6b1c7a4a6c4b2446ae7ce7d1bb59b4b915d5793b505e21d643e24dcb408afd60457e
+DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
 DIST kernel-ppc64le-fedora.config.5.16.16 207150 BLAKE2B 4c35d020bc11fb6f9967e007e7b9c20e95247ec487337f1a211f33ac0b32943e7788fb70852272b6459be1acbc4de0ceaddf23008afb46e2910bc79dd44a9d85 SHA512 827aa34644daa5e4526339a051721809bb6bdba22f148ac7d673ef28e954f04d9ed2276772a94b0c3139f9b89d12c324c0a274cad67c135ab7a7deb58b2911ca
 DIST kernel-ppc64le-fedora.config.5.16.19 207175 BLAKE2B 250ca1b8c1af33808550c76eb0de37302e11652edaedeff3deb3481b4832ea373f43a1fba42ba8daf8fbd86348b53870ae9dec7fc9d0a2330e461516bc7e3a60 SHA512 ac0a171e094c7761128d9d500bf8fd02b152d06b7df10c4b891ee26f2dc8fb4c251abae35f39944957b8920a86b8a3fb89a9e651cbc5ae11b59d4d34f7ce49d2
 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.14 223321 BLAKE2B 7605b06ba48c40841927a4f384d6b078b9b333ea5fb4b2cfee68a7ac9510daecd6e9e3555badae23f93b072a8d08b9503ef110dfbe35ebb058cd9a0c57437310 SHA512 e5ef924333714165d0afe5c33720920bf277ca341e939a99bc058f9ea52377a583fdd7aeb45a4060c6426c240fbeb9a6b80fc3dad19c75b112b507bd65369c98
+DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.5.16.16 216489 BLAKE2B acbcdc620673d003fccbb3837f6d97efb3c2661b40a2f71a559ac74dc1c4c5854210e54d9b5ded6aceda41fff9128851682b439ce9d6d2f217ce309e72d45ee8 SHA512 ad9e0b62278ad5a6bce5aa77163425cbc44b002ad86b6c5a636bb6545604cc8bce148149ee84b81e3097b1aa836b9e98194026ca720247179daffe084e2f7aaa
 DIST kernel-x86_64-fedora.config.5.16.19 216514 BLAKE2B e0801bd4f6aaf25374c57a8e638c0753bf33cf02c1309ba79f85d30fc14d69e8d2a1df500f30f74330d119fb70c5811185aca3617c79eb4319549842e0588265 SHA512 5303d79f912e5ea81145616b6238cbdbd27429bb5c694b3f39b1883436c9bc0c949528b9693d8e9ea89cce361f67939ee1f4c5ab12dabed2b59e212678006d61
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
@@ -27,6 +31,8 @@ DIST linux-5.15.32.tar.sign 991 BLAKE2B 3aecd518f4fe5e9135b802ac280fc2400f391236
 DIST linux-5.15.32.tar.xz 126254900 BLAKE2B 37db43d3fae8d56cfc9b4f9bd3a76f450b401cbe643c89191de4ab442cc0910fa2d67f2cddd2069d517fb426f6437ff7e05b43ff2a314da04f883d25e354dff2 SHA512 6d8955a6b71be155b153db0a43f75822f1f30f339445958828e1611648c8c6e0001cb118e9016a7119de80c28286b3e060da675aa73174a7a262fc8b537aacaf
 DIST linux-5.15.33.tar.sign 991 BLAKE2B 8ce39ce46dc10afa8597cad4a29d16124afcc2309b8cf9fa67c2fd5860ebb7b1f01a472e3507bb3dd6fb9b503a9c422bae9d88c4c1cd138e51396c9103711bb5 SHA512 be6b63c9bd61e45f254ca75bb863050bd2835ff3d5917e49cb1bc9569f27782a6005b0e07ddd17c60ff77d94838c7bc6f06ca9fd192c609941263aa6b6660695
 DIST linux-5.15.33.tar.xz 126280488 BLAKE2B ea8ee724a0e307432e22b78a2bf62d625a2f668bc1df69fa80d7f77e41523e25bd8b72ba20f38c7820dd01c44d270736ad05796ae5e3789dcf39281c92a67b82 SHA512 cc70547b90417a11cdd580aecbf703541871e744d9df7547bd155ada8c3023be2bea4671771d40efe71e5476a195a4e1942efe53222016409e4a72ba1cf10e02
+DIST linux-5.15.34.tar.sign 991 BLAKE2B 4740e4d15ea3896a5c5268387272405f3da169fd2690deea6310b88d2f4e2aeb09896d9d78deed3ca5ad505096a723550b1fe7886150760db0315389afcf603f SHA512 69279ab73daae6e128ff3a0556ed43ee0928587c5ff7d05e78ecfdc6cde6fe0c30416b38bc996d322943d809d65938fd0e311ce434937571fa18021ab72b567e
+DIST linux-5.15.34.tar.xz 126271496 BLAKE2B cd41bbc2645e5cade1450fcf96291287e88aa000b0ac2e41801df80bf6f637ccb8651fb616b0bc8b4c0a3ca69f7d4476a70c1a44249881542ad58de1919210ae SHA512 4417a37ae1c31fadfa1dc311271796f2e4cf7065deafa9e5b2153e5a396c6137196431fa3af33534827c1650b8497649c501268754275d6173c39f2071d47b96
 DIST linux-5.16.18.tar.sign 991 BLAKE2B f6a1302ca215bdba4e2bcf7302086ef88245b75d99b299ea29ddb13754af48e51df26b6e444fb05279cbf645cfca6b88d5ca08e22fdc48b62255d8e36b051d40 SHA512 3d3acfb75d44f9b515d6459afa00aaa7a2be9464229db48993af4a09affc69b5aa27ddb5bc516031a34eceeb9c4b4ea8792b01dd802ae2b0bf9330d77f341be8
 DIST linux-5.16.18.tar.xz 127574448 BLAKE2B 0688856007dfc535d0da1c72f62e923693b88f6c365074135c5c4c10e30d8d94fca817fdda74d3efafae976b3118ab25f534310affe9149eb6a51823960be7f5 SHA512 87241c3f001850758aa9274033120dca41b8388eb0c22959790002c58ab3c99c1522eed46b5181e286e629986da3e974904b4ce640c499ff56b80e2b68e93a0e
 DIST linux-5.16.19.tar.sign 991 BLAKE2B 723e4602394a7bb01b77bcc5be16f7b84f1c26c16bf57bcade988a6ee9c902ed5f9b46a656d656a6d202d3ac9cf75b8cdb57c476675e423431ba817019135d9d SHA512 549a748da70ff05e463a09e7f000ffd166fe704f73091845c7490045e2aa082eae246c770503e9ad9c2cf2e10dc6bf203784447d6e0c1431f9b1fdf1a973be4b

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.34.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.34.ebuild
new file mode 100644
index 000000000000..155bf3c6ba57
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.34.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	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 ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# 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
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		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-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}