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

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

commit:     b5426b05119aa023242e16bda4d4a668ba7b409a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 13:38:07 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 18:39:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5426b05

sys-kernel/vanilla-kernel: Bump to 5.4.228

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.4.228.ebuild   | 108 +++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 6e9f2635e9fa..7078017be2fa 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -58,6 +58,8 @@ DIST linux-5.4.226.tar.sign 991 BLAKE2B 8e8885dd031f30549404f8505e3b47488f722995
 DIST linux-5.4.226.tar.xz 112965036 BLAKE2B abbeb307ba8dff0b05730a70908d531b3e3521793b598cc7432a4d98f6e2ea7a26038612dd2a19a7712c9dd36b5b6ff8cf5f2f1ffee21a7720a371254cf98a45 SHA512 154c11c58465985e5c68821c4483130c7fe4213fb2dfb4874ffe9d179ccdc9673a04f11d9596116f6105b3dcaa56da9f4305454cdd863b3ded5e24ef6948370d
 DIST linux-5.4.227.tar.sign 991 BLAKE2B 35b3d286db266938ef76360d2a064141fb6e8fa73016a9ab2bf0338ab0aa8632b4c48d49af0c09ed96e25907debe4b983ba9a0166b1606c9e4fa4fd5d890221b SHA512 f615a8b8400db1bc73a36f04f0a648f419cb5681066463e9d012a3334d46db617c9f50065de8b54af8733acb86b3d9d9b83627d06b421346a415f66dcbd358cd
 DIST linux-5.4.227.tar.xz 112971772 BLAKE2B 563d25bf465859608ccdc7654a3822fcd2384b008a5c0c7a613e65456084b2c86dc9e37dcbff19eb1dd32120f0756ebf2e9c83a7e4566b01596800a1ec235856 SHA512 9af006fcba44694ea8cdda2f09687bdbc6454a1e1dfa44688296c36dbaa69afff8ee8e2bc1ea1905704dae1e971bd0214aabc5aa163979db43bf8d61085f17c1
+DIST linux-5.4.228.tar.sign 991 BLAKE2B 4edd63de96c2cceeedf8b20ab4696fb4c8b8e45916d95ea9279de4911874e4537aa8f8acc4014545746d4546bce66843a3e56d56c90592e730e4ae1165c1486d SHA512 72be75fbf5704706d6d772a50646550e3d54458044e5fe5a49afa7dd98360f30b0a4e345744e691b09d8951712d1d766d050846fa7ce13bbf4f1e9dd26063d4d
+DIST linux-5.4.228.tar.xz 112978736 BLAKE2B ade9b21e3f434435230e31d67d39ea07d15d92cdf932b3b181fc532669f10ebd2f0eb7d5fb20ae9eae93c782f10db5ab3454bb13c01694f674f83146bcae8187 SHA512 f3fa33da1df3dd10ba9536d30b8aebf92796abe84872c402776c94b35bf3efb4256a6c3f0267bd97741db9853352d1b22bcb42d7d03f167960804bb9f7407601
 DIST linux-6.0.10.tar.sign 989 BLAKE2B b61afc42b98f495da3e93ad800a8256fa330c5538e52a68ef4bcab382e3a0dc423e89024b2840e7063857f3db82ceaa06ec21d84f8efc51c65c1090e12de7a9c SHA512 90a8d3cec46b748eac6113e338fd26f19d2e4851487361ab38fe2d6a6abd0f6afc8db18d913a0978a774f26297cad944fd5f0dbca9a176462a2995742b7d76a1
 DIST linux-6.0.10.tar.xz 133913388 BLAKE2B f061e3f871e5925bbe8f829c1dd7cac72afcb59fa2fc76226268c32eb990c8637b7dadf56c9f9608f0828debf8a7af519b7f1aa2a37e82d64b97f4f95bbd3f76 SHA512 f25b2a778be1f0879b152ce01d33c344e6fcb670b48d85d6d287a2d3b244fd248b0b775639cf8101c166adb19f8daccaf0e88815b5efefb6355ff2741a1888ef
 DIST linux-6.0.11.tar.sign 989 BLAKE2B 75e55b5b6162d02b6fa34e16bc7997aa39c12a8171f1ac7e309aa143fb2747c85672f7785c8b09c262f0302477655735e98f6dd4a6536cd044ede0e3c3101b2d SHA512 7af082a265cb4cbd78ea91275223f934787600e56be25f74f356831ef750751181e76d3e0dafdf608872fdf3cc86e0d01e8417d4cb0e756cec724bfb2ddb8a79

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.228.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.228.ebuild
new file mode 100644
index 000000000000..ae90752d5ab5
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.228.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 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=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="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[@]}"
+}