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

["Sam James" <sam@gentoo.org>]

commit:     88ad2b9ba436a19bb924f40f48947969a9fa4b63
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  8 19:44:26 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  9 01:59:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ad2b9b

sys-kernel/vanilla-kernel: Bump to 5.4.252

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 5dcfefcb5541..7fe530bd256e 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -42,6 +42,8 @@ DIST linux-5.4.250.tar.sign 991 BLAKE2B 9650c44958c2d5c9c7a7bb1226e2e58e0bd50ba9
 DIST linux-5.4.250.tar.xz 112964116 BLAKE2B 979b6936a86a58b4d3c92af6ac32243a20c074e14ec914421fe0605ef28a64329f25071bcb8a4aa09ffb78851c9f4c44419892d917affd9c9d29789ccb7c572a SHA512 939b3986490cfdce0ebb214ee87c523cb3ed322729e3cdac9991ab6489c3bc5bfc08651680c3a4010bad98480a23ad28d799fb787b85969846f1e440c167f5bb
 DIST linux-5.4.251.tar.sign 991 BLAKE2B 8f855e7ed57579bbc4e8f94bca8d5a51d26073b40add5e1a9c5cf85b16980f8ee5cb6e98227a4a583af37ec66802d972393339a4f26e20edcf559c043847f88e SHA512 3dbd0434a9b9a97f39318c94a3d03a63f9d15c9aa5b3c4388df5b8a0f4ef1bf68d7ff6ac91f453883d9f614acfba8751644ca6b2534df785fad72e8ef67fe466
 DIST linux-5.4.251.tar.xz 112962996 BLAKE2B 1f39e44339ec82ad91c2d9543ebeac691fd8d65c99c5d19f65e3e79f259a7191a9036022083007ed5e3da72af8cb58a142ed21a68997b62de343800661449c88 SHA512 ed2b32252103e2352c60cb55b9229b38ee5a321125d1a22c8005630a8cea27b45b60b6da58afbfbd33d34a1bff58dca3ef774992d1b42cb82d870f936ad01e50
+DIST linux-5.4.252.tar.sign 991 BLAKE2B 2861b4b71d0a75b204ad8b89b47c30f62dd8b2170941eb36ca717e0983d780e1ae4cbdcd176c5eaccd41c535e3432dfe41c26a6e77a39ac9f278f450badcac00 SHA512 915029a9979fb7cdd09b4e723630a0896655634583b89646ec2348c36824b322e55fcfc8b52c193f194cc59140b6c6b344639062009bb2bb2270f6852791329f
+DIST linux-5.4.252.tar.xz 112967820 BLAKE2B 098af6c7491cae10dc17294231887a429b713fc6b77c6d6db4d4a01f20d002542286a6261456f108db12e2d797f75670b7d22adfed544658f285d3f98b4eac9b SHA512 59a71c176efa42643c1b6563e168dc364616b8fbe6f5b72af7a6748976c6958c7887283cae0da33eaa0f006b8b5ee581665d2b1109e046e6a6f9182b600833a5
 DIST linux-6.1.41.tar.sign 989 BLAKE2B 7b7cfd294a3d204134aca76464dfb596e94ebdd7d7657888157dbf217b462c7f63eba2081ddf29cd906323656aaf6dcba7191c7aab3ae4b5347817ed84efce02 SHA512 1918494a78e94b4a4d92e871de8fa003386e08c62531110147a7b11b4e682618a3e3a70591ef768fd5a9050d578899d272bcc4cb2873855cee8cb867dd5780b7
 DIST linux-6.1.41.tar.xz 134912480 BLAKE2B 7b67b16cb45e8089a4554c59e5be29fef39acd95013345752f5e57af4f185cc79a5effb13741f643d7a9ef2c99555342cfeb1e859f38303be800d889a35972fe SHA512 82101034257f746e1b6717d374a7960c1a83f93e8c2912e159c6eda6ea7605ff3c8505d37cc55ee0aadaddc964475c7ece4c26ed60407877d6eeaa7938de7c91
 DIST linux-6.1.42.tar.sign 989 BLAKE2B 043e225f5e4f885cca43839bc17cb6cc721635ee0ece73a983d2fdef9a82f0424e6f73f1b83666354293cd874bd6fd59c05ac49babca6244a2b6aae7c05e7008 SHA512 adcaa387bb4bd236f79f486e654b115acd4a7bff27887cc08de9b4b791659a73d55f090817d7686fdbc410d5bb9fcd72889c43048c979b65f88ff9c9c9ec8358

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