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

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

commit:     355991f593a846695df8eacbc5e15fcf7f4854bb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May  2 16:18:31 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May  2 19:53:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=355991f5

sys-kernel/vanilla-kernel: Bump to 5.10.216

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

 sys-kernel/vanilla-kernel/Manifest                 |   3 +
 .../vanilla-kernel/vanilla-kernel-5.10.216.ebuild  | 137 +++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 11fa031e5756..34861572ac77 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,5 +1,6 @@
 DIST gentoo-kernel-config-g11.tar.gz 5077 BLAKE2B dc17ded74f79baddd703a78084113b85e7130877b300b5fe60453cde515fe37c52ece7877049bb0ef384f74ecfc73d59d7d4a513f8fef7bf4f651599946383e8 SHA512 e91156765ef2a48396370f884fdecd7bb1d600e5167f6bad51130520f886e9198adae375adf3e40fa803abc5d5482057775fb0275ab2589bd8f94d8af4a03c4e
 DIST gentoo-kernel-config-g12.tar.gz 5181 BLAKE2B e5faf714fa197e69c4f17f90d60a9ce4acb2fa2dbd996e1ce474a6ca370541b89f24ecb635657656a57913df87046bfda1766517093898a3c3ce0908ee617811 SHA512 b3fb3c01e0a3c3179921641b8314ce8e4ad50c94c33baebb4446d002d1f16c35b4b26cb02dfcec6ee00d8724abdb03e0fab6b0665d13ce5cadd5e672668420d1
+DIST gentoo-kernel-config-g13.tar.gz 5759 BLAKE2B 831f89078e539c8b4ce244528dfd847c12a45b52d540eb10d85ec0d9deb1c14288d8de12456865c92d16e3523ec3595676787a8f3b79545d76870b0fb68deb5d SHA512 2a7230cce57a67e3333f9a88a311afe4a928e27ce76036747451cb77d3186569ad11d7a5b827748ad53290a17ad63637a8362ca896516f85ff0944a8d68265a6
 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.6.1.7-gentoo 252811 BLAKE2B f6bad0d23132bf0dfbaa25db928a95f39763b6500fd1df9b4aeca4351e3e75f185891c0df96b111ad840e4bac431d74a9b11e7344e766ab49715663c89e4dbfc SHA512 41ebf195d8b656801d49c6bb693ebe1404b6725d70d88d93a75bc4af230030d65ef0701ea931846b022a3c598dcca068fbc38ecf6d064262b3f5b88e57060437
@@ -22,6 +23,8 @@ DIST kernel-x86_64-fedora.config.6.6.12-gentoo 243607 BLAKE2B 7e670d37c6471e50aa
 DIST kernel-x86_64-fedora.config.6.8.7-gentoo 247759 BLAKE2B 1005d5b08b75419ecfcca207b407ec3a80e644d8b8feb03ce70880de79ea4ff17f56175b7c3c4ffa8279ca42edd154161ff10e89fbefc43d71f4c0eb614a094a SHA512 fd2d6ef4d2b426509c6ad42cf29fe1663a95a9ef4277e9cf300c825e58689e2eabd37932c55ebabc11cfc2694423b75cd215f206ee925ae8945ead61266c02cd
 DIST linux-5.10.215.tar.sign 993 BLAKE2B ac8cea63b51933f95b75c91a27043955145a5fa28890f64af66c5722e90b0f7219f24104cfd53ca8a70340074679d163dbaab9825551be08081e02e4d030867b SHA512 c6352f67c108a604b3afe2799849747a752a1ace19257c27bfb186b4ea56455bc5ac85f6ff24106e617c5d4bec521566dad6fbb1f2457a20e9b4e102ad527e68
 DIST linux-5.10.215.tar.xz 120652408 BLAKE2B 92baf3d943a0c8db530f0435d5a9d73844beace0ce7d67821169e081c21a93b891622997f7ea410c53c17e8701269727f4bfc6af71bf54009c4202765db39a76 SHA512 1dca114ade79dbd26b4eed31a1b4d39732edce6cfaa9815ca0a99151fc6d487336a383355180830683c5c0415262bfa329f47b9c5c67c5008e2838a0533a7f17
+DIST linux-5.10.216.tar.sign 993 BLAKE2B 7d049ccef5511bf9f57094e768908da7dbc77b8b4d15eaea56610678d4212935f3ac5cc5252983d4d2755d1fc3b7ca46dc4f2705ef60202c478d1f90385615f5 SHA512 54679b6d929c44f96ab2e04ff9753b5512a5f26d9fbcee012dbae47de2eecf2fad44964a2bba7d4db4169563f41f3219713d9fec5cdb6f9b9a0b67feeeee5355
+DIST linux-5.10.216.tar.xz 120652008 BLAKE2B 1a16f726d94875479ef76a69a9f1ef8642c1a11bf12d53d527750622571b9a26620e6d01ec42ac29207ebc5025e44fb6dd9e7249f0e89149691cc512a2b85ed9 SHA512 d407add11bca1b41a4dde118c9fef52dc67d2f0aad1cc1ed77143104d7d9b7ce1bcd4661681246c06300e9ff5155fbb8d901428bffc32672b6e531ad10fcad7b
 DIST linux-5.15.156.tar.sign 993 BLAKE2B c606bc02fa75747b0647913fbc8acf4c9047119e235eb9ab2a555caab5185e8a7a22c72524bd8131316888923484345a80771864ad94d6a20872e5e6df584dd3 SHA512 e29269fb58f118c5747cc8b4943ad6bcce9b285f087bc93546cbab12edc179b03ed49736a219bc96782e60c901329124e9791e7ef25aba7014b2c6324338210b
 DIST linux-5.15.156.tar.xz 126642224 BLAKE2B 55c20146a7065ab491867d4b5f03d651399471031c8d4291f3f493bdd223c566a9f38ad66e8662732c2f7183f3fa5255cb4bddd069ea1d5cffd6ebbd7c07835f SHA512 567e6ced6a2d3a47406f7f2ddb92773d349ebc6fd43423af5ad29b55e66f954785487cb1257e1b72b1257479895f2b31c6e36761ab12bcce3dcb3d749d5c0bb3
 DIST linux-5.15.157.tar.sign 993 BLAKE2B 120a557b7603fd80205003b81c5b4cad61414ec407e357620e29296c09712f15cd50b0e06e176ef87ecc17be5c236805435adc23d29ec965d20c7d6bb32617ea SHA512 954711d4ed03fa505c0453f3d9aa8bb074d418a303d5d62ca56e7665031d33747f14219fb7c4a966804a6aa348b09d98a3e201e09925b9d30bf21d97dd5cc0dd

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.216.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.216.ebuild
new file mode 100644
index 000000000000..900f0cd17578
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.216.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g13
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	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://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 ~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=/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[@]}"
+}