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

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

commit:     bb124bfadffaa3d6028ceb6907663260ce2b34ce
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  8 12:28:17 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec  8 16:49:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb124bfa

sys-kernel/gentoo-kernel: Bump to 6.1.66

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 8aac3bd8a951..1aac253bf7fc 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -32,6 +32,8 @@ DIST genpatches-6.1-72.base.tar.xz 4057544 BLAKE2B 7af6ca30c523e00f1f30f97cf29c4
 DIST genpatches-6.1-72.extras.tar.xz 3816 BLAKE2B a6de63bb21ba7a7f5ff88dde6eda62b6af5a2d205cf8072c88027f877b96f44c02465e825dfd13f503a636706f34d4fc0a11c0c71fa8a3c4059deca6f49da539 SHA512 736cc3baa53c31b8f93746677ec1e72616df48d58fb28d5e59b58c0004c484cfe1400bb5b23aa2c696923beeb1661bbbaf0fd8326e925ad486a0278e6b35f5e0
 DIST genpatches-6.1-73.base.tar.xz 4082244 BLAKE2B 890c267dc12fc2f62046b3e1ef0b4f26756a7de873994d91ce837105c5d36b3dcff081089a10218a608e134e6e4b072beb812c90bba8c9458a29505f88a79def SHA512 566b1437311cb24cfd6c0f0e3a22a792a2fa0bcdfd2a71e45a8b59eadf5f8bfa6618ce3e7654c513f4bcaa99f65b8154f3d6025ec7a7fb2a708acc7751e6cb6d
 DIST genpatches-6.1-73.extras.tar.xz 3812 BLAKE2B efc027ab0bd21caafbc7c2706b066b3486f9acd93cac964ae00e1aba543d5a92bc00b4f6cde82beed2a0d72c1aafc16a8e168d139a365463d8c6d170718627e1 SHA512 b74da4e894bf615705fa0396c09d32d6e34aad81f3114119a3dbefa94ffb47f91017c2b551b80c289c607a29ff8efa8db1000d89534d8cd4e75d88024270f7ae
+DIST genpatches-6.1-74.base.tar.xz 4113880 BLAKE2B 26d9abc23f66346e376b78bb687ae7bc955447093641abe0bf736ff9e1c4e7ca70a0bd26b581f295b168ecd94c6f84603f13f5d097cd8b05b9373ea03a9d0426 SHA512 4ec9211030d1d1cf8e412b46f6cc101768418a177d0113b58f3aa0c4468536faa45a0615483baec378eae7995a91b86da1c06af167a1dbc6eca9ff853ae838f3
+DIST genpatches-6.1-74.extras.tar.xz 3812 BLAKE2B 52488fe7154cf6e0153a05184699dd1597a078a7a376e2866b68b923e7f82300757d1c70e7bc44920ab7813d500fb3d4677d49428261308e4b6b59a552381a9f SHA512 dd04bf075792824bf65cf349f6bc921d0c36cc66c878b8dfdd95c27f3a82de426d6725d79c02374e7372b74b68b9c0123875476de434f85646dd9aa8382d8de9
 DIST genpatches-6.5-12.base.tar.xz 720508 BLAKE2B 429f4fbc3292ab46250bc1716212f369f888ee0219ab19baaf8a7e3634c012bcaa64820639b5650b5346cc93fffb3b00c8ba5ad48c3f0030e5db6102646ca60f SHA512 1b5de16a305f7cddc3125be3786347a037e25b8b53ad05c35c8efd57e624dbd7cf152898c3084847d6c9b77f5bc6df378644434e877434d40ad4fb0d08d6a37d
 DIST genpatches-6.5-12.extras.tar.xz 3704 BLAKE2B 3d18f544a455d1184eb9687a5c53c7dd348b12f736313a3bb9d3417e0f4458a8e7f962451ede58f45016af700014fea87cc3336b30ede9f899dd75369eaadc57 SHA512 0a8c8a23d99962e5f0028ef1ee8ba79cd20af0ccf6b08e554405ee964cf542b6758d0e2456612a410d7fdfca5572e4af7c4d1c3b65a9b426412c1b480b2d6475
 DIST genpatches-6.5-13.base.tar.xz 741136 BLAKE2B 3e13a5bb6effb4005e2c1e604722cffb27583aa78ba0642ae2eacb2f5905fc19fd16212b502196e58d0ee4064779623b44af03e34c6bef0635104bbdfa49253d SHA512 5b63c998dfe984b5435e7e951889dbd1bf4cab2d8db41e89978ffd06ca58ba3e8687e740bb42514e0da5e5ae19998234f87e8220d5eb550e21fb6bd7c665e139

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.66.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.66.ebuild
new file mode 100644
index 000000000000..92d3ccf485e6
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.66.ebuild
@@ -0,0 +1,146 @@
+# Copyright 2020-2023 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##*.} + 8 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g11
+
+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[@]}"
+}