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

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

commit:     dcf9cd0aaae9246323af893b31fa66868fe116a6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 10:57:36 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 18 14:43:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf9cd0a

sys-kernel/vanilla-kernel: Bump to 5.4.195

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.4.195.ebuild   | 108 +++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index cb6816f6668b..b891b9a513f8 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -37,3 +37,5 @@ DIST linux-5.4.193.tar.sign 991 BLAKE2B 868843780609978ca9a6393914d3e4bbc4f0d5ce
 DIST linux-5.4.193.tar.xz 112910204 BLAKE2B 36ce7f9d1312537e2b7859af857189d63c3680d90cd9d2388be06ff8e7e048259518fa75f330a9f8b8001cc80813fda80a29fb0fa5e92cd032e3e9259261ab52 SHA512 36b201808b9d0870e33dd6a10bc9c803a728ff5bdb0cdee2e14e4824e21e611de98cb3e5dfef26a8b0eb7dcb4e8e9b41824e9208fb20967e226cde65ea884d69
 DIST linux-5.4.194.tar.sign 991 BLAKE2B d9de26a71db215341367b41d239f4d1b4efa9a7d66a139b9a75b2b853c161ace1196cb56ddbcd38bb64979343717c696778b011f78250b1c6903d97bd8cf38eb SHA512 a9be800562cda71e4d06fce8254c9cef2c1932b33faef13b6ecf7f50c9bb473ae727607a09f194227d2cbf2de7d5fa9b055145a524358a4606eafe5426ec137e
 DIST linux-5.4.194.tar.xz 112918432 BLAKE2B 5322ddb0355020847834bc0330253c079a14fd7c427563fa3e3f2756cc40d7298934aed5c7ea81fc263fd534a5b1521898a9ac576f4c0280d93dbb8e436fb687 SHA512 9b316e71c7f5feb263ef78f99f30b42d39a14f8cabe0e2fc87c2af94b33ced09d97167a9b6d74fa0b0e3a7eea8caa7014fe5ba09efcf8dec147bede8ea0f8066
+DIST linux-5.4.195.tar.sign 991 BLAKE2B c80a3a547d82b7d394155f396e3beb66df61272dd5f57be00fcf3b8b6bcc419914fde3488b950f29f6c235210e8f777e28199a4126530963749ed3107c49a249 SHA512 a770e02e59031a8bc74c832c1f9947d0f2edd397de23eef234f18b7070128c8adb1836ca4297dce1afa9f5ddbdb97fa4404e2c90faa81d5502d8856dca4112fb
+DIST linux-5.4.195.tar.xz 112920616 BLAKE2B 9c3b21e2bf18800c4b55bb04810e29fadc6414fd100d4c2bdd3df1ba7db72124a0bab389b9d5038fd04440ac69a06383df5b4c42d6e2a6382c81af8aba366bca SHA512 695e46ea1ac6c587f39f724460c480f4994267969cd620a776766ee7a5bb88b346154baa3ecc3444dfa1d0d39a5e8a0f1a5e36cdd76a2c71ea7a899b8a8a9d7b

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.195.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.195.ebuild
new file mode 100644
index 000000000000..4f5f7870ccb8
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.195.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 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=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.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 ~ppc ~x86"
+IUSE="debug"
+
+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
+
+	# 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
+			;;
+		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.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[@]}"
+}