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

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

commit:     d822903ebe972a4ca0fd79f75bcbe28fe25b1387
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  3 15:56:51 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug  3 18:10:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d822903e

sys-kernel/gentoo-kernel: Bump to 6.1.103

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.1.103.ebuild     | 146 +++++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index bdc54d90e36b..5643232b9f59 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-6.1-110.base.tar.xz 5564556 BLAKE2B f479e7fc7a12222c9b0268825fc8
 DIST genpatches-6.1-110.extras.tar.xz 4052 BLAKE2B aeded3974b119221fe8546f59eaa9a89842b24c0dd7d1ea45be003dbf91a62194b04d01e9811abb4a4af21b0e7b77e35b521a94f6042954f6fc09958fb41a84b SHA512 729ba854dc3513d9149860015013ea8e539bbe6adca5a28c53184fe0cb722307e96998c26dc1966e25d232e19e3188daf4adece4692d2804132ef956267629ee
 DIST genpatches-6.1-112.base.tar.xz 5686744 BLAKE2B 2a45c958031096547d8db5c43413057444bc76eabb91937554f78c9beac08318cba3ef890e455cbdd85f0b08e6d759a2374237a2be75293812df3bc68fdf1663 SHA512 c0c2a19af8f2bf1e76d89e084eaf4fa733bf868c11b3263f983b060f4cc7d82869ef1659939d097acce33339e25ed4f0b0f3144499913fb1ace8aded593d8a24
 DIST genpatches-6.1-112.extras.tar.xz 4056 BLAKE2B d592f37cdd0c21afb347ff53965f6fc9ab962b8ad48d666cbc55dd91a32701918669b8fe8997757aa55d5923829c237aa27b7d819faff74dbac2fe88b5863fca SHA512 aff46e4c47e3e0398a8d371a8821afd7d6d7ee33997834dc5532e007e8b69b333705d6978f0a32496073eb6d06607cb34626a1bc932376361ce2baa9587f918b
+DIST genpatches-6.1-113.base.tar.xz 5796104 BLAKE2B 0b6ca23a1a97810646b3424764e71335f6749ac5462ef5b6baa37b1873b106cce103654b8efa8c91fb137fb253638bddf250247b2e4db8e160e2ea714eb23cca SHA512 eef7a965a901e749a60b3f9486d8c281d353c47637f6468d53521771dedc26de3dd8d9582adc72da4730f55dc5f1b5a4555f03281c3a836d1760c40920464446
+DIST genpatches-6.1-113.extras.tar.xz 4056 BLAKE2B eb8f6f49888245bc0f9b174f326a19658871dd3d2c34fef83514469b14d8a7ea84c0efc17f988143324779b571251881732d906975902ae77210eb7a20aec938 SHA512 09b36640d1c31ec865031810254ff2613e0945634b8afb54dfa9c4c22924b1e37f53559e9a7bca9307c2d0c15b0cccfbc588fb795b7eeb38d0f33e050ab53de6
 DIST genpatches-6.10-4.base.tar.xz 15672 BLAKE2B 3dfb069409ca8c1cc8022daaeda3f45443c4e11ab1b086d8178ae4bd7e9a77fdbd8016484324248370bfa4b92e1a10cfa67d40592fafcd8540cc917c60b52ea1 SHA512 ea2f80b065c59b485446c8acc174b93a688b9e6d5de8cd9bf307a43811f6087368b528647a2371636b22dc082735b57e470e9c5d1092972c3890a9c628db723c
 DIST genpatches-6.10-4.extras.tar.xz 4056 BLAKE2B b1cc5a0d37760aac34837b9f7b26240d92afa816b5456a334deaaff8e911cba25f15c5e168bcba86b80d9fbe006a4b07cf4aa963e68a92e5152033cbcb080be0 SHA512 765b58ae1ce61678dce39b27e9212844cfd991e222384c7650355a374a236918f622549d49d5d483bfbc6dfaa74120b66976e85bbfdb6b54b0e871f1d5d5ec60
 DIST genpatches-6.6-42.base.tar.xz 2474752 BLAKE2B 074b24c3848ba0b2521d364d67222ab324cfacc3036b2c3b9ceebebf03afcf21d963921841f6f987422e904be35653f9dafc2a795ed6eaa050d6a37595bdd111 SHA512 6ce7c93c92a5f2951c9a60b7a058560dec8c3f9c16f00ac4b58c23f88ceaf9cbc519653320bc95f45039219eecb068247f3c27ac448c8695ed8c9e93022fdc37

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.103.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.103.ebuild
new file mode 100644
index 000000000000..dcba4a9c42af
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.103.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 10 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.102-gentoo
+GENTOO_CONFIG_VER=g13
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	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/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/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 ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( 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
+			;;
+		sparc)
+			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[@]}"
+}