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

[Michał Górny]

commit:     ff6abd732e265474d6f48427d450dd0ecdb1686a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  1 14:01:03 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  1 16:33:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff6abd73

sys-kernel/gentoo-kernel: Bump to 5.15.6

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.15.6.ebuild      | 115 +++++++++++++++++++++
 2 files changed, 117 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 136f53e8a8a3..4f7fc505a651 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-5.15-6.base.tar.xz 300776 BLAKE2B 1a3abd9e88ee1bbadf68e0a7117737
 DIST genpatches-5.15-6.extras.tar.xz 3840 BLAKE2B 0c17070891e0184c34cf4f7c28648e7ffdc56992bd68113735b1f90bf0b46330d37239d4f4a8448de315e1cf2741e3c07a769eb8aad57f1ba9ef107dd8c30241 SHA512 aa484998b7789569896470d1fedd282445aa71a945b1f4d5024acfa80b6c16eb199505eaa089f7c0afd6c26eb3fc5692a890a3c0ffa912e9fa0e2ed5808d3452
 DIST genpatches-5.15-7.base.tar.xz 390456 BLAKE2B 57db165ca26013ab19c546231b6ebceccb056d66b5fb3686e21959455464dd1802e51fa5d7c6d179bcdcc6c4e08dff63112d7fe6ffe513bbf7519f51dacceb06 SHA512 aa1dd9e723a275bc73c3efae6b2402515444fa8b15f89b2cd940f50bf7e0603724c6e9f25b9573266a3e7165ac4b8c9fbb40101e08f2b76e80827d60db288455
 DIST genpatches-5.15-7.extras.tar.xz 3844 BLAKE2B 76fe168f8b4ef235c0aee9f1fad698e25e2f59a73bdddc04a9d0b1465aa033386052e9669ef7d0948accb8d86cac5c2ad0b6184ce757cd7171452f698ed5c3f3 SHA512 d36687bc6f48adaa584e0d856cf824cbe6284a63bd8475a42a32bd0236660b55a68b40ea25195948e8985376890c9becfc678c02228c111ab32d6d2b6df57f14
+DIST genpatches-5.15-8.base.tar.xz 440264 BLAKE2B 284e426656ce3318a0e8e1c7a05c27f9ccbc27f5fefb8d9835937ae821133757dfa29193c9dc711c6639891a76d159f4a3e42db2a6ee24938005b2bc2143d3ce SHA512 d16462c151c932b68ed71edb2095f590c8c7046200e05c65817de68a48b2b281bd83159720e1d94efe22fa29f83c07ffde46a1c91c39be5ecc7466eee254fa09
+DIST genpatches-5.15-8.extras.tar.xz 3840 BLAKE2B 2e14bbe71b25a68d304965d273923b4be3032e6a03fbb085bce05a7f83ba65f8ab60b4b3661770491b75bbb01e56188252ec3ebc2756a2bc0270ec4c4b54bb25 SHA512 08ece5de15fc1d6bf1af1eecd0f638e7d9831ca646e34f9adb99b0e6da7ff87312f25125da3fac18ed21d05d49b9d6262cb41d7811469657678995f2e5139fc7
 DIST genpatches-5.4-162.base.tar.xz 4091668 BLAKE2B d264f2a3cf61b8ed2a297bd8a3fbbc3aa977a6651e42f8d9a8f8773dc9bb6466358fc5d20537b67f826a66a1f1e28912e8454b3cd04dc337e838f18ae28e32e6 SHA512 f90b1d2dd335e25cef4822dd9663d27eb1aa44d780412e703236ced0c0f50b1c4a614eec10134bc6a1a418d19af0abc231764d1fdf9b7f526cd59e10b8b46ef1
 DIST genpatches-5.4-162.extras.tar.xz 1784 BLAKE2B af5b67735eaa30c4edc7cd8681846e892b8455890b5677b5cb8b3849383af43614738c80a6a71d15420ab55b156895bb718952508510cc7e3566aef7d025ebe8 SHA512 4083da3dee1d4e243739322393fb6160d6c148f8b8101c518ceb24971c0dca5ef0886e2ea641d3c04be47495d0112b217dd9b7e33bfc1f16e8dae04c87699314
 DIST genpatches-5.4-164.base.tar.xz 4167868 BLAKE2B 62abbdb5c0284dbfcb1d6342b81fb1a5e5ee99dca0be41b046a751e28ea64ab76697d44870ae175b6a64ac9fbce592a32755374b1671631f31ca5ff199338b39 SHA512 e9bb5a5fc61f7f72a299bfb5f8ac5949dddf7bbde9fc347f2e64930678cb2bc48074a89a965b0eae61879d297a16fcf027deecc836ed377387f197ec1b1053b5

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.6.ebuild
new file mode 100644
index 000000000000..afdca0ba9373
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.6.ebuild
@@ -0,0 +1,115 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.3
+CONFIG_HASH=6950ef54b415886e52dcefe322ffd825c9dc15bc
+GENTOO_CONFIG_VER=5.15.5
+
+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
+
+	local biendian=false
+
+	# 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
+			biendian=true
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		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
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}