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

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

commit:     ecc8d924523bf6fe7f08c0d99a71aae25bbd2bb2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 11:31:33 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 14:47:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecc8d924

sys-kernel/vanilla-kernel: Bump to 6.1.106

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index f1c33f644392..718e065424d5 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -42,6 +42,8 @@ DIST linux-6.1.104.tar.sign 991 BLAKE2B fb727b2dba92f5b1aafd4af795a79493f550c2c8
 DIST linux-6.1.104.tar.xz 135163604 BLAKE2B b32e902873f3a502c8a3dd889503015072957381debbb76c1f1334f41b507ad323d3d42d2184457fdbee1684b185a15918333cc40469f39b9ec014fcae821378 SHA512 c2dd7b34315081dc27772eb7b97581df2702894f075f72273e10277af78376c977335c7634120722b1b8b8808049aeb657392645ce71962aea15d41ceff5f14f
 DIST linux-6.1.105.tar.sign 991 BLAKE2B 117283d87d948dda81d17f3363c269f8181f9dff726e224feb54142ebc476e78d2947fb3ad20dd9925d3bba3cc608560e0b32f5f7470cc40ddec9392ec4628a4 SHA512 28de04b622b3f2bac362d74cf724e7f06d95a6511a3f25522aacdbe4c9a784e5ee5d6ab82f52224b1972f1fff6e2953654c315d87634222c73e1d301e11d8939
 DIST linux-6.1.105.tar.xz 135212116 BLAKE2B f5a0dcd7dfbc940aaeda60949a136b099ef1343f7eb619e48344c7ba85297fa4377ba7bf80736ee55da1f2cb7a29baf1c65d6fac9c0b12a991f9722584217be6 SHA512 1cedee397a66a7f7d08cd89c5945a7282f7fc6e318a01c4cb1f25919845d98194edfdd0ff1de5685ff9dc9964c07d503f739621bf1025b890cd0276cb1063109
+DIST linux-6.1.106.tar.sign 991 BLAKE2B d74c3e31e683255ea4f222ccffa62c755e529aecefcf8a60eb2b3b844f1e753c3ceee1b8f1b0728e1d92d78031bcf6ea6d8829d8c30decdb9eaf36b3c51b1d91 SHA512 225eb6e616f2f1d496c294ae09130007d786b2ad7e4ac40b7e0fd8bb36190cfe774d9d7ea0827bb7303fc584a3289935656297dbc0bff59312b1f5374309cfb6
+DIST linux-6.1.106.tar.xz 135145020 BLAKE2B bcd4bce2bf35411fc1e13afa5c6935ee5cfbb13e4395fa7215d34b6f964d433c54f1b5a1022ee57bb439593b5196a9a4733f79d5590b05defda60b62845e4eef SHA512 0ca73f9ac725dee2ebf7aece9ea0e5bb890ed7fa836eea4d1fa97417b2a2735dd5dbf9a5970683ca09f6bb469aa03bb9ead7927bd4c2d2476190be5f2f3118f9
 DIST linux-6.10.2.tar.sign 989 BLAKE2B a49737993f3a525dc2963bf11bc96b7396ea753a0dc60d8d9cd53150706d027c6eafea5cb3edc615963fce0cadc56d0431668b20d1ac12192264e34225b0084e SHA512 9fe19c7dfd8ee31e7561cf21c03422c05f73223706631a5ee1cdcb02dc417d11ef0374b9ea22fd263cb3f6e01fa2a63782fb6f54d722a624a5e3320545196576
 DIST linux-6.10.2.tar.xz 145157612 BLAKE2B ab1d2e79a1bb8a9b78ab5b1af93db7ef356cb5e14bba1121bbd3ae06b9589c8bfc32bab373acdd0ecf965ac132130e7eb34e70b35a9df1bd85b49dab97e2c02a SHA512 1c121e3c9c8402ec46581b38c736630d25297dc3e981cb69d47b95e2cd3204cd93c6c15c02b81fc53d62c49ded462ab6a0bb4d94b506ec0f9c366e47a1c92606
 DIST linux-6.10.3.tar.sign 989 BLAKE2B 282a13b4d56e95df1432ea82294380dd019fe9faedd799201b6d43611b20cdaf673dfef4db77bd533106f44c4cc07eb293bc489ac7bce48f9a8da84cc47e7df0 SHA512 2fa43f6294818a12a88d6f018237c63968ded3f1dfa88be45ae0f7fb4cf456208f2027a7341bd4378cea0fec04ea0a3d80a4f8f89e7b3c1f3ecd0f0b88aff588

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.106.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.106.ebuild
new file mode 100644
index 000000000000..7dcd0d3528a5
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.106.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2024 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
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.102-gentoo
+GENTOO_CONFIG_VER=g13
+
+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
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}