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

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

commit:     5ab84a48901721f8a3e6f70e77ab5d1eebcd628a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 13:47:42 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 19:12:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab84a48

sys-kernel/vanilla-kernel: Bump to 5.4.241

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 2a2241c8037c..e52bfeec4662 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -43,6 +43,8 @@ DIST linux-5.4.239.tar.sign 991 BLAKE2B 6dc901f43c6ee083b5898b8f58d1725a7ba403d2
 DIST linux-5.4.239.tar.xz 113011896 BLAKE2B 068c6d941f4e5ddd1669321fee63a5580e551e5f07841130871201f0be51e31d228b19fdd72faf23af1831cce709b8901086a3c0206cb36e5223f818cde7817b SHA512 27b8c474803e89b3d919aceaecf885dc16298c1b82b28d5b9543d8eafc59c29a9b5e5835d4cf2c3c8175f0805aed54f115321d841dc514899c592d68e90b96c0
 DIST linux-5.4.240.tar.sign 991 BLAKE2B a3298b0e17137892a663db0ce7c492a3bacb7b2b7efa44f92a8a4483a2b7985fcea9ad16f86e28ab7ba4ee1d68822f8e3941fcd45d5cc74c368cd3af6470b012 SHA512 ffbd9efc3d55f22219ed77d1ad267663c835802b13bb4bbd2d052394cbb9a1c7046e0232c24eb681f6ff59e067c7124d838c6849e6d5f0d20af57f8ea55681ee
 DIST linux-5.4.240.tar.xz 112999564 BLAKE2B 3be1fb581a205925c99ae91a7c7930beae48ec3455ba08554640c052cd4f972ea6d6a1eda14f0597571d6a8f83ca3a62d002043ebd4d6253e25cdd4dba383086 SHA512 5274e19c23b478ba2329abb20166d0b6d759d1bdf7030473f066ddf72e87c6e6ce8571f18d9803ed722f0884391919971d32cef606adbc19f10718fa2b29fef5
+DIST linux-5.4.241.tar.sign 991 BLAKE2B d89e8c6547ddd25746953a8c05421b11e8a3ccd32b481c2a1a11053ec72e21ec3a4d537e5158e64615d8d97c838225a55cd92bd9d6bdee533d07f9e2ae1d1296 SHA512 f6e7425d11afaedbe66f71dec22373bdda9d458c435cadcaf628856270f65c8f849fd9df09b621be9b023a882af87ab0bfa3baf8163f32546d3a4653a821850b
+DIST linux-5.4.241.tar.xz 113009796 BLAKE2B bf9543d2b65b04a02962ce4e71f70b0e9391a7847e3bdc7bf9b48f5a06c4e3ff419ea987eb58e63e3873e367fffd0e24cd25a7e3b9f178ff7c22359bbcda4615 SHA512 d16c2d72b65b27a91161fb7b32be05af8e19ca2dc4d1f5befda07e1063d8a040e25f5a42b67c84b783b8dc2c73021e031513daffc21c85b5e6509aaf88bc8277
 DIST linux-6.1.22.tar.sign 989 BLAKE2B 348a8ded434193e27a884c5ba88611cb128a1d2a10e1ef4a40c81a130a4a59a8327f81bd525923b94592c4652b2e74b4d016e11bc59b3502ee947f0694ec69c5 SHA512 ac6d56375a528095ca3654fea572cca198e728a3df616f67a3cc0db8f440aae59b093e524c3392dd9d396d8b95c2a56011bf54e23ef669f922fd4a61f0635374
 DIST linux-6.1.22.tar.xz 134844516 BLAKE2B c9c286505f1d20ac76b8992d8e27c42d196be5e495d168049c5460f1992fbcffda470b66b47b1919dbd50e081f14251bca79d664db2cb607fea3f64f2e2b404a SHA512 9db5360c85a2e8c7d1a3a37e0d79dafe3561566e098394a15e8cb48929a7afa74b203d3d67c286a8ddb4359a0ba8d45f33678219f9ccb8f728d1c4d4455fd27f
 DIST linux-6.1.23.tar.sign 989 BLAKE2B 419f3bd6e476139813cb84fd8bca9ba57347940a6cc82d4442e1d634786e7edba4bbf56d66d35859279d183616daddc95876a1aba6ff266c2f40b6f29265c9d4 SHA512 0a954024d2ec979ee3ee6951793fea3f3a80f5d8edce3cede38ef28b96ea0c2f8a896c99d896c9d3bc35e43aca881985ceff02c681697bc3c1cc2a1494064146

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.241.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.241.ebuild
new file mode 100644
index 000000000000..e60639c72379
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.241.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=g7
+
+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[@]}"
+}