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

[Michał Górny]

commit:     50688280f4c538151528431562e00b07ba277065
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 11:57:25 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May  9 15:01:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50688280

sys-kernel/gentoo-kernel: Bump to 5.17.6

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.17.6.ebuild      | 137 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index af5c5c7342d4..7b0c3823215e 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-5.15-41.base.tar.xz 1716640 BLAKE2B d2a37f5bdbb541bad670240ee6fb
 DIST genpatches-5.15-41.extras.tar.xz 3868 BLAKE2B 11487f062c49431af029fadde1f01a95386d42e1349a658bca314bd26d356eb82d0292ca68ac34d4ba4593a25d7422458a7dcf306431dbe46e68c9306bd8ec82 SHA512 3153848739687683f02c65d1dc87b4aa27d0fead27ac9fee28acd2f8d0fdc118473445059bf756650512c5f3fa79b8a4a70882c2ab2d4329c4d7aef982e5e4d6
 DIST genpatches-5.15-42.base.tar.xz 1756168 BLAKE2B 953621740d74dd84876e46a3ce9781cd5df8f7ab37588e386045196af57d8d000b120b810b762ecb9d52729e63433c0dcd8b8fc2d938fed05c33705bca907227 SHA512 4f45522c7dc0e5c1b9289cb09199f640c2bc124fb306ac64e9de1da56de123b118445648dafa7d3170e1c8a2607b6ab1d34dbde4a3c1cf1ff7d21d932a9672ea
 DIST genpatches-5.15-42.extras.tar.xz 3868 BLAKE2B ec9eecf22597ad8217a9fde77067bdfc3e7e8bf5bd502ca71750193d8353b51e6371b7323b66afa8dbed6a177e2d165a2eb2eca0e06d2943b474ab74a5256834 SHA512 71155d6b1130fee0484b0171f72d2f627b65cad8a02d5047de9d180ed01c2002958020961c925b4c0b6a415ecc2cdc481c4820dc1f9f8a8443713a6a21c3a022
+DIST genpatches-5.17-10.base.tar.xz 649500 BLAKE2B f92a3b4880da7a922694efc984e9dd711288decd2c3e20476036e59a09179b99250ce03a3471acc69d03d361ace416688280c5577ded2188575fdf731504b625 SHA512 b068dad762faf36618a06f245097b4f3752af2ac983afe73b673e7d34e39cf4cfd6c2a1afaef4178317c199731b522bb3037be01b737db9e6ba344551f7f9dd3
+DIST genpatches-5.17-10.extras.tar.xz 3800 BLAKE2B 547c378d7326c7a3f5f8f748ea440e5f8d822e36fceb7966d9b8a2dd6370c645231c9b6b73f6a92d60324cd0fa1b523f7a3beb88701f4424c4d89abd669a054f SHA512 0290d3ca272624ed230ae5418cf31bc846a59cbb9c0657209f7f2de4af447265aeea58c08d2f0b4ab2f25624230eb4f64f82723f4019c903484fab141ba12b46
 DIST genpatches-5.17-8.base.tar.xz 558192 BLAKE2B 8135b5dbc28154d346f1e24d915e1d80098764186a28638a147d3f840c431c7a44b00f80166d1acbf4181ce295c2655be4b7939919158ff2fd65174bba7bdd7d SHA512 3577093fa8b8961fdee9e52e67c0681055f26db4e5861ddeba8146cab3e63a1ca97287114feb79deb8a82518d7915cd213af01c18735207bdb705985f276dd5f
 DIST genpatches-5.17-8.extras.tar.xz 3796 BLAKE2B 149f398df8860fae67cea4431affaf4a8ef5bfbe570434e5c7878c3bc1f8fdf8a56fb069ec79bc1fa65a5e0189a302162a1cc44865739e52a1af6db74cfb86b4 SHA512 14a850ca0481eb66da3419841b5c80b25bd00da30454b3101990399bd9f8551682ea82006b3a223fe91ca2c977a45aba983914943d375ae4c73904a2f5a318c2
 DIST genpatches-5.17-9.base.tar.xz 594204 BLAKE2B 56e2423bb67d9e0fca4d065fb3ff02fa68ba3ef62769f14f7add89cbe8f637dcf3fb3acf7442369204588419989a4111d0fc0b245638f692495b51d3d769e73f SHA512 0cc46ba8854b2a0f949a827e67edbe4d941eafd76ae86ffdeb485d5800ad40c560a3130ca9f050336762157dc61bca22d39b82f3d769a3b434a32f028ebf4b21

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.6.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.6.ebuild
new file mode 100644
index 000000000000..8ce73328af90
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.6.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 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##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.17.3-gentoo
+GENTOO_CONFIG_VER=g1
+
+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/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( 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
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+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
+			;;
+		hppa)
+			return
+			;;
+		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-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		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[@]}"
+}