From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1549929-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 CAB4815800A
	for <garchives@archives.gentoo.org>; Sun, 27 Aug 2023 02:55:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id AF3C92BC208;
	Sun, 27 Aug 2023 02:55:04 +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) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 178D92BC208
	for <gentoo-commits@lists.gentoo.org>; Sun, 27 Aug 2023 02:55:04 +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) server-digest SHA256)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 111A2335C9F
	for <gentoo-commits@lists.gentoo.org>; Sun, 27 Aug 2023 02:55:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 2F72F10AF
	for <gentoo-commits@lists.gentoo.org>; Sun, 27 Aug 2023 02:55:01 +0000 (UTC)
From: "Michał Górny" <mgorny@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, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1693104894.73c7cfa6922c74729efbec79a2f077d28ce1577c.mgorny@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.128.ebuild
X-VCS-Directories: sys-kernel/vanilla-kernel/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 73c7cfa6922c74729efbec79a2f077d28ce1577c
X-VCS-Branch: master
Date: Sun, 27 Aug 2023 02:55:01 +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: 7f048b53-d4b4-4afb-b3f6-a2ae7fe47b1a
X-Archives-Hash: 65fa24432cdcfd1f79e11c8495c19cfc

commit:     73c7cfa6922c74729efbec79a2f077d28ce1577c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 17:16:58 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 02:54:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73c7cfa6

sys-kernel/vanilla-kernel: Bump to 5.15.128

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 95197b06fa1a..50da987e2345 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -28,6 +28,8 @@ DIST linux-5.10.191.tar.sign 993 BLAKE2B e1111d38fdcb966d68938bcd63d04fc2d40f43e
 DIST linux-5.10.191.tar.xz 120603864 BLAKE2B 721f760a73fc2e429272e95b288d7e0c6f95cbd6ae3d87384ec534b2a294b52f8c980170dd5c6f22955225dd6aa35797a2702a17b2a1c9438d0c134d6cf003f9 SHA512 d80b71f27bfb70b574d944c3d1cc6ec31a42bf9764967eeaaeeab4e40248efed4e2269012d6d8f9c598a3573e6a996833c35499abe60d50dab82c3a73721984d
 DIST linux-5.15.127.tar.sign 993 BLAKE2B 84310652ba933bb13ff2b0442eaedfcc56d94e0adceef77009abd7bdc2d614d1c61c83041b57adb62ac6591e7e127cb65f2557a29e6c89a616b84f07e89611ab SHA512 b34247621ce40eb2131b1c5c320d0ffe706010439b81238a1d28c9bddee69c0ca7575f90c7df86a92af4a6da520f42624e5cc39462eb0abc6de74a006d08af9e
 DIST linux-5.15.127.tar.xz 126542840 BLAKE2B 3c5f6ec2b917099deff2bafc2c144f06ddf2274f02ccee386cbde34323b7b7dc01b82f5914b0165c2e9dad48a13f4fbd22aedb25e7a07533be3becf90e7b7a9e SHA512 5245a87e10c986657d42dc78d0789905c1e61cc0af5ef619f0ed73788b0192375a8996a340e693604305cfd15ba202023fa4f4575ad4a7a5a38edf73aac892cc
+DIST linux-5.15.128.tar.sign 993 BLAKE2B 29542245fc2dbda9c586685c3248ab2563819c58c130afc3d54e579d13d094591f7b586308cb5564b81ecb968cb839863babc917f88f1feda785adbe8c8c870f SHA512 ee6c022bed702db161a3cd05bf5688a9ddbcd175dd426ba3f6ad0261508ad15b11ce584a1d1d97f8828c800b70c4583085cfdf7cd21a5b07a08f2e95ee1ed791
+DIST linux-5.15.128.tar.xz 126528336 BLAKE2B b594e8a2c02baa6bcf8df7b574a998f80c6926ee2b6dcc539a5b1316cd9626021c99cd17fce9f39fd123d11f2d3c2c95e4a6748e0d183d7d537235929d8ea3a2 SHA512 5a9ef31d0cb44964af520fc8837122a0217b848f50168be3706d208de385298970fb6ca39c67d104ce1b5c739685470b05f2079e4578898feb0678f957f6e083
 DIST linux-5.4.254.tar.sign 991 BLAKE2B 4f5a5e4ea2c930a62e3743c4f10d8e9999530a106134c61635f2f1fd627e6cb375a6d21a2f66f0bc02bc99e419cb0a4db3499af090f8787f523e009789205007 SHA512 71b4b3777c238034d5624be9ad79f40634d2e861ae2665d2aee1701cc3d5a09e6a5d1a114642d0d01a97cf1556022a658fc3deef7c59e93ab9b41c829018bfc5
 DIST linux-5.4.254.tar.xz 112963588 BLAKE2B e0e395636643c49063cc1fbb04e06476ecf17471818f909559dc8f77fa5de69b8774ab8d6b16b4a2a57f32a7bf90126d381360fdd52069fc435090cde07769f8 SHA512 ccd82451c72eef0a0f35eb8c0e296e3018573ab99b602cce0a107bf2514bccf93113ea86d16205cb1b6a9f7c0198d411a250b215aed3cb0b4be6fcd27b878039
 DIST linux-6.1.46.tar.sign 989 BLAKE2B 95f91ecbbad15ec67a2723799419e295485cf1fbfb7dca7dc12c8433835df4ce2efe92c7f24f58a890e2c2311eaa7e52d71c9df442944edc9893dff05c780571 SHA512 bc2b89126155d9bcbe0275a221bb88a1bb1d615b5ec036ee964d664af0cac8d15b3511265aebc8910f0174deb30547cc23e836efc0db061d0e2c841b87ff7464

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