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

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

commit:     ad32dc8aee8984fd5d9cc07e05c305d35ca96681
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 14:02:34 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 17:26:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad32dc8a

sys-kernel/vanilla-kernel: Bump to 5.14.7

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

 sys-kernel/vanilla-kernel/Manifest                 |   4 +
 .../vanilla-kernel/vanilla-kernel-5.14.7.ebuild    | 102 +++++++++++++++++++++
 2 files changed, 106 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 2fc1221c60e..696e3fbb5d9 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -55,6 +55,8 @@ DIST linux-5.13.19.tar.sign 991 BLAKE2B d26b1e733f84725318d8dbf1e9fcade7beeadc38
 DIST linux-5.13.19.tar.xz 119374060 BLAKE2B 6a05829867d75705e0282418bd68c1b60a4f2cdced39803458d67c975f8aa3ed455300c19300d7c7cfad71d2e5750b0b0750f825aacb0fb3794eb5b7b3189cc6 SHA512 77f6279fe7de3c0dd35946b991fa190aa70f5e806fa6188a0a676dad0939e2a20136b3dfc659dcac7870b387ead328fcdc287c8a25b63120bea1ac960117990e
 DIST linux-5.14.6.tar.sign 989 BLAKE2B a871082119f474dc0e451f7bdce41e9ce6143063deb42f47568e3158b3b4c243e67303e5fce34a55d9474acbb43f7a0a88e17a361038ebc0f4997587b4e9b0fb SHA512 ae930b77781474e177a86135cf0fa9645543b4f97f5d0ae0d5d5113efa854c578b358d7fd087dd71405d77345c60836292720ca0f7e346f9c3ea112f8f316289
 DIST linux-5.14.6.tar.xz 120689192 BLAKE2B a60c98265c4e795cb8fad90c57b9237b586423c6c8d6961c2f64db13bc6203925e3e6d79ff8858f32363a45f7f1a463de1014fddf9f4a14216a3d3ba638327d6 SHA512 117b466e7edd9e2cac79ae9559ba1e24d7cdf1cc6b277292f08b58baedef7a8d6e17a5a16fb47f662d9b2ac6fc36b2c561dbe4b95d848e645a6c6b27c8504c51
+DIST linux-5.14.7.tar.sign 989 BLAKE2B fe033dfdb6f5ac14474a7e603c2edef98eb7318d065ca57bbf7f8bfea0d1fb38d4d62dc28a3b014a3cdf4be64d36b05463d5902afdb794ea1b609e5e2872e1e7 SHA512 4926f4bcf283e2afc3bd5e7340e3dda69c40e5bd45d1b9effeade05fc04595c0153e05f07b458013224c950feb967127520cf9c2ef6d0e303b7545f10e49a871
+DIST linux-5.14.7.tar.xz 120688920 BLAKE2B 861405cd1333958cb829017b6c1d6692a7256d179a48fad751bb02cd02ba09227ff210d9252c592a99d3820c1fbdcc3a6e133cbed31fdecb68ba9cf27dfc8f78 SHA512 ab1dd61a9e0e5ed82b38684d01fbc5c00fbf28acdd5ee754095a9fabe5a5fca7c220b37f80c2adbdd0bd46be461ded6397e40f7a827ea18035124f06756ad743
 DIST linux-5.4.142.tar.sign 991 BLAKE2B 2d441365323df4e0ed023917a5d9eeff671e29d1afef32813d6ff4cf554a191237e27acc1c1192817007a262bc8e5d8f42d7aa14ff0add7cdbd656fb20cecdcb SHA512 728a40e0cee11d6300ee3b1f13b329496de0d5e31872dc8335169396b077678c8bde4361c5fbdad3e54f8761dca507cea71bf8cbf5ea675c9c8d7b055c073e2c
 DIST linux-5.4.142.tar.xz 109145144 BLAKE2B 680d4a81fb20005d39dd6d1b512b0e744cc7d6fcdb45e6d67c166d7ca7dff83acd49cb14fa4a38369d77bc91cac0b36190a5b1f042495c40fee9b5e7ecfb2dd2 SHA512 fb9b9f345bb1d46e48adbaac7b12ace50f279451793ac3671b007447d3e38a59d9b9ecbc55866fa2a6850babfcd1ef7528234f2ad73e68845a858b3b7a1d573c
 DIST linux-5.4.143.tar.sign 991 BLAKE2B 4d2d5f6cd7c78234e074d59a004b1a96f86746a9b692d7acfa8afe6ce5bd40a02c86c7e53d2749c71956b7a5862bb0d4f46b79b1a6211e93028b53728db4b477 SHA512 f8fde6c2b06c3a7ab9b375f90177e1809460514a95bb78c1533bc55df00b80e09c87145b67d5ea336dc3d25fb9406d7b6818695de1ce0ed1ead60fd3df3173a5
