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

[Michał Górny]

commit:     c43ba7dd873b7b5e885191b694d5c23d9bc4a673
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 10 14:04:12 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 10 16:46:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c43ba7dd

sys-kernel/vanilla-kernel: Bump to 5.4.125

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 75f93ff86bf..94525dc3d1a 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -54,3 +54,5 @@ DIST linux-5.4.123.tar.sign 991 BLAKE2B 42b98117b38e31ad2a9f0dea49a59b4d5892b127
 DIST linux-5.4.123.tar.xz 109106272 BLAKE2B 4f88e1cfd16f4cca07e9f39ab9be089dbc4df0d5741e96f1f57233a72362d0e44e4434c97b3d44d8567b1ffc1d0700516d12068d5e3e25f945d441882c20b055 SHA512 96080ffa9cdad4964effac84d8cb2f146bcd51eb88b4fe7c682b508511182709100ca22855220a00a4fe8302f6e618e148764dec9960802954a5aa43b98d0d85
 DIST linux-5.4.124.tar.sign 991 BLAKE2B 61e01b1eb9fbb399694189177a7d14da233123671426c4f0e97433e8c8d27099a9c983a1e0e16625e05fc5e4bb83d8fcb50c195be95e4fbb7d3024fa58f95843 SHA512 c4ebf1812c9b66eacdbcde9078f62a4cf95024d1cf92c6f7344c395f0c6b911304238358ae936df0b62c79df50af0a50ac99f462587c17d85e2418cf4178c4ae
 DIST linux-5.4.124.tar.xz 109107832 BLAKE2B a92d3862376ae4189cbedb3596a2d87734e940e264cfb52d3e5a03890f276b9c7214fd6200aa8acfbf5c831f9b2d5a50be04ffa507cd27db2cbb262c42903987 SHA512 8a12950ba364670373ae0f0c8ca5fd43b424de0529df129cc2725ff80dae4f6bef221748a27df91b459d40733880f901d11bb99afee6170ba6d807fb8e6fb133
+DIST linux-5.4.125.tar.sign 991 BLAKE2B 3745764832f01f1d0247bf1ff6a4ea9e719d1a2881a563ab2bf665d1b0a9646ee831fe93f456df09cf7843a4c6310705b5ccc908ec927370992828a44327bc04 SHA512 d15ef5591e875300e1e6e6d0b9b809f2f022cd6064f1313c2b77b1a07c79a49a857657730eee0d0599933ee2e6940ffec2556220955c6a4bcddf5172ca1325f5
+DIST linux-5.4.125.tar.xz 109119576 BLAKE2B 8b79f1fa8e27cb8a620126a7b47d371f67780f07687952d57491f7cf1267fd6c49031bb636521481014737a2118e6831ca45cb511aee374783989cbfc098d7fc SHA512 182c6114e667ef7eb2550b147a03892c0eec58890059049bd8ebcfb540d455dd5125c588b3523f01f533445c54fc8883a1e26a0307c6943908978b55facd50ee

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.125.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.125.ebuild
new file mode 100644
index 00000000000..dc33930084a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.125.ebuild
@@ -0,0 +1,108 @@
+# 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
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+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[@]}"
+}