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

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

commit:     a88a4a5ee95bec5916d877a5c77ad1dfa0f2c910
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  3 13:23:02 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug  3 15:46:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a88a4a5e

sys-kernel/gentoo-kernel: Bump to 5.15.124

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index be9b88b8c5ff..25db752fbe43 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.15-128.base.tar.xz 5056336 BLAKE2B 7b25accd5e2c987050480abac7b
 DIST genpatches-5.15-128.extras.tar.xz 3932 BLAKE2B 64d34eee4a4ee36c8d2431d8341723eb0ec32be703fbb3927e7984e9ea365b7907f38b2f013e725221bfb7d867eb63da4e784506615e1cacf9018c58981a2ce3 SHA512 b735304d7990925485ca45f1cd0f6434a96af45269bb3e10b9b67a41f84440654f62831a5160125f8d0c1ff4587ab00294caa1fa5223e8daf86dc0393bc8a695
 DIST genpatches-5.15-129.base.tar.xz 5079636 BLAKE2B 9dc533ca9995f272c9f69c277e02f028cf04a1161b6ff18082dc132861549bf9a297a99768bd779ccf0c5ccd26e2bae321e8e233986c23123b3fa549f47a4c35 SHA512 43fd5a4739883915187fa04a5c04e106233ce8e76492240585b6b7dca8f74687c8326117383f84f8d4b8fc1de602b2a9aedfa596ce5a1275777fd15ae0f7a142
 DIST genpatches-5.15-129.extras.tar.xz 3932 BLAKE2B 899d47c7df1aa674c6438d2e0e5f70aae7ff0be55ab663d533191721791673f60c90a00b8b42167d99e750a428a65604af84f47aa385049ac91b6599db547b72 SHA512 ff342b8a47ccea5ae86bc4a499a145a331e9c5c52f2ea84b1baa8b17e11d5aa6504fca9d594960c903cbaea65cdd53aa6e634128296b0c76cdb6d4e9bc9c1ca5
+DIST genpatches-5.15-130.base.tar.xz 5153200 BLAKE2B d06514f48706208faec58f2a0f15da99e6e5ca6e311678b307f1734d6d0bc1f86252c6a68f144fec10298e05d27bdcc9d2f09bc2be81b2afb0c2cd2c1cd42d55 SHA512 21943da272b5279b4b85a1ad16a05b6ec21157adf6aa925d97d3ad34cbd46f084df7ecbe6519915ea9ed26de47312aaec92d2a76c30eb5b8da1289a4e3f34d28
+DIST genpatches-5.15-130.extras.tar.xz 3928 BLAKE2B b4b1c6d6ff12356679a50263b39108cb8f9123baa6a3641a33d102fae71fcefb49303582e2509884183c251dbb4a5cff3183cfd60122ed5ecdbd859505bea6bc SHA512 3f0ac344f138b8f7bfbf136a814c4fa3eab7740657cb9b6284fbe6e0465dbbd4c0d411db8cf8621c53f91df05acc42611e5948d9b6b56e75e8b9be658ac555a3
 DIST genpatches-5.4-257.base.tar.xz 5959056 BLAKE2B c3c4f47328f4e3ade669e1cb4586a2420618b647fe6cb5d96210cdb8d5baf767d6eb6d9efd4ac48eadaf0f2b108569656c43b2b43a687b635daf9c91475491a1 SHA512 1231ad3f7ceb0451d9aa5a96be803eb48a5656fe63476ec55ccb71a96eadd2c12d2e44074b302b9c2770569abda60275c0ed161b3786d2dd7be6b0a49d4e4f55
 DIST genpatches-5.4-257.extras.tar.xz 1812 BLAKE2B 480e82ea79feb52785fc6643c883093f42240395a1d953cd1e5331c012cf64c6f4b292e878a938a9c5bb297e96ab9f80656839de6044c9f1e76c668c2c8e1ec9 SHA512 5322116802c6c0a44abc81911bb83fd7d4aa5b5f7fb4bb35ca78c47c6c0afb188e21a24cc5ac4e2810affa13689c902e97062d66a751630cf0722a2b28b1d83b
 DIST genpatches-5.4-258.base.tar.xz 6040776 BLAKE2B 722214955565832dc7ae8719e4c6a6a6c44822469ca73ffc7a4d6ac4ebd5b8c2e04b127ddad873f3b434cd21803b54c385f7de750386494b0995a19aa44cd2c1 SHA512 12b0c24ace3e4376bb377383d14224822f4244caeb687d070be331687f0b98f4c0c85866dc65b78450b76e7628e4ab403b15164b1ff98c45f720cf7d98070442

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.124.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.124.ebuild
new file mode 100644
index 000000000000..ad2d0803bd9c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.124.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[@]}"
+}