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

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

commit:     d378fd703d03280bfddcec26a6c18ebf389e06e3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 11 13:40:14 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 11 16:57:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d378fd70

sys-kernel/vanilla-kernel: Bump to 5.10.100

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.10.100.ebuild  | 131 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 0f4ee6c444a0..1d3ac20c9a2d 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -20,6 +20,8 @@ DIST kernel-x86_64-fedora.config.5.15.14 223321 BLAKE2B 7605b06ba48c40841927a4f3
 DIST kernel-x86_64-fedora.config.5.16.5 216440 BLAKE2B e79c8445467b70937c4a0b44f9d9488a264603335b93711ab52cd9499523fc4fc90c9f1e1acfc3a4da3f5e7a1a35ff36fb33411e600199940a8f8ed32e962a4c SHA512 2ab3e7cb9999db8fe015b21d7f6c7b1f0647b8657f09e8b256c9164ed778d5fec5aff48c9b9048f100adc4e17d078e89318126c417fe34142201ee8f6a03837a
 DIST kernel-x86_64-fedora.config.5.16.8 216500 BLAKE2B da5d13e4d2bae7e06768f6d1a478f00e8d198339a3961b80fe3a459c74908f675d03b04c59a20f9b607048189de9dd82ba0efc5d474bc6cc54d2395dd5c19c68 SHA512 9e5ac243e1c9f55a3df09dd4f0a0e53b34a557a96989250a5f0649142639d22bc4d12b57d49cf62051f52a4eac040018a97a839164dd72eb16118a6dda3d5ba9
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
+DIST linux-5.10.100.tar.sign 993 BLAKE2B 5f1de1e82b12d25802965038847a5aec97b2dfa055f645ac43a9e9d98963793b56df5cb057d587880fa28b86450655e35e6daf651ef3dace51aef34ece224bb8 SHA512 ab495500485f52a14b4a590b67564b1d34ee9e8e4f3027836db91567e0dab33e0e3ef2c4f55b6ba3ba16a2e487f06500fe1df73966e5c8b844f43c0ea53418fe
+DIST linux-5.10.100.tar.xz 120379824 BLAKE2B 670a674351eb35ce33be67c05e2d91de3f9f3346d3cba5c419286e279a647cb901aed4506f5a50c28b36df0ba14f66f896dbebc2c99d459a3b8a6a5944899386 SHA512 c20da85f73f46dfe6f65c6faa1739816a514cda6b5caa78b9ee21030489a94cd40fefe09ba2017eec9b195ecafde3aa1146a353204adc7575413a0f67abf91cb
 DIST linux-5.10.96.tar.sign 991 BLAKE2B f831c2a0879f1e0fe6e157cbaaeacd654d594de5493818cddc80654b71c0306a4895f382c0353afa6cdb6e8694df5ea6d96124216c20c414b296e92103163528 SHA512 659fba26e1bb6d3a3ee2f128db487ec5036bfe410c3135c1d504e2a87480960c3c52f989974f534298edfc1166be979e3a6b301990f04aa3bfffb80f8d639d4e
 DIST linux-5.10.96.tar.xz 120375044 BLAKE2B 71c2a44c7a170532b787e5c60496a41d5173e7d34e0f5d60808e450f9e91204c52e2dcfce4e63eca44383ebd42cc2ab1021b7f110db03fa5d5f7596c9e53bb60 SHA512 c852b38613dd8dbcf2638854d0f953655a7c720d9a3bf4774cde61609040214358ce9f67ad94fac117f1815b4adc9ed8dd7423388c29acdc2a675b06219499ac
 DIST linux-5.10.97.tar.sign 991 BLAKE2B 85a5a1000aafbdd300593955e887c4d7be5decca4b09d4f722e4330d2d1b2fb6fd54dc65c4bdcdb992d538ab372aa5ab3b23ce88ae462197d4ff4710d3ecfadc SHA512 af193c493ff7438d856b70474157425e63e4a693e36d924058556460de7218391d31e2b490a2a6df5314ab5612ff839c2d39359aee79b4e3bb42459410ea943b

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.100.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.100.ebuild
new file mode 100644
index 000000000000..db79c9db5598
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.100.ebuild
@@ -0,0 +1,131 @@
+# 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=5.15.5
+
+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/v${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[@]}"
+}