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

["Michał Górny" <mgorny@gentoo.org>]

commit:     13511d02c02125c12af16d9a75fefcd8515edf5f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 17:33:20 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 21:11:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13511d02

sys-kernel/vanilla-kernel: Bump to 6.6.11

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 22914f7ef86d..2257f4386679 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -34,5 +34,7 @@ DIST linux-6.1.72.tar.sign 989 BLAKE2B ae4fc78466ad35ec01110e7519612ccb5db6249a9
 DIST linux-6.1.72.tar.xz 135059944 BLAKE2B 14c55436d9e676c6ace598c54c353c3a28783c5984acc45e9668fe0da1ebe17c7f7a05f12b7fe2eb439b358423da4753138c06c1ba041bed78e4d3786128042b SHA512 b7ca2baef22dee353bd27584148a03e11d381a552288bb616252dc09186dc351177348a2bf564b555f6ff2cb790580f82f2a3734c7da3cf3ce6d39e6ac35cc41
 DIST linux-6.6.10.tar.sign 989 BLAKE2B dd8064c58383efa9227acd2b8ebdecaaf30725e7df8a33810df07a7290d00da282a9584f78fef585e7bcb8f6922d550b99579f59863061aeeac5d5c87f2cce2a SHA512 ec5ccfce8e6bcb5fa16d1bc30f4bfc9d15ed4b88ea455d16f5b043e764e2213c1913288a8226c9fdacba835e1cf164c589f04f0b76d38a8347bdcaea0d4c9fa3
 DIST linux-6.6.10.tar.xz 140042308 BLAKE2B c71e651438216e86e436af032cb529c029351b72b460568bd75858f835212360d646bae27caeb3140a4234f4155553aceec3aa94d761e3a634be7c164eee86a4 SHA512 5f2de63021a30e9507713ca98515fa1de15f4958ba115beb2e2a4cf331d00f7e6520ac938f6a4732a68fa21da8c0e142b5db1c9be4f604a14bddc20ea596dc8b
+DIST linux-6.6.11.tar.sign 989 BLAKE2B 9f711359eeebe63e6cbb53014d1d29d4e3f9b7a6716671619e81631dfc81a17ff933888f08a7120bc872c3646a9eb31ebf35988e999e2256c07ba3c9aa2efa1b SHA512 38052affaecd3933d2e53aefe00d51261a49d2dcb1c03d7f9e0fba0065632ef0b74c07741b6886cf00df3f564c68d544ee87bfd3281c344225b97bdbbc18e6ff
+DIST linux-6.6.11.tar.xz 140066712 BLAKE2B 2a2ad3fd93fdc099a3900918faaf6d7c3abae686694f90980586b7dba4ddd81a9312a7e0c684ddea37835395e6f83e203934988d83982ccc4308631d25d24b07 SHA512 587a9b12b8327648815e6258a067dfe7f92cd26de56bef7611e8fba18fcae2b19eada16341f26ce6ad280c9d2971c74ae3d6dfb20ced5cd2d4781b3cb2d4c6d7
 DIST linux-6.6.9.tar.sign 987 BLAKE2B 947a3f09c87d9d02a8f8b5330d25cddc6f71ab501d2f52804ca0fa5394cdd5df27e413a17c1af5eba09afd0494328c122e76fec6a7792ba6c889c6d8ba7ab27a SHA512 e25e0b8cae76be052711c3113a7acfc0ecfd7e735fb0a3c7716ac8fdac689ff3f0ac51c6ea0677f3e585561f9c777dfb12b397ce25a323df7728b3352596f74c
 DIST linux-6.6.9.tar.xz 140052968 BLAKE2B c7deb1221716144b636018ee2936abe6397e15204c9bdb4cb5806f6bd303cd5d3f953a7da5865c4f211b866e4dfec4cd347c0a1a0a675f18b1a4ad197b099cec SHA512 a6a9608b158408bb55737505058ee8d64a901af38230bf31d2eee007c3530503154067e5d37c1f86c36b60ba5dc24771047c6e91de24ed6a256c2f9ecbb9c2dc

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