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

[Michał Górny]

commit:     e744b1071937fe2c38595fb6ca33819a5746ff12
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 16:31:21 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 15 19:17:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e744b107

sys-kernel/vanilla-kernel: Bump to 5.4.146

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 28be6355449..a920a5a784b 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -49,3 +49,5 @@ DIST linux-5.4.144.tar.sign 991 BLAKE2B a577a538c56f1edc19b827bf1030a7f81c60c4f6
 DIST linux-5.4.144.tar.xz 109137836 BLAKE2B 2a07e5aededa64ea6db7e2e2c5dc12c86f6b8780444a5f81e744391d17d1f9ea5b1e625cb662c143f307848466a832d1b96c15f598e9395bdf47167914ac8866 SHA512 6dfee1ba2917d602c589fbf23878acecd4daa2b7f078cfb60c110b9c1e41c0a2c2ea5071d76701350abd1674e44cd751abbe4aecbe6022a422aa626c92077f24
 DIST linux-5.4.145.tar.sign 991 BLAKE2B 3521095f5523cdea8830f8acda19c1f54a158ecb0bbaf76c0736102fe047516bda8d6bb487f2b91671823d53a10aba8316c23cac3707636db84a400b7b384c65 SHA512 51acda3bf25796bb3f43056c2a172e8d1d1b66e8de89a2b7862b84d01495dc4f42b190409e8fddfe7f1084b9fd521172ff15027eb4c57b4df1c27166c457df1b
 DIST linux-5.4.145.tar.xz 109153364 BLAKE2B cc960274d8e81ecee0487f5622de5080d7e4097c104cab439d3aca4cb2bf7a29023e8690572e541c10ddd1aa3b82eaa9672a7416425ad2f3743477884e13330f SHA512 90eb43cb21d8ea653e67838507580603bedfec887015f960fb2ca0a21523932385232ae2849507e8f85a4f9fc5479751f634e6271016525d42ed185defe2afb9
+DIST linux-5.4.146.tar.sign 991 BLAKE2B 02f30d6bb764f55bb6188df4e76a18a6c1c19a5087e50d7c369c5999ced8f6b56cb7709ca85d2d0e2a97ffece708043520a79b9c02d1ac129b61551bb9373c87 SHA512 18590cbd74267b91ff12932c11ca8f0c39d89f695f69499178013a157e049cb1f28b7e521d7524248ea72902e61ba6b36949f4f30b48152027f7110d816e14ec
+DIST linux-5.4.146.tar.xz 109153012 BLAKE2B 990910051f220c249b2175593129e9343b4052988106955830e96cb42ce8ca6477fbad6a724a80b402a4dc838279a81c5fe2de398510ccb9ccef7761683c0f05 SHA512 dad8b4f91ae5e40c24e4f7c92c1ac0846dc1b64c36208b897ab52d7db656d961cc2f53ad038aea0da9955db37b338b9cbcc7acf8f2010e7eed87f69e54dedb40

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