From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1561856-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 6E4F6158089
	for <garchives@archives.gentoo.org>; Wed, 11 Oct 2023 07:53:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 689052BC072;
	Wed, 11 Oct 2023 07:53:23 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 4A9372BC072
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Oct 2023 07:53:23 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 3D719335C2A
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Oct 2023 07:53:22 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id D41C110F7
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Oct 2023 07:53:19 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1697010495.ce2e5ab32fcd12e1707c5db45e501ce44cd04373.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-kernel/vanilla-kernel/Manifest sys-kernel/vanilla-kernel/vanilla-kernel-5.15.135.ebuild
X-VCS-Directories: sys-kernel/vanilla-kernel/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: ce2e5ab32fcd12e1707c5db45e501ce44cd04373
X-VCS-Branch: master
Date: Wed, 11 Oct 2023 07:53:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0b7cb4cd-8538-4d05-8b88-88fa54b8404d
X-Archives-Hash: dfd6871913431bae6d2f31274a58eac5

commit:     ce2e5ab32fcd12e1707c5db45e501ce44cd04373
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 11 01:06:03 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 11 07:48:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce2e5ab3

sys-kernel/vanilla-kernel: Bump to 5.15.135

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.15.135.ebuild  | 137 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 51fdf5686ef5..958c25d9bd1d 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -31,6 +31,8 @@ DIST linux-5.15.133.tar.sign 993 BLAKE2B f9195946c0903320cdc66db68fb7edc5bbeeb67
 DIST linux-5.15.133.tar.xz 126545380 BLAKE2B e71975def96d76fb5d0886be6460ed581a2ad88ee3b1c40b1b9a38013e912664a95a2055b2ecc190aa4c3f5e275eb8f00ffb6ac826e8ded9e1564a76f65f8985 SHA512 2877480c7f7da8d568c4ddb4e74d033ab2913509669377200320eb3f5faf7e7aaadc98ef80cec23055f0206692bae4663c36241562ba56e3c194c00779a99a0f
 DIST linux-5.15.134.tar.sign 993 BLAKE2B 9830f97282775f5b69d6805c0b4e4a238ea0af86b1b802de349c4f4da72fe0b291fda92f4e0b37dc209c5f911ea170551469fc1598de2b0d94f1deeee49f1af2 SHA512 d55cb238264273c734b5ce06b2468b5cf8593252c32f87d5402fb2a150fc2ab966099387f283c7b831a6851ff3346159d032ed2878d24100f6b9d5b84c9d3f26
 DIST linux-5.15.134.tar.xz 126553976 BLAKE2B 8981578a9493fd522e07cd4560ee8e067cfb573b0fd180d58248523b5185eccba353661d1a06c5fd0fcc1f4e29f3bdb42edbf676023796925a6fe6ea8d44ef39 SHA512 c1b83da73badc76d183fa61ea3fa660ffdc5930184fd3b8dc4c717df5397c0a31cf614b5696a5dfbbc4f49a479a984d6ef71e889e44c0ba0c458b645f36bff38
+DIST linux-5.15.135.tar.sign 993 BLAKE2B a3558f5e466ce41ad38ddf0da970ef87614630dfe90ffbb60cf26ca159bd8e2d4ec09e55225201bc7c541139243607232f65536d4000ac4ca3ea2cf1d3322e3d SHA512 2ef6d6bf7b730402305ced9c5ca403619ac8879e99f2071d3c72ed7ebf0f42ce5a008da7d1acefb195e9c5a157e3d24b8c5e7675e68eee9f8e440ebf2c536b9e
+DIST linux-5.15.135.tar.xz 126555708 BLAKE2B 13579733de339520faafd1e80fa0a8c7e43c7321483f0519de713864b44699f64a439e819c9901e60921973b6db182063517cd4c4ac0aa876c68a7c50cecd967 SHA512 c5993103523ddda31893fe69a1bb6c77d6f20e9cacefc6041453072ac8c0294353ddc4eeaea0464b097d7c41c0a6339a225b3b029da771dce0652c637fd19777
 DIST linux-5.4.257.tar.sign 991 BLAKE2B 459963482330a31f3e104be35f8c99a07232cf7192b211e06349bdf8d67a9de58f6c299dd42cc074710dadec49949660b486bcfc85570584711a95e958e76f03 SHA512 8214a736eb2bcef2e4048a4b78118709c4736adadb471e9eb89f75b3c288320366463ee40aec572678c4a78ae7a4b01be9b003bd7551df390e592661d80bb8b8
 DIST linux-5.4.257.tar.xz 112968420 BLAKE2B 14dcaf7908494fb0bed03faa6c6c771e7c091b702d13adfd222a7b66f435962365b405e1a5c658e528ba830ea5d6e9835ebdfd176d8382d3302d917bb2e27be3 SHA512 2414247166cfbd77323da5e8f0f6bf1ea40850e491ff26b5bd8c3e29abccfe0a56664e16126f8673b3d5b5274a0507dbffd2bad3505e6d9dd2efa3b49eae515e
 DIST linux-6.1.55.tar.sign 989 BLAKE2B d10c453aea7debd92cc2ff13c70d19dfcea71646898199b2fd6c3b9e3a6f901f487c4e0da1fa0bfe76848e68c7897acfb103ca03ca0ace9d51fce9ac32d8b6b3 SHA512 bb351e432efa185a25c1d9cc0728d46edf59a6269192399260e97a9ab5c789896378a1d8194e3051c023233ce6d7e882cca52bd860e265a7b9b1a59a1b3f0006

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.135.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.135.ebuild
new file mode 100644
index 000000000000..09401b1d4561
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.135.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g9
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+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://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	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 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	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
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-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[@]}"
+}