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

[Michał Górny]

commit:     58aa882ec9fab9b4e2b218a4e5fd452aee407dc5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 16:34:47 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 19:51:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58aa882e

sys-kernel/vanilla-kernel: Bump to 5.4.209

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index c331cf6fb614..77a98f2e161b 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -69,3 +69,5 @@ DIST linux-5.4.207.tar.sign 991 BLAKE2B 29400e5934393d1e09b7d694ab4395fcf0bee3d8
 DIST linux-5.4.207.tar.xz 112942800 BLAKE2B 32cbb802084dc11863bb59310503ff92c6d02f0892997e15f5048ee285fc3e7b172d9b0ad5eaf936ef423af786ef14d9c3788b80b2ebc62676c0b3a25e1390fd SHA512 802eb45d93347a4bfd6e194efdc2bac7daaa4374ea7c990acf43b3c7e8280f3b6e1ccaa2f765d3677ca68947c8b9f7d783d6c22df58a64b4f6d8e5120fdb7e2b
 DIST linux-5.4.208.tar.sign 991 BLAKE2B a79d81b6120f8856da9a819fcfd040535b264a01cb647e1fc9d02d827b8948267803467a3389bd215d2a4e10208fca53a224ecbdc3967e8972c1302afa6cc2db SHA512 55fa233aca961a17c57bee0f87fcfd0c4058bdf2d02b66797f073694a1eb941278dc744467838a08e107944ff717e3dc79e4ac4ce69866f674e95c48f980de92
 DIST linux-5.4.208.tar.xz 112935800 BLAKE2B 801adac852dc3cac0307ee6787e67d0a4c5047a6850db1163cf0315b2100e8af6b3eb4eb310b7f5f2bef7bb0d5d5eed738db501718db72a1ced95577082e0012 SHA512 2260262607fce42c0a69900c086be69e15c5fece0efe28cbfe4cf5b4e0829b981d0f0a1c75b64ff0953c527058653fc3e45da481b29167cff11664d1953223b5
+DIST linux-5.4.209.tar.sign 991 BLAKE2B e750fa4ffd74c55e555201c23c961bb056171bd009131132868a1d0af0fe878bc798d805461162e40009014661ce91f9da2aee863286bd82b27b359c701e8beb SHA512 6647e67a9515f5ea7cff75fb6e451475ca8115223d73eadd6762fd1874f51834f63d3b03c24895db25da9b635abc583651962bafdec4ba0e2dcf22ccc9609bba
+DIST linux-5.4.209.tar.xz 112951528 BLAKE2B 26d3ed24f2e9686a200cad3e1f12b01e8e1344a09d445270bc2d1af39449300b30ea66d88ed1d22b39b4cafaf05d6d924f6d24fa47ceadf704a5118d5621bd2e SHA512 bc09ca7a004fd1804320d5908c85fe92e1bab820df8a61b95b06c85e41701d172333575f470ab49fd4918df282281e77cf074c2bfc44744baf6967acf32d2f58

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.209.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.209.ebuild
new file mode 100644
index 000000000000..bffac7964798
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.209.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/projg2/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[@]}"
+}