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

[Michał Górny]

commit:     9311ceb04ca9d64b92848fed2515b8078cb44685
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 15:31:47 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 18:10:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9311ceb0

sys-kernel/vanilla-kernel: Bump to 5.4.137

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 7bd12862958..3a850b07281 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -41,3 +41,5 @@ DIST linux-5.4.135.tar.sign 991 BLAKE2B 0d64c3b0390b34a42ef4cd60df2f6e5c0ef2eff8
 DIST linux-5.4.135.tar.xz 109142888 BLAKE2B 9324033cd44ba1413d03cdb4e067c3c9ea2c92f62dd0d461f3d3737a9f4c14e4966b403f4381093f7dd1c943ab64b2a14b8959a96fff64a736763191fbb08ad3 SHA512 cd0ac932a7ba43ab827f7904d14f9bd7b6450f7a2e42999ae8c6ea44cdda830eebc1cd2e692c7c4c94ebb8d95fe40f0da309fc9587d1554e8115941f4834d9d5
 DIST linux-5.4.136.tar.sign 991 BLAKE2B b00eae0e8f6425c148f7be9d613c8c420c2bc0c9836f7c2a9c1afb844771355cbb35d37e02cdad68462bf671646ae5313ac0cb4759666c7cb27e2460855dcdab SHA512 15dc64e218f71d13a2833339de3ac7a873342b098f655afea3f25c7aec05f4c80673c2c39f3c914e4aa22079a4592b34af0dbbcd83a575dd9345749b39d466e7
 DIST linux-5.4.136.tar.xz 109141428 BLAKE2B f9f60af9b63b5abf91057b0160ff9f75b33c587b48f1bf7c8be99e8b6a3ea4c7399bff0f004d054de5631b9a1b44c330a04262647b2ea52c03e78eec237385f4 SHA512 c539deadf9dd44647bef81a5da5efcac1f0b22de473bca87a9f2586f23c47403c210a6d3bdf1f20d77bfc48d2d3ebd72471e7cd2b437e2379bcb17895a9c4a60
+DIST linux-5.4.137.tar.sign 991 BLAKE2B 1df6a3ebc9ce9fa8b55bec8d069f8689661080dc4da0c705c0cd52bceb5afdf4f2a7ecf11bf807558febb36a5853b7772dbcf92b94cc8ce03c64d7d3a34a865d SHA512 17ac540551735313798400f1be8bff03287c8c447f13c3b21c231f70e2024d376ecf1a4da427cc4b2caaeac789406488da5055578b6b95f204882d9d7ac6a62d
+DIST linux-5.4.137.tar.xz 109139968 BLAKE2B 165ddbebf36f877cedfb8449f8b969be33cf98f10a78b1b47e3a01c3cc0788515df2a55710f610657318c45e4c13b0e53de8a1062507bc30714da3e7185a3f80 SHA512 ffe8b15699e4ca2ddfc792cdf4e95687ec89b6f04fda3444d1236790f3a139dab98362c103b26ca68608f17aa1e2126d2d317bcb5129569b52436b893a8126ef

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