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

[Michał Górny]

commit:     0766eff8a7ef097f0db6faffa4312b85c846aa1f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 07:06:52 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 10:39:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0766eff8

sys-kernel/vanilla-kernel: Bump to 5.4.161

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.4.161.ebuild   | 102 +++++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 3c46bd2068fb..ca140565cff5 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -49,3 +49,5 @@ DIST linux-5.4.158.tar.sign 991 BLAKE2B 533dbce299037f4b4fdb79a8562cad9d05ce4027
 DIST linux-5.4.158.tar.xz 109178500 BLAKE2B 2f17825064e6dd718b3ed71014c9442fa4970066b496a81b059a8f84d22d1c5522569aa672ce08597a56150eff6315f19e7d0eb56eccdd8d9505f1cd1f6ad901 SHA512 ccbf29c70315055ec7f63eb29262970c68162f2e12046cb45ec17aacf0950e0ed8e60a236744f2fdbd4fe5a0b14e62cdbbb345c32b089e5172feb5e170faa14d
 DIST linux-5.4.160.tar.sign 991 BLAKE2B fee86930c4de94769f5c0f4baa4e268412873abf5ac80007aee6452e9a7ba340983b96e7ad5ae91298a245c0ba1541a389fe6070299d6183a05009e38c51dfbf SHA512 5c9b13103e2b7115854d32cfc39b508ef9f0c9fb74a8d83af63b3b514ae280ff6c6e8e576e35bb7ded3d848cf19baf33eafcab7c651002bcd235af5d86118586
 DIST linux-5.4.160.tar.xz 109177312 BLAKE2B 0b42b1e70580ce0a49b2710c8eda28ba5ca397e954c8aa58d81c53fcbc081deb2fb96dd412df026729396a1eaae2bc040fc65dc1bc6e7f5ee9fad2f6294f6e91 SHA512 893f369e898ef0667b7a0897e0268ed254116024fd5cfd1887cd1052547c478c9efe0a928c95d3b07250ea4447a06bd1d57028eef9aa0e8b8c1565e44e20ada3
+DIST linux-5.4.161.tar.sign 991 BLAKE2B 014e52640c29b7653dfb210d0a511a6c5cd8d01e4596d0a2b32c1b20d18747c470dc21f417624a517a596abaf0d489021beabe229b2302e2bab858faf5b0502a SHA512 4164f6eda708098a11ad4902d6891654e95c907cae738367db435a01c7d6614fbcc20a90836d1d7bbbeb0e84efb4a757b2d5a03c878cda929c36adf5b3575072
+DIST linux-5.4.161.tar.xz 109179704 BLAKE2B 7fdc397e484018e1036dfb3a9d89971a3a5f60e37e6e77c3e021e704da900bd06ec68f3dcc051a48180f1a9220f3a59872629bfafe4b79abe1275809c5deeba3 SHA512 b066830143e2b8dc4e671a09b9058dfb0d82e3776c9158bdb0bee97546e68110754148f4bd20d4c8a293fa7cb43fac518713b1edd55fda05f9f00277ea7ca031

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.161.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.161.ebuild
new file mode 100644
index 000000000000..42230c7d1fb5
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.161.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.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+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.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+			-> kernel-aarch64.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+			-> kernel-ppc64le.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="debug"
+
+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.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.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
+	)
+	[[ ${ARCH} == x86 ]] && merge_configs+=(
+		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+	)
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}