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

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

commit:     bc68820f623ab7ef1035930eda892ce4ca8c660e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 14:03:10 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 18:11:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc68820f

sys-kernel/vanilla-kernel: Bump to 5.4.246

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index a0baf3be6757..2d32561aa7c2 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -40,6 +40,8 @@ DIST linux-5.4.244.tar.sign 991 BLAKE2B 777eafb4445f043a94936c89bf5da610abbd10a4
 DIST linux-5.4.244.tar.xz 113008872 BLAKE2B 2837a01c9879fe2975330f051815bd688308cfca91ff29038db899c1749964ed68773ff72e78e2dfa065f3d763401a83c880b386debd90ed6cfce6e30ce79bfc SHA512 eb1b7bee8b29103b3678cb6b3a66401d68c4b2f2c69ea603a8bae920e14655dc41ac21d79fb9593ab479668eb669f0e4a1af8628ff33f5b91db2c820f9f80cc8
 DIST linux-5.4.245.tar.sign 991 BLAKE2B 37fa9d8b93c228cb96e163b95d82bcbda8a0ca725553656935da4f9cd8d2d877ac74ad749c928f7ffb1a5e16a26fef5c3b4f2cb7fac7eed245597df420d48807 SHA512 d5991e7a52aa3201330c4afb0b02aef6e374ffd9cf82d6bf92d38c1418d3ac49c2b6b7f828915ade5682a33a4a1066dba5c30621639b14c787365104e03cbcee
 DIST linux-5.4.245.tar.xz 113003688 BLAKE2B 837448534791aae90a437d1c815f0552f6a77c28dd6d5e101b6aab93453f6616f95a932e5c98658bacdd3b8945f4fd14dcaa1f14a8cb4740d5e9c00591242dac SHA512 17c98275d9fbb4e9abd12112d6b148615913a5c829dd045346b0eaeab357361fb33c2ab1e9c8bd438a376be75704e0bab4a41f28ec3e9a4ef898ab4e5ab8bc89
+DIST linux-5.4.246.tar.sign 991 BLAKE2B 5e2748d3f9aac450fb3e589e15d004085246ea63479ecadfe6062aad38671f42ac33b0ce4f7ce6634a70d1fa0f644ca1c010ed91a2f9a89120f1c62ee6faae70 SHA512 b747dbc42331d8a944bb7ebf567eaa0337d9288bfe8ea76c5b33d2bfb377e14a1d66b28eff77314b0a1bc6a8f064c52b1dd8eb8f5931c02bb952668c9228b81f
+DIST linux-5.4.246.tar.xz 113016736 BLAKE2B 0d35d8a3620934c4cc13d4525209f125683c0169d9ee543934f96f1b6872de7be0d1e657bbd65baf17514092156ec8788d69cfc0c95f4822281e8faced9419a0 SHA512 375c48e69c6782f9a5f7de26b8b2af7e4b1f5ef1e29bcac70c3ddea9a71a1112fa116a2a098b0b5e9d5f5ae52388a440ed2cd5bb4798272507f3328fc6b707ff
 DIST linux-6.1.31.tar.sign 989 BLAKE2B 86b86704f8e01a31c70a607d572a9ec2d1014cdecb321cb1b7fac56410692697f018c6237e77cd2aad6f53758f27e8177e39065e73dd0f274d4047c4f80e6c30 SHA512 f9488296d96f54490c8a506df7018d4804725b102959b070bd0c9bc64c7ea2d517d4f39273b4ecbe975ba75d712fbf9fe0affa4159546712fc4f0f9c1bf5c3c0
 DIST linux-6.1.31.tar.xz 134903408 BLAKE2B a3eec74aa6313f387d22a57d72737cae6c5e60125596fc265c0f7bd90bc95b6f5ef5192028802995a3cb50e739be328711046aadf3adc93dd2047e4b439d4a01 SHA512 1202a47f29eb17ee074ce22289c6cd488acc381a59968728aedb6070874917cf331a2535629775f5ed3c442b5a82ceb17ed41804e719c2d3f81bcf249261bc7b
 DIST linux-6.1.32.tar.sign 989 BLAKE2B 79d8eefb6212e8f7f3e28956fe3b384e663d57649ba57c0667a6c30fee342c2328d9a06c2908a4c7fc509835eea7f8334e33a9f29bf8f9e2ade0b361bcba8590 SHA512 2929b4be377799256133aa85a0f8de9ada79bbb8b0270b925299d9219229501f3065357df14549eb70dd6ef34a8010639dfe50efe7587af49975f0167d2450fb

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