sys-kernel/gentoo-kernel: Bump to 5.4.154

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

2 files changed, 99 insertions, 0 deletions

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index e7e1e50adaf9..266bd5c72be5 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -40,6 +40,8 @@ DIST genpatches-5.4-156.base.tar.xz 4031752 BLAKE2B 7450e619bd4524c4c2929a2adb95
 DIST genpatches-5.4-156.extras.tar.xz 1784 BLAKE2B 215396166913e8dfad67a0fea37626170aa71a8fdca7861f55e48c50e37fe0b92ba03e185d2cd23aae1f0903c9900c5ec7d79442c5f622c1f0093a3587f348da SHA512 43fe8cb9416a5d88c78a8c51466f7fbfd04b395a19efc2890669b9f3b90e233190c7724804c06c810cef89cbc3db95072afd2c04a3e9efbd074d975ce0f3ea12
 DIST genpatches-5.4-157.base.tar.xz 4048356 BLAKE2B 787334d4f61f375a6ab46712ff632d560a9532932ced876b90d78bc2161c48d6c917297e53604ff6ac0039ce5ec6edc70c84f6ca9933fd0d74f83c5e57bd2d42 SHA512 e7380f35a80a88d2fcc0278da156042c08b7cb1b6eadcaf2ce5769fb4b6127eaa8e1ce9e8a64f8c24286a30f566df4d52184ba3fa0993c6119d7b306c88fa8cd
 DIST genpatches-5.4-157.extras.tar.xz 1788 BLAKE2B ca74b942a7038927ee3ca591c383d0dd86418363399245e49763bb3efdb66a57eec28982c77bc10b723c897dc87d0f2991736702e3a22f23e02eba2d3686d933 SHA512 8c63e5e7fb2653e680d2d78c18e5b84362ae5f391d621489e377e21894b7df8fcacc15bca2c61b544b20ee6156abf323ddd599c3a47e292f17e5372f6cb46dcb
+DIST genpatches-5.4-158.base.tar.xz 4052760 BLAKE2B 1fa28f9309c2f9ae9fb8167cd016664781ec78d16a2e652e67de34503ccf4a28477fd16ee8f10ad9fb4eff35066d716c63df32f3ded98e9b8306e526528053b6 SHA512 37b6ff682889580053c2c5e88b2f46df9a6b5506550651773949ea9a4c6d70b56b1b59388df1d4747dbd1c9b186e95b0997f651a08df52be351401276e7b6f33
+DIST genpatches-5.4-158.extras.tar.xz 1788 BLAKE2B 265a90ab037b468294afea457d8e3c3e7fe2a1112100354e9f4a30f6604b204be5efc3f5889ce42ef0fa959baf80403a6ddf4ad36f4e9d0e9888c4c6ae7aa70b SHA512 9a498e672c05166dfc1b0460d6bc6830b5086fc2d9ef97423bef5334ded9d4f31836b40fe85b9c2f66eb56cda291e41399ecf88e9e4a20022f5d88bf6d4269b8
 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
 DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.154.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.154.ebuild
new file mode 100644
index 000000000000..1bf22439675a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.154.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	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 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	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
+			;;
+		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="-gentoo-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[@]}"
+}