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

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

commit:     686de3783dd9afe476ab4c7818f64814470fe831
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 25 05:27:05 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 11:16:05 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=686de378

sys-kernel/vanilla-kernel: Bump to 5.4.250

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 0bda061be4c3..605953c9c06b 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -36,6 +36,8 @@ DIST linux-5.15.122.tar.sign 993 BLAKE2B 8a021595b519795a89fec13df9afa1508782334
 DIST linux-5.15.122.tar.xz 126497672 BLAKE2B ac2861be0226c0f49847cbf7466069712f75e8fb00fadbd3db5ab6e72e70b78f1b7fa954f46be442237112cf069b50c2fc085510e82164d620f15dcbc0517bc9 SHA512 a9eec228d9fc9cde2377b4c5445abf1b15c588bc9a15f529ae4c2924a6fc7daa0b8994ea6266e0648ce347a3b36f2439243b91269e4d8b5eea86296dad1abaaa
 DIST linux-5.4.249.tar.sign 991 BLAKE2B 4d1d936ef8ca139a3d46801ec59e3fc0137d7b8dc2d4d7298b8059e6de501594edefffc98743a28ea9ef34f66be20e72cd259d45e76aa9b7bc40a64302bdb7ee SHA512 98774b79f70e848c61bd8797ec30fbe8f65313da012767ef9034330bcbe7491acafe57e6a6fc74abfb7b1216db9997f396f443ed88cf4904a02d5e6912d061cb
 DIST linux-5.4.249.tar.xz 112942636 BLAKE2B ff967a8c37f5bec5d3ffcd89c9cfa934beaae570fcb4b184d7c715c2d419dcb3e80ba80381f9d692d0efe02b6a05cb5a06ae88723f974e54b9e0116877dba313 SHA512 ae97a954a14fdc3702c850780559d64950376575132043d3bab627878a65331648a02016dcebed20320e1040fc0374bbb9e8941fde6b35ae6457652a0778e08d
+DIST linux-5.4.250.tar.sign 991 BLAKE2B 9650c44958c2d5c9c7a7bb1226e2e58e0bd50ba902d7df077c0ea9d9515d46da00576a69e7c493b25cbcaa3863e82fb7ccb17bd2d2828d4f90cfa5abb39a9b57 SHA512 770b4549a47a2d7118bb11d8d4c96562d5d2ba19813e72dc73faead4e5071367f1f549e4a03d9cda945115605631b10c1b25ecc6537637de10f2c3e54ecefea7
+DIST linux-5.4.250.tar.xz 112964116 BLAKE2B 979b6936a86a58b4d3c92af6ac32243a20c074e14ec914421fe0605ef28a64329f25071bcb8a4aa09ffb78851c9f4c44419892d917affd9c9d29789ccb7c572a SHA512 939b3986490cfdce0ebb214ee87c523cb3ed322729e3cdac9991ab6489c3bc5bfc08651680c3a4010bad98480a23ad28d799fb787b85969846f1e440c167f5bb
 DIST linux-6.1.38.tar.sign 989 BLAKE2B 9e1710fc446d8cf5fe7cf9ee933650955c28b2bce1dfeec592ab9462acc25be2f5fac2d24009c491a201d4d209ac5c98589f81c1047d44d713a8989c4f2a3559 SHA512 ea0b09cc4ed64560ca2ff32b51a4a34ae6a45841060cc562ab5136657855744493ab35f33a4621864d5f2e3cb74bc02f2ca06f414ad6359be67e54ea2504dcbc
 DIST linux-6.1.38.tar.xz 134926628 BLAKE2B 43f0fe3f8aeb03e5a2bf46b358b8dc4515765b70f56fb136847c78a80889bc2e163768d941500c285f40f705634b5fd3d6e0d81c10521fc351596c95db62490e SHA512 64834b8760d2ef3651ae293c499b110a1fe07591d956c8d5cbd8263fd8c173b6963b3faf2bab4c5e0583550185339c005775bd94884750e28fd7be6a16a17af9
 DIST linux-6.1.39.tar.sign 989 BLAKE2B 0184192872b88fddd0a33badc8bdfb962c734b00514c8ff50c2a519e6aaa0322461283451294b66eca442f693a158da198772dfb0a8ac7a4bfb1f18f53fa67cc SHA512 f52a21870f20444945595290fd5d2cb6d0cc547d092c954c735a315fd0a9a9adb151491572118dbc2b204e0a2d0df305293aab70e100a24d0b6d145f452b1d09

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