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

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

commit:     54365734fb132e1de9364dc809e1392bef54b528
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 28 19:36:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 03:06:32 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54365734

sys-kernel/vanilla-kernel: Bump to 6.5.13

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.5.13.ebuild    | 140 +++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 11a7239be655..1d74e1919cf2 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -49,6 +49,8 @@ DIST linux-6.5.11.tar.sign 989 BLAKE2B 97c1306c90f1bc69e925ec51bcac15964b3f0c3ea
 DIST linux-6.5.11.tar.xz 139010916 BLAKE2B 7e3fe230425b7ee403571beff74e4b4e1668aa53c388e2c00b9e5f097d528467f40ae487b61947ad2432c8f64d26690c3996e14cda25e0d43a5c456e50031539 SHA512 bfb086ac52d9895695a5f1d7c35ee6ce560fd935ab99ede7bdc60142f714bf025dbae5e304e5e32acabdc900e940bfb0f7b02494f1fef04e9e8fc5afb9d3066a
 DIST linux-6.5.12.tar.sign 989 BLAKE2B 065af3429b36a59b3e8456f224ad44bd68fd5e1f0c7bfba057c815cca60170b99f5951aeb9058d29f768eb3e0148e9aaaab0b2711081402007a4d5c95e4d513b SHA512 2bfb105d947bfadb9408194139de129542d52957b4af2377e16e8a85cc40a0267fa4705f5ddfe2f890f812ba3e6ac50df8ca7e1721c95c31e3830f4e877a9dc5
 DIST linux-6.5.12.tar.xz 139000228 BLAKE2B 96513d6004defff280943061406fc33be1f052366eedc17176f1f793342e83ae19d60f075ababe63ab806730e5e3cbe13996e2204866ac5b4e8d25daa129a234 SHA512 d68cc173b06eed4b53ced7d1e33d302c1ad895975bb79aad72e85577a9db2e889913e48e922b91a342070b4f9e698b149f00c3c0118d8c24308ddbe0302814cd
+DIST linux-6.5.13.tar.sign 989 BLAKE2B 401d4c0e2de07128a4750ee083754b466a33fa5bbb4e7b805c835d9e547857c7497389ec52180b735c72a28a3dfa96408e7143ee470beaa48ed397ae617ce052 SHA512 1e275664f237f7ea9a0a7b62f313d07b72ebf922edc1e82670ac19beb14f40fd2d3ec8ff5dae5a3160d44b0590d85094537a07a17c3424098ef8fa1150d037da
+DIST linux-6.5.13.tar.xz 139024336 BLAKE2B e21f8d6b28c3d3fdd2ad9b9efd25b8186c68a515b29ea236cbc2f6669777ed2aed3a089df270d78e912cb520848479a99b2561920b1b809ff7ef6c460b843e1a SHA512 bf309b8f174de89169c6190fc21e1b41f094939d58b426ed7d5d44821122648f143f61b64778b2423fc4f4452fcef9628e4f8b16feb3f74053bfb69b231a40e6
 DIST linux-6.6.1.tar.sign 987 BLAKE2B a4eab221bd57e6d5e4508e32c9d6f8939f1b00f935b4c31951d727033de3d1385ee159540f55fb44d17dde0f700fcd77f9bb20adcaf334fa81ee4d159f1a6c9f SHA512 8815f088b96980d12a8631b5e38d1078354f78295bdab0015d4aea62402111124256c2839624d60f8aa402c5e2d8dd566b749918f2399fc7af39515962774d28
 DIST linux-6.6.1.tar.xz 140010660 BLAKE2B 3bb35ba0386b00aa76dfd073e87b0d5a319d3116a80c39b11a3acd1219bc7d8b3809c1def24a3c4f52abc60f70c170a2f80d80c6b54459eec016c5ddc404c6fc SHA512 d0aa5c3e686089c21e4a155cda1c46215c877f82dd15f7e4e7ba8a4a8c161baccc110488262e139507ff9e625e0118ade888f3e54ac5d75b9acfa2163932dcc7
 DIST linux-6.6.2.tar.sign 987 BLAKE2B ab95e7cb07242a79f94183fa3ac00414892114ff95bda73a7186650664957438341591417c90f8454d8bb108c0330cd5ec6d2d7dab06d04ed250140fb7774523 SHA512 fff085c1d9a978a311c9bd6b110a141987e877cb760e7abab8e2ad9d080d1b9792b4fa965542d9a15c4d4674f83a8c3eb06ce8b94064abe72df7e05bb1ad9631

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.5.13.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.5.13.ebuild
new file mode 100644
index 000000000000..c518ad25e7c2
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.5.13.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 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.5.8-gentoo
+GENTOO_CONFIG_VER=g10
+
+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 ~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
+			;;
+		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[@]}"
+}