sys-kernel/vanilla-kernel: Bump to 6.1.8

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

2 files changed, 140 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 4aa84d0aca8b..4e4a14e4e8ab 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -6,21 +6,25 @@ DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.5.19.13-gentoo 246842 BLAKE2B 4a824d02999749a0404437cae28721576511e06a5eaa9ebb1b1479c74e2b54402c440be7ea9159bf304661d4baaa5381c36b266ac0bba0b9bf3820eb04c6e4e0 SHA512 8862cf24b177ef3871f118712ceace2b496b04a488b045bbe3d83ab22942f064995486f5534630321faaa96ce60e5f237c4ded24a5468bea6e365aa3ea9f09c4
 DIST kernel-aarch64-fedora.config.6.1.2-gentoo 253196 BLAKE2B 92483220cb6820926478ed830d14c156d2c51e16eaf1bf05699958e23374dd61f38b2aa9c8385eb8aed0a00a4cd3b1d9373aa2d5f851f1cc13cf3c68932c9907 SHA512 09ce9f3f2b11361e4a641cfe95ff89098d2c8fa97957e1b74a1a7ae6db72cbe400593a498c10ff175be98fd506292cf25c8f315719b4d6cb7f72047746126d12
+DIST kernel-aarch64-fedora.config.6.1.7-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
 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.19.13-gentoo 223571 BLAKE2B d56f8e019b0c58023b08ee358a9af46679ca0f734c075ba6cd65dd6e3277640c0b7683e5707c48f687644d815a3840eb58351c0dee84fe9ec1dcea525fb2e1e8 SHA512 0d9fa0592b6a9414f2967677c048a9e014a0e0d43274eea4fe10f8099befae7389bbcd033f4fb36c7c44bd30c2fb197e860151e27c10dc354fe9a86a8bb65e94
 DIST kernel-i686-fedora.config.6.1.2-gentoo 228267 BLAKE2B 51c15ad3d0371212c94e3e79832df10f845e242ec3ed7d1e8cee1d00b467d1892454b9c10f83c53e271a40952fa69678b3ede74133d330df2f28bbcbf1afaa62 SHA512 09309d861c15e9b2ba10ccac60679bc0fbf1b9625f78de640b0d7914472b3cfcd8b34f996c399de3e31d86c5bdb1dd394005986a317d24b04dc2e82188735f74
+DIST kernel-i686-fedora.config.6.1.7-gentoo 228053 BLAKE2B 1b06ca68465d7833905b6236a6ccf9a594f44613cbd102990c1667c1ece53ad982fa3abbfe475333e3297331ce1cfadf27c00c3e7de6293e213278e8ca97cd3b SHA512 1ed70eb5254a04d99d28ad901d4556dfa7e8ec8b739a0a33040315718effe9348e75ca8ac19d3b33fa7b3dcad9b4bb0531075692087c0dbe57ec6a4d873a4b27
 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.19.13-gentoo 213984 BLAKE2B 9abc1d2e03bb34908019dbbc4e54d3d176acddca6e7af72fe73461e60eb249486c4e8a81bfe2515849aa26939d9abef5e981deeaa55605b34bb59552cd3444fe SHA512 d857ce4178950a96ff029c3c9870211424e1c5e95dfef88d25d6d1d517493a6fd95d9d398f42b8a6cf72482b07789be38f674dd4a2b9855da57c8391b0c2708d
 DIST kernel-ppc64le-fedora.config.6.1.2-gentoo 218535 BLAKE2B 2655ce32ab464eaa18b9fa10355b39cbbafa425c99ce78381d443783f06dee6c836b16d9f870cfce09deac5c4022aff76e1921a34fb377036731fb0b577c7792 SHA512 7c0c2a83236f98fa63778b581d6498fb9321312730c68640f6c00a17294142f01c09ece7df8b623d73c0bf04b32b62339dba832ef7fd43f8e2a4b6b0432d5bf8
+DIST kernel-ppc64le-fedora.config.6.1.7-gentoo 218278 BLAKE2B f4dda4430e9801c4660be4bbf6e4b37052e720656e77c928adb7176ff3dba55feb2fe66dd564d41a181809488941cf392ec9c94d786e4a3d813fbe5d683d305f SHA512 a5e12ab1045fae61b494938047cf1c2a3c34693d3d242968e4ab564a012c70e6d232b9d5333347f5ba114a64bb59dd96919b38c5a1327fb8c5154ef40ad28d2c
 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
 DIST kernel-x86_64-fedora.config.5.19.13-gentoo 224246 BLAKE2B 6dd95fc7a8bd38387a3bfd6c00733220b34091961c8437cdac61e4376de8b35529808f3b8e2db91c1a0c90e1115395df153f94107e6f9884a61bf646cb40d25e SHA512 1393e6315581a4934a35f3e66146d014ad154025fbc71245bd4b6e7639952387449b69df41605df8590a4d363a5aab5111b442b1a9f56b4d2996ca416f7e5c23
 DIST kernel-x86_64-fedora.config.6.1.2-gentoo 228931 BLAKE2B 9cecffddfc2799acbd2a1f4119fe41f0b591be4d8ac40c673e8d53c42e9d03f8b43656b679bc723011b77237369314ecadfc4f25d28ac81249dc0582d33ccc3e SHA512 501942a4c1362ae9ebdf55737792c65fd6f94daf6744ca7535a2c4fd5212f883f43911743486b90637eb49abaeeeec6d9ffe6ad07606e66c59296dab58f516f9
