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

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

commit:     a2fcc34696b3da6ac269dc9897b09caf85a47167
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 17:10:33 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 20:49:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2fcc346

sys-kernel/vanilla-kernel: Bump to 5.10.130

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.10.130.ebuild  | 134 +++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 4cabcb55a672..e45673b0a997 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -19,6 +19,8 @@ DIST linux-5.10.128.tar.sign 993 BLAKE2B e79fe715fafcdad93960bb402d16a0c38325693
 DIST linux-5.10.128.tar.xz 120435292 BLAKE2B f55bb329c8c577123dddd98eef91925f2804a463406313629f9ec993cc82718fb1bef82a921ce6ce6ef5483437468ae3051ec371316515ea6d34a29969e02fb9 SHA512 c652373845c58ed224fb51402326abc4f0bd6b237d6dfb132503b3352eebf4ef1cbbaa69b1e5a62c2297d194bef0538cdaf6334d8f334a0834d8701a0bc6f3d9
 DIST linux-5.10.129.tar.sign 993 BLAKE2B 9face7bae64d60e9da9618e0406f6fcc271d2b71d488013aed292c99db29b50842cec615463a4e9d9051969fde97def583ccff404a502c1c78426054559a6d71 SHA512 0083c08ac87dbb3a24f828bcda65c7066b8fed12910e6220e7e80875988be567cd76ef8aca41bfa0425aa3c652ab89e42c5a6b11d3a905878a195ed496a8ad91
 DIST linux-5.10.129.tar.xz 120434312 BLAKE2B 1394f92c7db5ce67978bd3f7a66c3481823fb84b6f8a0620843ac46de042e328829dd6366187abcd4b181d5802b230e37e4fb8ff657dbc5933bb87ddaa9bfe53 SHA512 fa3080b5f0f135d721b25786a658c984c454bc40e68b2c408a5bb23a21cf5f8b91deba9ee11480b89c8a0cd3d951f9217756b6aa0b14fd7aa51c14d1ee4a0e49
+DIST linux-5.10.130.tar.sign 993 BLAKE2B 840db76a087d3c197a14edcba8dd0f69efe29abc150943371ec3051515a4a9bfd09ee6d36d3f75a85303d0e71ce787b3d6c7adc5a56c668b5eaebc656817a9c8 SHA512 4a667bdcf50056a9f13e8c50aee02b17a6a33bd5062c1902059ae6c53c0755520046a743e166a0ad7f719b78cafcd59b56b0efb8d0f7aa36c0f5110a89aabbe6
+DIST linux-5.10.130.tar.xz 120428404 BLAKE2B 21ee79ad11b3c0982f3e532b198f18bbe704aa98030345e7f0bd1e06eb84f3258f84bc1e24b2bf701933ff395b9aeaa28941015a990f6bd408dd2ece3894bebd SHA512 a0d37685f11bcf93c96ddce1d64881ada3cd9e25dd0006e923c7caf8314d106e9779bda8cd49712b8574e810c37dd91f09c0014b37e84eb5d32fe330a4c529fc
 DIST linux-5.15.52.tar.sign 991 BLAKE2B 321a5eb8fd8cad2d14705ffdea3fc0ad5cc4618defbe8426b978aac10c28dbf0b4f15a571c16c22ff2437f87ab8d70ade815c5f76ce0d763ad66846a27e02349 SHA512 1ab45e728a768b704ff52551e31cf91fa8a6ec008e3f2aef387b925ab18dcd837f4a4b71f85a7bb96b0ab403c39757ddfa8d22578117728f594768904bc5ce62
 DIST linux-5.15.52.tar.xz 126364084 BLAKE2B 9baf5b0182df91790716f3629a6e163cf87d8e9bde79350f30432e7446d2033de9d081f1693a758a3830a26c03a8bc13713394fd82457afde33ecfb9e353de2e SHA512 01852559b30b177ba350827b076dc58ecad020e63940482e694286ade3debe53919a4514338536f46da1aa4f89b671368a112a913a53a0352d033252bc6b2a1b
 DIST linux-5.15.53.tar.sign 991 BLAKE2B 4d890ec6f124577094dfa178fd64dcbb99ef7f07f3ab5bc6c5591c1a2304286ad8285b3d7bb405cb127b33f05a4bd2bb03d0e438f50c1fc466346e3530814a85 SHA512 e7206e9551b89b3aed1835d8e29832ad457d4c375ccd53c4306bd390d714a6a9329d4bb2f71bc2c2dc4bf932ada7131c5383f23a2d71c44b6a0a8365de7a9b7a

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.130.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.130.ebuild
new file mode 100644
index 000000000000..96cb3e86fc4b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.130.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.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+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 ~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[@]}"
+}