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

[Michał Górny]

commit:     3b280067e745f70e4cba4581f86248efcc680551
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 13:53:00 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 17:28:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b280067

sys-kernel/vanilla-kernel: Bump to 5.15.20

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index d21ff1bf1f18..de5149af4ede 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -32,6 +32,8 @@ DIST linux-5.15.18.tar.sign 991 BLAKE2B aca59944c1898d3e8267f776d3c2a748a8efeeee
 DIST linux-5.15.18.tar.xz 126228144 BLAKE2B 94190ec4dc73c52b736a081a097453c29e1f1b86d6536a2a4393d8fd219da9b81f5667f3cc0e9eb2290de88ee1b14c7685ecdb162ee389a7dbf1c081a97abc9a SHA512 f3927c06ae1b603191fbb2153837c9b45cfbff291121df7e01af3c139116301af2d530ced01b1144b1ec3c317f156d996d98da84bb53069fd736e2c33ebd7678
 DIST linux-5.15.19.tar.sign 991 BLAKE2B 80e62e341cc1c25f890bba25dfb1872842a9e6652cdbc9c7aeb8f16f9a958afba2299485221669ff710af68bc46dfeb4f9374e216f65712ec2b582fbb62ed3ce SHA512 e870fce5b29371aa8ec2ccffc6041566e0194a0a04c089a26e1b0ab53ade5388cdda82acfe557db1fe5b67b9bad62348acc28e0f29bd23884dc413c46ba8a310
 DIST linux-5.15.19.tar.xz 126226608 BLAKE2B 80f03833a90fa8dc233ecd6b75824adb5c529518ba47a95a7fc6d6547a5e1772e29ef88691516482f0185c46df26cd78eb3048bc865511e8dbbab661f6b1f851 SHA512 58dcdf71bd8d8dcaf2932b6b86a8421046d0780361ad6c4f2eadf3ce1805f106da894d0a6a62cb0919186a11659d7ba36cbe0e956d5ea7a5419e6f43698248b0
+DIST linux-5.15.20.tar.sign 991 BLAKE2B 0d0f2a8a97a991af1623a1e3e49fec2974b9b584d32c8853a615aeace79df2f3d53cff74eafe885d0451b374772c2917a11913b00099e6181da7579396df5494 SHA512 25115588128f813a87d30f02fc44d5ab4bfdde1f31c5266f7807d1e8f853d9594c46079b666fd26a63be08465f946e380941a08e780f9f1c2923129cb60c46cd
+DIST linux-5.15.20.tar.xz 126200868 BLAKE2B aa1fce6c09c4db0be4540bc15d2bc799e62047621ffb9f40ff709fdbab6c4ae983bb0a47e1a7720fd395b28d5d467febfedea050ff243f39b08399f86571d02f SHA512 49890763271ead7e9bd3501a320f3dfae2e0af2e07e74fced08757e9de72c1a8f374f58c9c92517b4fa523b8a81c7a5de5bb529a11c4e0ecb3122128ae3bd627
 DIST linux-5.16.5.tar.sign 989 BLAKE2B a55d8da745785fb479519fd9daf745bae4be54e2b8c135b9f51af38035b273de86bc54dbb7598f98d3bebad995889a779bd88f9d65b2ade44d9bc995ba5ab2a6 SHA512 414f71b299c7624604d1e4b5cc894c888cefded016249d2cefda54727e043152a6abf1a62daccd4934348965c4a574ecad6b098d38774b114098a6d74d9f6921
 DIST linux-5.16.5.tar.xz 127552076 BLAKE2B 9eccc20c59a93aa21349ce99b88638de8bb0589037e91143d23932cb5312878bac7ae95adfd0f95b79ad0085f74109577427675320e4a2548f8762661dcdc8e4 SHA512 bb87573623a275a8860728e9586f0e63aba7bd868de55ce27871f615e9b174aeb18c3faefc41e3d656bc998768fa3e3c6097e9d39c32fea48d3769f46c48a2f2
 DIST linux-5.16.6.tar.sign 989 BLAKE2B 49eab210f7029b8a24cbaec467cd5b1ead4b22a00d3132fcc619aa9c0ed126cbf3f763f8af49447a4a258d990a5a707880e2b5705b4310c066aaf41a54086384 SHA512 b1f241b097bb7678b06b361f35060c1d0846d5a3001b98238b7a81c3fa965b9eb8af13144bd6f4914fc47b16f2810ddc7b25c60605aeb99fa03a705f5c024b2e

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.20.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.20.ebuild
new file mode 100644
index 000000000000..ed253cb414c7
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.20.ebuild
@@ -0,0 +1,132 @@
+# 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.14
+CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f
+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 )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+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[@]}"
+}