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

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

commit:     83875abd6cf5a14711f977cdea6cbc9d0c0eda4c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 12 13:16:31 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 18:20:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83875abd

sys-kernel/vanilla-kernel: Bump to 6.1.110

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.1.110.ebuild   | 134 +++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 7784c1b5faf6..248b7450fe03 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -36,6 +36,8 @@ DIST linux-6.1.108.tar.sign 991 BLAKE2B 70c218f764b2bbab0e7f690451a73c7a025b381a
 DIST linux-6.1.108.tar.xz 135203104 BLAKE2B f86cb3ca34cea63c1fdc97a22c800e092bed78175486c4e7a95b310031e044021791f3e1c4d693ce3b7bd7be039ea192b9b978c153c5796474b0fa4d5ee8d7e1 SHA512 6934d134f1a471a313ee5d7392fadeee43d6352d13e7941af9a089d532e8478ded57e9a51691cc9e4f0348554bf7a895812b0b90b5701fbf70f730394b7e3e51
 DIST linux-6.1.109.tar.sign 991 BLAKE2B a47f2eb60b86a73af2a7edf256288209702f195f0aacd571d58a09918a7b8dc42da344147d2cb9abd2c25c7b2151f653a4bee5945104bff258ea6c5c2f5b09e4 SHA512 f0c6b33621f0051917e6cef1d35d3a727a179474817df2c4050fff9211dba3203cd95c0019797028cd71133f15ebc53fd2833128628be3695ba28b8e0ddd535f
 DIST linux-6.1.109.tar.xz 135193224 BLAKE2B 2ab7151c193bcdfe0664f94040675faec1cefcb44df524074c9b06eeee1184fb07891c1d6bbfbe8ca53b8d52f332a17a14854602ef046897de692eaceef8e5c6 SHA512 a435b89320e8af19532bbd40c30c5c1e1b6f796f062a015f3c1bcf7a30b00eba4c51a568078c6dac9fc60040153305237910e6f9d701b9a7bf86475bd0a61dfc
+DIST linux-6.1.110.tar.sign 991 BLAKE2B c93c23243b3f9df9da66cd9c3d1c65d6cc09212b53c3a19d4a565ea9566d2831938f3aa6c25b88fe7e85268aa0bcac8bdd5cfac472d610b95aaec2ee2b39181f SHA512 9fb593858e2af689e2e1d5171e70f2b707a4bc77ae721e6950115877b084c49dee340e77f12bf40761793a2cde306d513ca2e151e3c159e55906e129d458b8cd
+DIST linux-6.1.110.tar.xz 135196940 BLAKE2B a4d78c86f74c0684a3ec53056241900a0fec06862fa47b963085ed7e797a0c5c8dc8d9b5e6d83d5da412e8ae8f820bcbc2f83c2a049ceed81e545fb0733ad582 SHA512 48c9515d32bbba034e3a477554bac627f131533a9b47ec55c8ded5f464c7e57f0f27c1f34ec92403792680d1019baa4472b2c55892c5e1d8edfd04cf7bd79eb4
 DIST linux-6.10.10.tar.sign 991 BLAKE2B f626f460b08be2045dc47c33b50766e20b63c4d6e4dc842214584cb41b9b20c8db6ca4bfa696fd906b7ba6a9c4d8a1c67118207665c635e3639cb7c9028feb79 SHA512 807e761ddb21f7445dca7c34cea33113093a5e303d0b5069da4c8de93e3443abb62ec6b9f7e9806a3a2d2dc57fa47861940cd03cebe5e08d41d6a4ffeaa46c73
 DIST linux-6.10.10.tar.xz 145139280 BLAKE2B 8a15910089d080886046b1fd8d57ef28ce872bf428e67ccbc9d5ca92da794d6dee7ab83cc914a499b40962e2990c3b1e5b11ae7d12c1eff7bec548c9a67df03a SHA512 affaa3690150ca13f0ee14f91f0e09a5ad3340a7ea6404e34286dfb4bd4fdfe12fcac47e83da7878681bf28a8a8b78e0b315e1563408885dbb07aac5bd2e4dce
 DIST linux-6.10.6.tar.sign 989 BLAKE2B e8ab99394db3d9c5da9177f64c6c6e8ab74b5b62b7b251964e2b9a0a8ecfbf6a8339ae8b2e2b9ea75350d08b5fa8f00e1bafebaa35c57f52545d415aef60b0f1 SHA512 bd5555d4c1f02277087615423f1bd951cf9cb18f18b9f65775c70810f0698c8df45a1b789f26b33b5e0f7b8183a6a6ac2aedd9154b1b7eece4742156d6d6150f

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.110.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.110.ebuild
new file mode 100644
index 000000000000..857634f8cd43
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.110.ebuild
@@ -0,0 +1,134 @@
+# 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
+		arm | hppa)
+			> .config || die
+		;;
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		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[@]}"
+}