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

[Michał Górny]

commit:     c66035f97ff6c5e8613fc8b7b6ee6bdccc6bee02
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 20 14:46:21 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 18:48:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c66035f9

sys-kernel/vanilla-kernel: Bump to 5.4.155

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.4.155.ebuild   | 101 +++++++++++++++++++++
 2 files changed, 103 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index b306fb48aa4..490f1949310 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -65,3 +65,5 @@ DIST linux-5.4.153.tar.sign 991 BLAKE2B f7b80216c2afaf39b8060df5f3a5323863bd0ed6
 DIST linux-5.4.153.tar.xz 109167756 BLAKE2B 850ea9fe0b25b4016edfe151bead709f5d1600dce0dca03e72adfbc6e9322d756b7b5bcb1143b4e2561e4c87daf2527c00874764b7a4f65000f38227c066c369 SHA512 63c937238dacf027ec9b78f62253b55731571101daa92b8b55d9fbf4937552372f296c80944216269271ee35214406ad63f4769fc29f3d32f60c2c73b76aad08
 DIST linux-5.4.154.tar.sign 991 BLAKE2B 39e97f6ec62f0828e6ac1b8a8eb3c09cfbc21424cd1698643782f23fe54b6beeddd9a0a6aa35750dcdbc108285094e4dc6063bdb90693cb84761a1df6b7bd5a7 SHA512 fbf2b02203170bb5b7e9a5878852fd90f4f0ba7cb2aa1bff9f4216ae00b606babb85d38ee422ec4deb63e7de7d80df8e39f8483482a75d3cb5b57f1a79aa511e
 DIST linux-5.4.154.tar.xz 109181708 BLAKE2B 87ae65ad680670a26d4acc93bffead3f01ea49af433a9270f057ebca7fb6a7151d8e9b1f32d532cf88b300bdaa3d9d1b8127e3e8aac25209eb776aa0aad67fc9 SHA512 098bc78f454ac37dc3113559cfc462acb912471784d281a9cecdb526411a54043b9b0b5cfe417c4ee8cd281bee0f87116b0b7ff39256cd0f5448fe5195d200f3
+DIST linux-5.4.155.tar.sign 991 BLAKE2B 63934a317fc82788f54dbf8ef29873ac44e1654b551757dbff48c1e28353795b13871708ce7ff743738adc80d958edbea8ab0db5dddfc59774985bd661a78338 SHA512 ad4d8b63bb9743a46f17845e7023ba79e0fd4a36ca7ebefb8de3117edb53849cc807fc48e0a315f710817298da731b504818369c18960debab9b888c09134d61
+DIST linux-5.4.155.tar.xz 109180688 BLAKE2B b803f8d0e212bfcc237097a3d699223aad66aa872806e5bb12c6ce7f8965fac5e1006b27948eebe1f2ba7af88a69582e84f6efcd5156c61a0453e1548313511d SHA512 b79b964976ba9f4bd286806782b7e5e04bc0a73f6e23fa637f347cb466f40537901ce61401f1f5450edf4998dadc49ddabd42e8bb4645e0c3b354cd05ec80682

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.155.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.155.ebuild
new file mode 100644
index 00000000000..765b04d5024
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.155.ebuild
@@ -0,0 +1,101 @@
+# 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
+
+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[@]}"
+}