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

[Michał Górny]

commit:     3b455b0bbc69f9f874714d5f4e3a2afd10c3e27b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 23 17:07:10 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 23 21:16:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b455b0b

sys-kernel/gentoo-kernel: Bump to 5.12.13

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.12.13.ebuild     | 105 +++++++++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 2c84a0ebf7f..aaf91e5a037 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.12-12.base.tar.xz 650292 BLAKE2B 81b5a3b95390522c328acdb390fd1
 DIST genpatches-5.12-12.extras.tar.xz 3412 BLAKE2B 8fcf6c407be25db368dbb3e6be3907d3431228b5c39819dba7c67d61e5171a7ad9a86f3e117b99b9e0d626219ad9db0938c15c4b96c934b88f693a3e9661d458 SHA512 39750768e4822ea8e3f88540fc8ebad9fd721e2a3a8703102d58e30513b47069cb8a77e15e41d0f90d1d69053007bd476ce0741cd3135a428d039ebd426cdc57
 DIST genpatches-5.12-13.base.tar.xz 661044 BLAKE2B f9b14633dd2895fab6d47ccf99d425b4d4c260c58bd2511c8166fc440c1cff337711b805b2ef76f787c6232115df96ec9706a3c1e65e6bc2c8a8b6dd1436dc0f SHA512 8039f529138bcc3b8a485b25a16b1f436b7756d91c018a70a6f6951dc7ce329a1f8441bad90ede66329283ee6ee314c22411e283bb76f46d0ad9e03b0a8e2b24
 DIST genpatches-5.12-13.extras.tar.xz 3412 BLAKE2B abef35f4ac38e4b0ab7863376e72534c27d32f3b974f4368be54c0d9ace766749ca4334f7622b2963e1dd51a05f1262d58f7de03ed8d0a73c3f2b68a2b48ab76 SHA512 72bb3380b6382938d9b3957e4f47267616b8dd50d7a4991750b131c844c882b1d67801fd917c89444bde9d875cdfdf9d8e25bda079d5d97f42af7c2655343f61
+DIST genpatches-5.12-16.base.tar.xz 707164 BLAKE2B 05331662b6c219900a5d70aa3f9030e82cff6ca09de9645e178f5976daf8003335ac2a9163e405282096bba6057ca645f81fddda41eb7b10f1125524b4cadcc5 SHA512 dc8efddc386fc5350802edb5f95f62f61a8d3c2033a0efa0fe9450ff0ba84a65cbb4482a0de9fea6f67200fb938f3d73c27124f9bcf706485f32f25cf8e89cd9
+DIST genpatches-5.12-16.extras.tar.xz 3412 BLAKE2B d0e429e2c9e1a2733a216e57c32c73f55285edc74f801017261925f246e44148c58cd8745caa6afc9cafa9c090d01206acc3cb96dc0ab260a834a0b3dd0e8918 SHA512 24a1f8b2f2993c157fa0efe5649b7494084d925f8665a8c0727ad431da00fcc8bfa7e00ac1d2b308b1297c1c202eac687d7539999eed38f44e71a9cb94327ef6
 DIST genpatches-5.4-123.base.tar.xz 3488228 BLAKE2B 0fe5c3056c3cb060f4921e3b7a4046e03e4e777d033619f0496eda68c645c6209fb07713a4bc2565000f9c17e6203a8bc5392fc597dd49167bb0348988b53026 SHA512 e71b8f9d622d3ea2fa8165a39a27240ac007d899d7324c60240221d7761c1287f14b631b074536460702922b8daf00bc2714358aaf7f69ac257af7d5d5b18bd1
 DIST genpatches-5.4-123.extras.tar.xz 1772 BLAKE2B da9bc0d9513d010364506850d1c23d13e1a1ef8c4cb8d60e3430d12f4cc2ea87a74643ba9fa1a061eabdee9985b1931aab1b2587ee26bec9b2cf165b90fe83e5 SHA512 ff3b417825ba200b32abf888b6cf6e8d754526e57a30c06fbe4f961c84f67cd921b93b9848fc6b49f120b4cf8ddba9284755da73869db35327af7549d63f3cd1
 DIST genpatches-5.4-128.base.tar.xz 3571424 BLAKE2B a58c2b8f20730c3357ce30cbc8b24f0609bd7ca2a8f5d37780cfbe4edb560fa49bcf1925ec40dbf61aebfe9a87be0f35ade4b999509420eb0caf5731ce649e89 SHA512 c84d65acdc4274b528306af958b0c72851fdce008c9ed6f78965ea22f09f8668b6075cfda9101b2e7a7bc55ccea64491000b1aede8cffa4ad927c7c1bb003489

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.13.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.13.ebuild
new file mode 100644
index 00000000000..8cc6b8c1b94
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.12.13.ebuild
@@ -0,0 +1,105 @@
+# 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.12.5
+CONFIG_HASH=17639df044f5f81bbf267f566426eae4a5187875
+GENTOO_CONFIG_VER=5.10.42
+
+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 hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/pahole )"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}"
+
+QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
+
+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
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+	kernel-build_merge_configs "${merge_configs[@]}"
+}