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

["Sam James" <sam@gentoo.org>]

commit:     9d9d5e988e82fe2a847e16d9fef059bc007007a5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 23:09:07 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 20 01:24:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d9d5e98

sys-kernel/gentoo-kernel: Bump to 5.15.136

Signed-off-by: Sam James <sam <AT> gentoo.org>

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 7e954acac1fd..9d7d3eed6a07 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.10-208.base.tar.xz 6093152 BLAKE2B 39bf2d32114ec581c28770ebfa3
 DIST genpatches-5.10-208.extras.tar.xz 3876 BLAKE2B f288ba384e0871c7ceaca2f20fa324ef69e032e21847770e13b95d85d67f2de40780c5e30a2eb2c75c77f142f8417bef66bc6f82f7dfb46fa4e98555c96cc71b SHA512 adad7c912629058889705cd77f684df2ceba3f02add3aefc3103f44484f996e8b42b320ca8697782fcbab24c00dc712fad0b852b8538f68c3ed258fe90550aa7
 DIST genpatches-5.15-141.base.tar.xz 5572792 BLAKE2B e062086d50d08b67c21c785b086c4bc0878f078ac6c10cabace2ebfe388af3497d2b98bb2e5d19d4b5791e78456bdf0e8c479121eb8c41b4ca2fcd362ebffe4f SHA512 1835684a7737d61423ec0778316b46fedea491a8f5254d9a2d630e5a78519d61d22dfa0d9d6ea1ece563f165c0d54c748f23bca5df304ad45338c27327e8b2c3
 DIST genpatches-5.15-141.extras.tar.xz 3936 BLAKE2B c51e1f9dcf3995a2e178d8763407dc94595e513f02d96d54dc1b71a34ada0eaf46b6cb1cf4bebd39b4776605532df529cf8ed361480181af516ab889f915ee5b SHA512 5eb1f68368de87df9236bcf10726cd3abcb75a9f59579e9810b9ea53f3ad332d345a3da7c1be61826b6b739aabb11a838d12ba7be3ce2cb890e094433176b02b
+DIST genpatches-5.15-142.base.tar.xz 5603000 BLAKE2B 2c04fd46f173dc82421edddecd0efdd6d6df46534e1d7ceb6d2f34081e3a5d558b8444f92e2f9e14e3836734c32f60413d3777e7f490b06b3cbbb5c1e85c1792 SHA512 c548e4ca832f4a1d90fb639581c382fd16292b5f8b24b1ecd32aef2eb36c79c7f8f4083ae09b1e105be55e406f8b7a09233637a48f493ab139706334b1056ca0
+DIST genpatches-5.15-142.extras.tar.xz 3936 BLAKE2B 76f3aba69251c7c30f2e21b450ae6977c10630448b380552191295d89be761d243b7cdaabf80ae52468327a009d1cb00841e8d15469909363a9683a58126ab30 SHA512 2dce221525460ca2065f102e447672291fed39c21fccefa5d9ca0c2486fd389fe4bce259674ecaa3b6f7dd52d04b677463bbb73543c8ce610b4b729bba55db66
 DIST genpatches-6.1-64.base.tar.xz 3729008 BLAKE2B 10f4366a8fe83ca0609c0e2654e6c64ad47f3a3f1744ca637d8801ec9c8a8c541d74e21e020de0a6de18c98de640810d6934092b2b983b332e92514c2b6443a7 SHA512 1dda1ba93fea4c18ecaae6ec5a3cfea1fbe7f89fa9412e793b7cd0beff43894650167c77d1b85eb280f7754c85179dc3c72e32ca18f4d8a95667501c61958656
 DIST genpatches-6.1-64.extras.tar.xz 3816 BLAKE2B 315826af9d3e7abbef0314f962e2df50f9d183555ec5fb956fa7c9820435042e3c3a72a5ad766a3441543c54986ffbfdae8ff0a4deecb2a72851237108eaee71 SHA512 5a384aa4f6aff1a3410090873f9321ca1c6bcdb48dfefeaf7c2746b950ad22c7a745c60389ec49b99a249cb62c91d517389d5d91c844509dce5cd45a67b47edb
 DIST genpatches-6.1-65.base.tar.xz 3729228 BLAKE2B e2f41ebb95ca74bc5d37f950e088d2d790c09613728d86a58c31867954748d5ce57f484acfde262bb70c2d42538241b6b05cb9befd7efd6ee10a276fa79e4c3b SHA512 815a57b87978d2a0196146ff4e2ff6a7e95d10c74727d458f9cbaeddded3c99c78a24524b8cf1fa0f1297e5bc7f3c9cd743b19f12938478f3f3faa3a68c7e431

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