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

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

commit:     5671e2702406c987de349841e9ac83cd125a9ba9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 11:01:00 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 11:01:00 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5671e270

sys-kernel/gentoo-kernel: Bump to 5.15.131

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.15.131.ebuild    | 141 +++++++++++++++++++++
 2 files changed, 143 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 5ebe41ee5aef..93f1e8918038 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.15-135.base.tar.xz 5311072 BLAKE2B e7ad491771a4602a9f8d6786ba3
 DIST genpatches-5.15-135.extras.tar.xz 3932 BLAKE2B fbb46341209dfb76d7a3ed7555de53de48dac947bfc993567afb6d0c2f8e23907d1fbb831a35c274b22ce34a31d6b805d30e727c59fbf63de7095500357ffcae SHA512 796ad4fd5ea1d84b066acff3b56d8df87575a584925c8487e97fb3b056ac46622670e06ce4c5511541c037ae84a566e9fa2304f5555050c96efe97da37126e9d
 DIST genpatches-5.15-136.base.tar.xz 5312940 BLAKE2B 3f905e0cc9ea0353f3be1cfff526f849298fec3dc8e7ec66c7283ff3440663cc54b58cf07bc2c62d2bbd9bd335f37a708741188a43807e55b526fbbd465579c6 SHA512 0d8aca792ffc949796905d135abb89ee812271e93946b00cba76bb7b3e9d5cfe05efc29a19c4c3e9933f9b1eea0256caffe85d9936f6cceeb94f3ea51c60f586
 DIST genpatches-5.15-136.extras.tar.xz 3932 BLAKE2B c9ea53212a94f1d8cecc51c30d3e7a856ac1f325ecfd5e06f5c61b3b85fec988ff93169d01b7335fd100b329e97bc8806ca02247477b51311956a29efc2d4d6a SHA512 edc8041e65b7129f8abac8351c900d1a8849bcda06d3328c6fefc641af259aad243dddd9267ba0f6532b2cbfe4caa0275c323db392cbd2f3160930e0cbd20017
+DIST genpatches-5.15-137.base.tar.xz 5320152 BLAKE2B 9c2376c4aafdeb6f49b490ffbd15b70edc3c76dde6fd5eb863912b685d0393fc4579d6a402b5aed7c8081b4ae6c0bd5a8bcbf2fc3b92301f1ba1f582dffc5176 SHA512 d156b00a395c0d6fa623f84c4cdcc8266119703aa03aed96dee78f799535f79ce01cfd603c0935b4c0d2a793031cda5635c034358d9eedb0dd7b1fa307ebccb9
+DIST genpatches-5.15-137.extras.tar.xz 3932 BLAKE2B 36f79232e1f7a297781b64c0fc2a9a3ca171a7440d635631ae34330fef11f782c43f23add9feded31e19904a28fed1a9d99a1991b590c2e1114de5217ee673ce SHA512 fd59a24b43fe48a9a475eab3c40a1fa0626661b3c66734223cc9c24a8f7490b569a475d94a170a1a5958a7be39fde77e63ce933620d8e31308623cad218bc339
 DIST genpatches-5.4-261.base.tar.xz 6100368 BLAKE2B 1333f1a5aae4faabe031192eee4e491ab80c1e6291e542a99cf308295ed2301c93d74cd41e34fa10e1110710d26edcb9b4b132ee635cde5711b6474557601866 SHA512 4083c69df7ce9aa2e57eb69be4132689d10c95155c7608d6fc52f661abc1f0f9077f546016b3df32b8252777fff78af347af7022d18203aa8416ed83b68ef88b
 DIST genpatches-5.4-261.extras.tar.xz 1812 BLAKE2B fcc06d16147422b0ea123b116644539b3527e44bca78d46cf5795d44e42575c7017ec3b5c9dd566c5523e3b23f14b4d817846502d4ef353180c3a3c79caa4c2b SHA512 5cc879a4333aa3e162a5da4bf118a12ae5694c2fb98f11f9e1eee57f91b707974d735c290790942a14b2df5bdf092f58d1cf03f7058aea6f8e588700ec185dbf
 DIST genpatches-5.4-262.base.tar.xz 6139068 BLAKE2B 61c2f6a1b307d4e89fd6ddfa57985eefb7b1778ee8ffe346be8967ef528ece98bfbe52c56eff2cf356dc0d2087b59ed353591d508e35e6214130abbd586f1fdc SHA512 c16b5036a6a4a1832a3e95ceda7e77cfdfddb99b92d1091354cdfcc8868a8ac7d4f692ce522e7167d171664b65273c8ea29009fb2911e9f20d3da6ebcb2a9837

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.131.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.131.ebuild
new file mode 100644
index 000000000000..ad2d0803bd9c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.131.ebuild
@@ -0,0 +1,141 @@
+# 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 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+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://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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( 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
+			;;
+		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[@]}"
+}