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

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

commit:     048ee1aedf72a559112613037a2124ff66cbcdbb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  3 13:22:11 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug  3 15:46:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=048ee1ae

sys-kernel/gentoo-kernel: Bump to 6.1.43

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index afc51de398c2..be9b88b8c5ff 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-6.1-47.base.tar.xz 2915344 BLAKE2B 7fd49099198e9af926911b3a88312
 DIST genpatches-6.1-47.extras.tar.xz 3812 BLAKE2B ea44d25a1637abff3a87ec17e397ef324aa08d7f62865924a61f55cf85df6a1ae5b8a56ac1f33a61955bb3ce71b28d628d34a600a1834583ab94d4111e9f4810 SHA512 9f8c831530609f2379685ec3bbe545f2bdca86f139233dceb0b10d7259b8b1207188a8f95237483b13f40c6639c6f060df4cbc67e09249c24424bc0bc83fe281
 DIST genpatches-6.1-48.base.tar.xz 2983620 BLAKE2B fd09d2c761c3652502d590ad189db668a27d48e2c0c336b1d2e96f9a90a3c365409d012319b6daff30e6039330b90746636e89d6e4f5bb302851b3ced0e57286 SHA512 5abc93002ba800f13d27ffa8bd9485cfb921cd8e43d4cc15325fa2b833eb334e062cbb9b751ff2fa285a7f61f0e0809366d58fcfb4fd4a71fc08f2e48669b5cc
 DIST genpatches-6.1-48.extras.tar.xz 3808 BLAKE2B 5f31be220d97582f049f58f796f0d509c1d2c82ca41efbcb178a9f78db64e0de0d0297096a6109c4989777cddc0957fc8efa7caf333737157a4b6352aaff64bd SHA512 d37be3695cd96f3226265c4f689aef9e98f0528d34b554e53e98fe9497e1b8a26ebe2661d8a04e9c84a615e1bb4966263358d759d228c950af3ce70bf6340e0c
+DIST genpatches-6.1-49.base.tar.xz 3063788 BLAKE2B d97aa1abfdba4aaf84d392e5ebc26822a1651fe0249b3bd84f4f5f2c413955d9d216bc1e9e2e2ef388e7aad4153ba11863cdb7854cd2cf1dea478da3ee8c065a SHA512 7acb3101165cf8f4beee7b80880510a5ce4afe0148641c7edad91cd6365239b52b55a51c550408ed0291aa3ad74512022ccb6ef85c6ae8765a0ff2d49ac84bc1
+DIST genpatches-6.1-49.extras.tar.xz 3808 BLAKE2B a200e4d646d8b99db4a5fde73ae51727c475b18b9f080b3d55e27d4b6f247cc8950f772e0676cfb11d301d3a9042e929d4957f96de0073bc99ef65c53668bea1 SHA512 4fc28b57b4a99ddec743d3804a78a5027d9922641135f1995016f2c5806282f0bb33e9f78cc7378ab8388b582193df457a6c397b0986e197fd5e5cc4bba85c7b
 DIST genpatches-6.4-10.base.tar.xz 568848 BLAKE2B d9f28beda8bd4f69e1e5d586e274df43a8661bf51733a25f320469c1e3e42d9602b0911d4e98a40942ff182f076501ce6721e534cb92aefc3d453fc43ee499bb SHA512 218c38f99a07c2be1fb25737b0a9604a9a50fe3f72c507404d92da1e8dd7823142edc2b81110e510aef7e645edefbff2265aeb3ce7f376131801c3adb292b8d0
 DIST genpatches-6.4-10.extras.tar.xz 3696 BLAKE2B fa0b8d593543f3624b1cff626e2cb2dc93ff0e88fd54ec71a7e467c716481420da7f361c1dd353e36111425a74f6632f1c491e618dec47fa4bc15c6a6d9e26bc SHA512 9dbfcd1d65daca0b56360290f0a6369fa007f32dde0f1a62657d1697fb50b84668e8a14c62efcfc3d12ba6a4a911731825df260421506639d2ba9b8764962e87
 DIST genpatches-6.4-8.base.tar.xz 414164 BLAKE2B f62a27a2a4ed9a80d830f5118c492c95b1400a149b9594e68b47011359fb02f5ab0a5f467dab50f730d56ac21bff0dd4ebf09251588a7bb4dda15aedc95ec729 SHA512 6d747b1b06d9fad9d53a293586e3bef465ddfbf2886ab9edee32b81282d4c7b8cf27d4edf4f8be1ef668ce55888ae21214ddc6dad0c2732698d23a77dac993c0

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.43.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.43.ebuild
new file mode 100644
index 000000000000..7e128b87c8f2
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.43.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##*.} + 6 ))
+# 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=g7
+
+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[@]}"
+}