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

[Sam James]

commit:     5b8543d2eb5000c6bb12b769bf2305680cda7a3b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 21:07:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 02:22:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8543d2

sys-kernel/vanilla-kernel: Bump to 5.4.208

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 3147ec87f864..c331cf6fb614 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -67,3 +67,5 @@ DIST linux-5.4.206.tar.sign 991 BLAKE2B 0d7814ef65a8a70f7113dce971ebae279cb0f267
 DIST linux-5.4.206.tar.xz 112942916 BLAKE2B 7066a482b73c5636f98f369e02eec7023313ae06cb78a2b5be947f9a618b01bc854f997df8e0a9912e25f8be453c277f865004268a558c75c0b7894802877037 SHA512 6f8ae37d4ea918d4590b52468ed60b30f848120ef4949e5719e4b225b4ef9597d449e520f4ed8ffe8a29d659da3191691ce9a2d9968f6f437265057f0ff301ba
 DIST linux-5.4.207.tar.sign 991 BLAKE2B 29400e5934393d1e09b7d694ab4395fcf0bee3d8b85f5b5663d7b7c7c9ba5be4168d217587fdfb1ab8ef36840a24211482358964f9745c4376f466909d1ef0f5 SHA512 fa1d4ca2a06d9a74a4fed2a33439ce450c1969d25ada380b60a8a64432fe59eff5129570494af5c3bf47b4e99e9de9fc35e5200afe15a4c478f17c9706b984a3
 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

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