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

["Michał Górny" <mgorny@gentoo.org>]

commit:     35e5f90400d8d501147046f9c2c822af5f551bbf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  3 13:41:02 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar  3 17:33:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35e5f904

sys-kernel/vanilla-kernel: Bump to 5.4.234

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.4.234.ebuild   | 111 +++++++++++++++++++++
 2 files changed, 113 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index f30b98e2c12e..211ba0caa437 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -46,6 +46,8 @@ DIST linux-5.4.232.tar.sign 991 BLAKE2B 0b5a5c61858195a6a51169a48a0ddf533c28e8ce
 DIST linux-5.4.232.tar.xz 112999736 BLAKE2B 238a66be2dad1dc754418fbcfbcadd74c57c4915d727b6f679dd88e5f90645f35a9c66f47fb7ee16a661b6a9575d5ac903a6b44c8ed697d2378a98c9d1a83f3d SHA512 7d4339f7db5845e9bb3dc440adc90c23b8f63f5166c19fc143979b9dc84551649c275a8ee815792818b6c20bac17349c0802e8037a74e6fcb30693cb27f94439
 DIST linux-5.4.233.tar.sign 991 BLAKE2B c664e65c6e12b72ea34e3f5522dd29e3bf7227ad93a8c3b682b6192230aac97603a40cad145913041ab8afc45b9c2d211bcccbd4b705546cbb10916eb99d8395 SHA512 dc32b18222dfd6c089e3e6a60ede4a79396e3664ed1108dddd9fae00e6dc31300bc8e0869995298c3243b2296a00c153268bb43b14571a28c80995512d7aef43
 DIST linux-5.4.233.tar.xz 112992216 BLAKE2B 8d629328a88f0eff4332a8e5c21305bdc4166b440986be953ce227e3c356dc470e47c7d720a598666b5ee824332fee35ff55cf35992f7ca4e37b2010e6105536 SHA512 76257b8077b85308c82850cb9a902659af9b554e37a61919ab74e60adf9b813bf2bee55cbb3ee4727cdc4eb192ba6f7b36efe06a689236235bf37d7d67029b4c
+DIST linux-5.4.234.tar.sign 991 BLAKE2B 7de2660c6fe2001fc0c3b0f0c938c1490089f145c984d50b1cbfd338ca11dc96af07bedbcbe29f52295f6fa77f8c3ff29df3b596322296d4603b154e04d82b23 SHA512 db7c748faaeb976adcd86625f453b35fc2d71c5cccaac0e08bce60d069a669a2cbe8954e7423ad3dca3d0c2a116fdec07f08284af75eea01ccac98d6642275f8
+DIST linux-5.4.234.tar.xz 113019048 BLAKE2B 93efb145f53e9072c63169637361bfa74e40de999300f27a684cbaa23678f61593edf06b46a1d03c84d1881489b560c436827589ab04bdf92dadbd51c77dae87 SHA512 58684c5106b1fc6d50bb2297d7d6894babe79addc055e5e4c78805bd4da88e01f8751b64e4c410f60827d2562494fb333fb609e251264aa91e37d25f89e65559
 DIST linux-6.1.12.tar.sign 989 BLAKE2B b55e15679dbf0a29dcd5ece9cb68fb2123132818810fd03492a6d8fc5556814bfc8604b38a25dd0b71acc4ea8f515ce60d36d6e24eb944fa8a48bc851b2c25f3 SHA512 7459ad3491bfcb2dccfde4a929da7b78e842dd34e0230ba49da152891b5157dcd54cf84696988da560cc918852b1d59b76f7184d39e7c444385e20266aed8b05
 DIST linux-6.1.12.tar.xz 134848688 BLAKE2B 1ff8d14fa1544a9d613fe372073e6735cc9444383e598a1c6a546177e1a9516b7f5a0d16aac4fc141fef134ffe14a0e40ab5db4200c11c953fec7f70a7bc9079 SHA512 e870aa9038f0508c50af5329721a5649c3537deb333d18f006bbf6d3c310b64262630eed5682022b7eceece9ef0956d2c110555cc9257591b7a221d063976735
 DIST linux-6.1.13.tar.sign 989 BLAKE2B 6a59d32b2782eae32371c306b251d30e79c4123d53ff7587a8a02ef4b3f1b46749609561c885a6c530ee83c5b22cb9ca816e14b767790e2a25ae0e4e9fb11b5e SHA512 63c6c8af47b6c08890553e8a8292fa423be470d00322d046cc5f104ade9fedeb17f74a606ce230aca053795f720d08fe102530897b53d81004bc4d34a1497aa4

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.234.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.234.ebuild
new file mode 100644
index 000000000000..0e9fbe2eb0d3
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.234.ebuild
@@ -0,0 +1,111 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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=g6
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	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/projg2/gentoo-kernel-config/archive/${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 ~ppc ~x86"
+IUSE="debug"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/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
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .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[@]}"
+}