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

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

commit:     52ef75c9f3b4049ead16a5c692c6f584a72e31cd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 20:23:24 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 02:15:17 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52ef75c9

sys-kernel/vanilla-kernel: Bump to 6.1.68

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 1384ac63cdd2..feabc33f3e2d 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -24,6 +24,8 @@ DIST linux-6.1.66.tar.sign 989 BLAKE2B 0ccb0dd6fb51c91e4bf60539dbf03bd3ef4ae563a
 DIST linux-6.1.66.tar.xz 135048000 BLAKE2B 012cbd2ce29a2cc37db2b83380acf5e1b99343e07fa712c8243b5680fe043134d90f3c2abaaeece34f063bf5839977e8b5d88a7835091bd6a9740cd459b003a4 SHA512 60470e5068782ff05c8017e72e2670ee864d6b8cf1d9f83a351664e5baf75e74498b2dd0a186c136bc8940ae937f8044d68322d0626437f821d87efe0001709c
 DIST linux-6.1.67.tar.sign 989 BLAKE2B 49ccb2381c3612e2ea982b029fe52d9decb068f9c3ff80fd323d90c829adb49d1b37fde338fa423a4c214b9769f30c9a4924c314244b8917502eebeb6cac8218 SHA512 1bc91b3edda634219272175992561472496e7cd2df55bfa4335bf485e4d86d57b8f89fd0cc0b2b02f664b95bd79f76208ba465a9a54ceb49a0c8335b94b3e949
 DIST linux-6.1.67.tar.xz 135053964 BLAKE2B 8c21a626545b20d173d21373358a35399531ba7b53ffadf635059a2ccbee669b04dbbc6d30a3e854ce1ff14445dc06d00518d585bf5e044e6dfc3d06095a997d SHA512 adbe4b5dc952eba848ce446547b07fa0eb1127f98051d4504aa2a533520cf96f6b135b2087b89e4a8b0eaf8172cf6f31fe49cca4cc594d75762ffebde62c53cb
+DIST linux-6.1.68.tar.sign 989 BLAKE2B 646b5742ce3e7225e3f1a8f436a21aa4975c3d8827f928db6fc1ca3e609dea865471b1c84102ef3f6f38698f5f93e25e00a154d62358857670dcb63fd95f0bd6 SHA512 6a5969de6f305766904b54629137549a70a4124d1f2eec880f4d5a4baa71709024d0124387de22b272aaf98f0e93ccde1f9ffa1df010a168b4ae761ab970be0e
+DIST linux-6.1.68.tar.xz 135037496 BLAKE2B 35aaad87cf0fc957b2e9123e13c9971bfb5f04eeaecf4ff04d1fa3484556f12ed2dedc8beb8bf4d859f6f8dfab691cea7c46bffb2490e6de788933a91262d5e4 SHA512 249b3272af9bf6f8f2dc65859dd6e7cb150ac0521a52d482fc854db2d5268d559c40c64a413a9baa4870cfaff823c5fd1762e22370ee63ce10b2abe2a4bd2c33
 DIST linux-6.6.5.tar.sign 987 BLAKE2B 88ce36e009471c9dc796f2ed36012a7e76d2d9e6e4f5a62b996019a131b37ac14916d949e964a1dd4824e6daed562011b87764f996bd756deba87b7a7ce1fafe SHA512 2cdb44bac311b64138170158e49157dab631b21fe7b938770ed92f096dc6d4c9ef68e6003f3d84b1ee62903e88c3dfc28b734d97f60bbca0e83385b2e27d8d01
 DIST linux-6.6.5.tar.xz 140039516 BLAKE2B 9d66d720f2f037cfd480835ab38807fe5aabcff09bd210c5cb0dc80bd3e1182434df9f04a286df4e8cbc508ac984ecba12d2098a3296e3aac60afad94c085876 SHA512 364df8c838a17742c67c4a919a4e8dbed2212bb5658f63d32d8c94ab765bf0b4e33ec524c0988427edf3d2bdfc7c04d1929024206131e26e04ce19d61ef6a89e
 DIST linux-6.6.6.tar.sign 987 BLAKE2B 56f75ef6ce549a3e35f9f774d0d9819e8755237851743bfa53277f6f3f3fc1d9753c27c86466a4f2b8abbd3a8d7c3be7a3007a61d2f47fc39644b913f6a89a0d SHA512 97e185e532d49a531a143596720c062b2e73acb17f1fde0ca96be5465b07a2286092c3084e00c0bfeec118413331342e88ad5c2a5ff220b0ea79af008182d82d

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.68.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.68.ebuild
new file mode 100644
index 000000000000..50ecf4f88f6e
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.68.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 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.7-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 ~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[@]}"
+}