+DIST kernel-x86_64-fedora.config.6.1.7-gentoo 228685 BLAKE2B e68236ccc1d51b2aff850eda9f3197b7ea95b8a88716bc7b07dad30348a86fdbb99a948060300dddae73ca82267d851d357f1c9547a9dcefae1364deebdbd124 SHA512 42bec2ddb9cf7eb6e84bbdeb23eb98dc11c9cea41f6134b776010c6b36833b520a290f0ef0145379de15c7f7834398fa5e3aaabd7258d7d4e89567faa09eeb4c
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.163.tar.sign 993 BLAKE2B e085bd8633c659a431f1d6cf070761238e2cd52b63421be67870009afbb90316cdf5ad6c58cce17614cb0a06f067f5daf22d864aa00bd9940b59deba0b31a294 SHA512 6e6d962157828fddbae6c98d00c27d22efb3a2cfbb45d3dccc86ca1a73e6d70f80e5a58f92469e18a5448237e40b77c995623deff88fc328ff333d48fa91dbac
 DIST linux-5.10.163.tar.xz 120553276 BLAKE2B a9806d2fcc28783976a78d5f1fb4d10f1523f0fce35c5bb04485cf54db843b505350be3dbd31bba2b528289bfc97cd2719b54756512409fd03a158f37cc1940b SHA512 8c405ccc8e0ab1748058d7e135ccde5501500d535fb8c2023c4c6a399be8957e5d6f9398ff30769078bc8699509db333f158f79fb8a6e7b816aa1ec413ba8ea1
@@ -44,3 +48,5 @@ DIST linux-6.1.6.tar.sign 987 BLAKE2B 3d47959aff69520879ce9f2d63b2e9f3d8c0f33c9a
 DIST linux-6.1.6.tar.xz 134782796 BLAKE2B 47fdcc432bd473b3948bc4b618caa329887026b86029dfad055a9d4dd5cccfdd86df48bed7dec7f9f1a037cf955e9c024f368600b5ee8bbb0a46e4620abbde10 SHA512 b162ef2033485796fcdef5613c3a11aa7fb23faa590a1d5391e29af4526dbbad49554d7a7d94f5c5bd7cb9f25b8f73e898684b4bbe9a1e45fc181e7d0fd3e0b2
 DIST linux-6.1.7.tar.sign 987 BLAKE2B 7f7ec4620b38c7435afb5255b1f002de4307463e6be36614a5e2352c6f672255d16288c8760ffc0f9bb015997ee401c89db458bf004c961a7584f99dd87f31a2 SHA512 5dfc368eb50c27a87de1615a1284b353f5cdfa26ef9878c85c4b3643bc11749f8f0ccd337834e58f5f25b1332238c54322799da9adc3ab9118317f3fdaec2aa4
 DIST linux-6.1.7.tar.xz 134784056 BLAKE2B 13c970a5780fd4ed97a0ff5d7c13e2f5cfebf608199ae94973f3a8a109bb961f1effb45bd61a687f5faaf784a84b4c88b5a4bb75b7a1a943f44cab9b6ad37ce1 SHA512 8b9bb3fbbea2d61314145cf6e4e1140372821a1e9ff79c4da363039c54fe73481106a5a85df0141dd449f4a21e946093a7430b14896b601c5a8b1f776107b35c
+DIST linux-6.1.8.tar.sign 987 BLAKE2B 2088a3f9f07dc519866c13bd2057dc33865421fa0f65bc2ef3aff1ec1e5a0823ace1c2c1586583503674e79ed16194aac6aea99e2e38c4e4ef5ebb7df7c0a01a SHA512 212c199027ff671ae0fc9c455494c6aa73e23ef7fd29025d924406fb07bfb3458d3fa420d5ab5cbc9f2e7e3a7d2992fcba2bece55e64c434555ba2ba6a6f8060
+DIST linux-6.1.8.tar.xz 134789376 BLAKE2B 1eeab95bf09757131031ebeaa3fb66f01626ecfe3b72d0044176613d027ac6643c688a0bb8f4493ae6faa3d3bf0c89fcdff3c28d7b8375e59ed6e8bd6d856e44 SHA512 c5af551e441f7f987419833a15d5b2191e13d1c321a022aef6b12227017a3f295e42e79cc6b8a05f41f7374ef11c8aa0d75bb8b1c157aaa072e8b8681364e783
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.8.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.8.ebuild
new file mode 100644
index 000000000000..d423f31ff706
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.8.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g6
+
+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/projg2/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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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[@]}"
+}