@@ -67,3 +69,5 @@ DIST linux-5.4.146.tar.sign 991 BLAKE2B 02f30d6bb764f55bb6188df4e76a18a6c1c19a50
 DIST linux-5.4.146.tar.xz 109153012 BLAKE2B 990910051f220c249b2175593129e9343b4052988106955830e96cb42ce8ca6477fbad6a724a80b402a4dc838279a81c5fe2de398510ccb9ccef7761683c0f05 SHA512 dad8b4f91ae5e40c24e4f7c92c1ac0846dc1b64c36208b897ab52d7db656d961cc2f53ad038aea0da9955db37b338b9cbcc7acf8f2010e7eed87f69e54dedb40
 DIST linux-5.4.147.tar.sign 991 BLAKE2B 206a6506e33b6fe04a9c6f9a3cb0f95853cbc8e9bacb03fb34e13d95098786953b198dbe992f39c8ade1df406e83d7c03171843705899fdbd852aa06b22f36b9 SHA512 fa30290def75643288607fc842ee4d8ddbdcb35f2a7a00b38e59398558f686d5c9ca2beccd49b6b7a22f1d6c9b67b91386f15f8712af2af558fdaa5b9818d5f8
 DIST linux-5.4.147.tar.xz 109149012 BLAKE2B bb0d41ac28c2b02d27eefafa643e7a661ff777c5682d1a47c1cb8df84298e66c866877c18dd8bb4de2e64e72e1cab7fe8409305a48baef90625a96b551cfaa82 SHA512 a1dfba5b7b3c6f73bd662132c1a5f90e0a9ea3d59404c2776d260bf9144b7e45429c6758c3c07f2c6e495fad222243418a3ae5dc3a5d5bcdafd9a62356ab1cc9
+DIST linux-5.4.148.tar.sign 991 BLAKE2B 7e1956bb8e2f801374bd4a7247bf36f1153ddc4edcb417fa311e33b748b3c1448f3a4dcac2825393002232976cf3ad86d3cc0888398bebe5697e5c93b63f59b5 SHA512 abb9491a3315e23ff2939f1d15a2df55eb34561b0340987b9b40e992ce43d7de2cff9b9a729f41b0c030aa0fa783f983823a9100f97c9cfb43402851b6caf13e
+DIST linux-5.4.148.tar.xz 109151568 BLAKE2B 67891fe744cef7a69ea992720256a88e1497a5b687e6f43aee8b3ffde7933e99c10ae5b42d954a6f56435677dcfe53f73f577601adfcf40381ae2209d662e942 SHA512 8793545e4ec419153f8a7c9f4b779cca2d5a2abaab8ccf5d482473282faf71284f6ec08fa195e40d01803d65c079a4f23fe1d95a01f966b7209015635f5e0d23

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.7.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.7.ebuild
new file mode 100644
index 00000000000..d3a06ae0974
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.14.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.14.6
+CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
+GENTOO_CONFIG_VER=5.13.4
+
+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 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( app-crypt/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
+
+	# 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
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+	local merge_configs=(
+		"${T}"/version.config
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}