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

[Michał Górny]

commit:     e9bf618c85e054151adca3eae629b298366bc60a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 11 16:00:38 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 11 20:56:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9bf618c

sys-kernel/vanilla-kernel: Bump to 5.4.131

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index e04d38f77ab..54f99062be2 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -54,3 +54,5 @@ DIST linux-5.4.129.tar.sign 991 BLAKE2B 534f683bf0e6962b130f52c9f3e1a391131be838
 DIST linux-5.4.129.tar.xz 109122036 BLAKE2B 73f422c32b382a5ef3f6cf8078447e68752408d78fac20d41f6fb4fa69bdb0706ff9ff5d7c480b0b1e3832559e9b253b1fbe0cbd4611c383cccd41e49012a8af SHA512 d5d420427433cc9bcfb5ff72c6b39c4c36adf745dc51e31109adcbc1ed1fd4ea02047940d01958b4bfcee98caac8f0154bf7a8497afa0e5f081712f035da8bd7
 DIST linux-5.4.130.tar.sign 991 BLAKE2B 7d20be27037339889e8e207910a0bb9cc7326cd96aeef1a0de35cd9a7398d0f13df0b4dfd996b7d14802beb7d8beddd3468e417139c2b360292b473a31a686e3 SHA512 51c8c517bc446eb6aa11d072f8e349b9dc564bc7ba5b35783223e9898e957ec175ebeb96ae486bdc5a20e0227bb563fc915033b039951e9265fc7258a6a343ca
 DIST linux-5.4.130.tar.xz 109118364 BLAKE2B e2c30781868d0d7b721d679b29af3f4260a471a2bf328119b562abb4c896db939252ea2f9ef650414925e4d9c0a150289dd960dc61dc5c654f44a773adc1e6c6 SHA512 d2bdf3ac52644c9dab720b5a74ccd8715b12cce9a227d3c5375d0e61e6bc95517b95c7ef825854b5039494690f4a1574db9f162b5f3bdb1d2d67dedc6c683ba7
+DIST linux-5.4.131.tar.sign 991 BLAKE2B 957f1dbfc098f63c35afa810ba8e0e10cec81e2a7599cda699dfd76dca0db4633245320575edc4c17d18d3c02806810a9dcb1c6366680893ac83214f8389f6e0 SHA512 f415553fb817866082ae561e7c641fa3ab3929afee437bf4c669ea6af2519cc098cda0b30f49a93387bab8c68748aff9e2e8e55c93c282a37fe43fb8f6c66d8e
+DIST linux-5.4.131.tar.xz 109116196 BLAKE2B 7736ea4b9c0e1f667375c91fc77c9d2ff2b40558dfddc17a691ebd9f558ea8b7c9b8d8af50ab7ebd52ba007be848a9680165bdf5289174ccd2678d4e905047c3 SHA512 d594f7fa2a598c9f24c1f669b9f3a27978f3dbec40a41f597f3ec3a0365ab565d5af042ffa65ca56f166b5a58ada57b0ded52667732eb460c2a7d01798328e36

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