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

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

commit:     7f5638a0884e0a83cc41ccdfb822ec1bcaaf7d6a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 10 16:38:43 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Apr 10 19:36:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f5638a0

sys-kernel/gentoo-kernel: Bump to 5.10.29

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

 sys-kernel/gentoo-kernel/Manifest                  |  2 +
 .../gentoo-kernel/gentoo-kernel-5.10.29.ebuild     | 90 ++++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index f114f2a88f7..313f873356a 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.10-30.base.tar.xz 991908 BLAKE2B 524e7e66358b3bf311f1347e6a8c8
 DIST genpatches-5.10-30.extras.tar.xz 1772 BLAKE2B 7fd98f16922f7a3ea703a5dd2622152b761a47fb7da8a108281e4a9ecb37f9295347a23081b2859039b8b47049ac530d74a05358b7fdb4a8c9a97fffd8103c44 SHA512 ca23be16f47ebea149496eafb0ce9c6068a3a46be01abf9d95b5e693e5a5063e7692003bc23658269d55f923233f1124854515a3f35a94dc385410c6978e25ac
 DIST genpatches-5.10-31.base.tar.xz 1031500 BLAKE2B fe484cfb72e01fc14720b118ade769fb6f74c04a8abffe1a7da73cf57a895395db7249fac2276ddd2b53bb9e087214c814547133ee84887ee889169970e9964b SHA512 749a725e9d8b942f316501151c10146ab1d8f25aca08b56d07c1096fd2d66f537b513f3b41a3f562bd2a78ff0bcdba13a453d377412d1e72dd4ca2af8c2c050d
 DIST genpatches-5.10-31.extras.tar.xz 1768 BLAKE2B b81ec73dbe1aa7da5ad15985b6a753db57095233f112ce323c291862ae85641dd9d8bfe4262dc7e4e6fea701369cbfbca1df213452627d79d0e7279e26f6e426 SHA512 a01e49ea3bfd689c23ee063d6f35ef7f8ea1dc67551d1443fbc2e7bc4c2e6cb265a153c881fdf87cb8a881bee911fbd815d7509167363fadbe9d158f74d84940
+DIST genpatches-5.10-32.base.tar.xz 1038952 BLAKE2B 0414cd3c9ebb99fda1eb70204a83388d2f1439dfd0cadb2e08bfceb002a9ff34685329ea1108646cf08f8a1a1469165444baab72bede69724d2ae32f1b1c1f9c SHA512 6aa75e5481d038b8e2196c6841c88ad6f3801ceac0f5adec68e2f461d48ceaa9f6a964508adf4a8fc8720f46b71164ed5344b546677fe32f7c5e6f69dd30541d
+DIST genpatches-5.10-32.extras.tar.xz 1768 BLAKE2B 3177bae554ac8e5ff49ef98fb594ebab849be1e2b639e22bc4412140f12cbe93177553a0ed404c176891a67314db3c468852237ad7f7b7fbaf8039263a51f483 SHA512 f13419f37e72f3eefdf2d3c18ae68060c45a5f561dc4e493e331566bf718d40cb89f1a30f88d6563c8d834b781d256977a383befc0b0b397008421010aad6ad7
 DIST genpatches-5.11-12.base.tar.xz 437596 BLAKE2B 18203256f36ac4f0dcc959b362130902c38b5c0b3c0d6109b284e4eb15e02c8fa2bd1db2ab03e3efbace6b50a21a928434372684d14563ffb9e63fcc772e3b28 SHA512 64c06e53f8e03d27de6c6e9d7d9beca2ece09644bb7baa4b72b1942168e957ad7714dc3b25c7d8f300a23bc952b78e9e86914e3fe6f8ad5a307cbaeeffea1ae8
 DIST genpatches-5.11-12.extras.tar.xz 1768 BLAKE2B b590414d965e422aeb00a1cf719f96133485b53941b15387d665affef08e7e67ff88380d667e2b95ad85abd0c2e3dd6ef67098e58d0536ec389823a38db18939 SHA512 f3af5e943766337eff397f94166eb173817a634c133938c596878d47b99a417bb8eec0c05fad9067914625dccdfbf1d39629bfba6ed5b82269ba468ccbcdfde0
 DIST genpatches-5.11-13.base.tar.xz 437712 BLAKE2B 3120f9e413b8bf9c0630a9d11eae4c77d0162f67e1b84f9a84b3ea9321ddda5ce2872d61d9451bc363ff23c3fe8bc409693ac903641ca4f1e42c405099b77fef SHA512 7c2488f2e5e857b50f5616f90f743df308686d5e671cb2186bc647ac74e79eb04550d7f6f1d12623d847cd168dcbaa431bbdf128e57863672b084addf8ac0c2d

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.29.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.29.ebuild
new file mode 100644
index 00000000000..0bfad948130
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.29.ebuild
@@ -0,0 +1,90 @@
+# 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##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.18
+
+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-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+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-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.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
+	)
+	kernel-build_merge_configs "${merge_configs[@]}"
+}