From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1617595-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 146FC158041
	for <garchives@archives.gentoo.org>; Fri,  5 Apr 2024 02:45:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 37EB2E2A28;
	Fri,  5 Apr 2024 02:45:17 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 0D8D0E2A24
	for <gentoo-commits@lists.gentoo.org>; Fri,  5 Apr 2024 02:45:17 +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 2367C343123
	for <gentoo-commits@lists.gentoo.org>; Fri,  5 Apr 2024 02:45:16 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 54E9D1564
	for <gentoo-commits@lists.gentoo.org>; Fri,  5 Apr 2024 02:45:14 +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: <1712285096.83ebe57ff4340d90d4b98ac5be1c007364fb2044.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-6.6.25.ebuild
X-VCS-Directories: sys-kernel/vanilla-kernel/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 83ebe57ff4340d90d4b98ac5be1c007364fb2044
X-VCS-Branch: master
Date: Fri,  5 Apr 2024 02:45:14 +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: 9f1b430d-73f2-42e0-8f91-e96ca77a1888
X-Archives-Hash: d9d11baea51c6a91cac4eb67defade20

commit:     83ebe57ff4340d90d4b98ac5be1c007364fb2044
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  5 01:38:50 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Apr  5 02:44:56 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83ebe57f

sys-kernel/vanilla-kernel: Bump to 6.6.25

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.6.25.ebuild    | 143 +++++++++++++++++++++
 2 files changed, 145 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 62e2dc35cd1b..5b595df5d877 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -55,6 +55,8 @@ DIST linux-6.6.23.tar.sign 989 BLAKE2B 422464346164239d47f84041b76e5443152deebd8
 DIST linux-6.6.23.tar.xz 140149488 BLAKE2B b00e2c084f9d7a4fcda0a9404fd897ca1fc90d660dd1063d699c8ec612c6a35c494ce14c91f458a1f77f2a70ce6612e019e5fc553b571ee669b5070f97841a02 SHA512 63ecf84a6598378a8a49e0711128d4f6ec24dc641a0faa5ffdb8c16f6dfa31e6a208d4259e15fda991ff82ac2ce9db68358cfac1a80ebec4161fe2fc719eda85
 DIST linux-6.6.24.tar.sign 989 BLAKE2B 368cb5156a8f2878deb7c20b7afca7b81b321553be7ea6f7db19aaeabb60d280f2b0b9d6e16c099bb2a8fa2752d30686da2d4856d4a67850df2aafc733de26e0 SHA512 224d4d3c8fca962b0ad2400fd8b81c0fd6b361aa416f8113bd8b9b33cfef108a646c9fc21f76d2abfd188ff7c1d313b4ee024e591acdd5afa3cd5e50ca5472ca
 DIST linux-6.6.24.tar.xz 140178888 BLAKE2B 0f4643c758bb3857396f08b0cc291e1cf7cc7d120fe53791ba8cdaa32f08f20822353e04464551b88e8de64e367de6900da01504e57bc684d47390b51d001285 SHA512 3e77e73ce9b2d108f35aaaef43b4d38c5758382eebe80d33baa75e7337e62d369cad5e37f8fec0faee31efe6b8cbbdd353883d44343f426dcef0056dffb55283
+DIST linux-6.6.25.tar.sign 989 BLAKE2B 60a3dcb318db58b16ffb67304aeac369a4c4b7c5a9596caa491c6a32d89ad0bb4e20d14396fab0efa6394685e4c822de83f0888c71e6e2463e8df060cc99d924 SHA512 c61e1aa376a46f8d7ffdaa1541e3586505f83e56971d122a982196dd8141348274a49c0468c14793c3e97d0b9cb1139636e2493fe209a3986bbddd3a710a2688
+DIST linux-6.6.25.tar.xz 140148856 BLAKE2B d744ef7ea55202d5cb9adad2d7b22bc8be81bb4b5a03fe52e063192557eadf28d5e62612b6a517ec3180441d8fcec3582a53383df644c32bb45f3e969298af56 SHA512 1f1c31a104aa399cd7fd67c0e73c5037e95112e544b00ad70a2a809b52d9d190c303e3f946d67d805125181004fe7de500ff2069dcacad94f6b56bfb8f180f6a
 DIST linux-6.7.10.tar.sign 989 BLAKE2B a9d9072cf6e90ca3e4f71f29b97b827e9f1730fa8fea9ad61a38b31c625db5925135441c9698c8ae58664a2375366447d2ad23b1dfe99f714318da18b3102eb9 SHA512 113b82ec71d1bc181c866100a712f5635d4ffb7e5f0254ad221236dd00d0cdbbfb4078088086182df66b9d0c65c220a76f594ae0051303a7987b5d995e6fb561
 DIST linux-6.7.10.tar.xz 141439484 BLAKE2B 5bded11de8e9e22833eae75540c9a0c7591afee00cac0ef4f6e584ac898bebd41c3b51208f0f88210faa17da99ada488c719c7dba8e0d39610b9a84b9c44fe53 SHA512 7aec6065f63a7278e19811035cbdd9f80392e89dae49673e79fd6aaf5785e6617df720483e445f3a7bfe4acaf8fe97b305d541b4fc583e5e8c1d320c5366e7a9
 DIST linux-6.7.11.tar.sign 989 BLAKE2B 8173704cce39bdb444bf1f4802bb89c6fdbd0d5541154d7f4abcb2f18cdce0d62067bcee2750f30bc82ec68c01668111bef2c4a9b067480deba55b1a964be1e9 SHA512 6112d8a88d13c67623f3570929860d13b6396c8a1156dc1fe66b05640366ca6ee5b226b8217a944ce18d606abd8191b3faaf55d09c5b903eb2e7e6221e34028c

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.25.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.25.ebuild
new file mode 100644
index 000000000000..c3a2f8b2f96a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.25.ebuild
@@ -0,0 +1,143 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.6.12-gentoo
+GENTOO_CONFIG_VER=g11
+
+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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~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=/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
+			;;
+		loong)
+			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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}