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

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

commit:     68cd6cc0fa65a365d9407aa6172308889312fcb3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 19:39:31 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 21:09:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68cd6cc0

sys-kernel/vanilla-kernel: Bump to 6.1.12

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 366840372236..e2ea37bb82ad 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -60,6 +60,8 @@ DIST linux-6.1.10.tar.sign 989 BLAKE2B 0789b7747202146860f8ad39e21f73a6818b6bb90
 DIST linux-6.1.10.tar.xz 134789244 BLAKE2B 926c499eb3260e4358b8112785e7be74062aca54b4d5c21d2729efc81329ae168c461d32f54061d8db05a12cac45b63ca97b74084a8af8138f547c3a2fc2d947 SHA512 7bec1d76ecafd89fdb13bc7c9c69b4f378e41b29aed33c302b235540f40f1d5e6b3c653d2dea83c2d03408e324ffa73ff3dcc7c47c685572719d62bc66a06a1d
 DIST linux-6.1.11.tar.sign 989 BLAKE2B 7921d2bd7c9a10b3911f185a52f45598b206803abcc2d7f91466d9fd7f155cdc0873f648f6799c12ca24387c9a33f1d42f5d9ca132b160b1a44217cdd5c407e4 SHA512 f1209d918d9850a3b6ea43d6809dc59a141a96f4a2764d0b20ca87510155b00ae7ee96aa2ba5b309d753f34ea5da81ff0932163abac6105f569c527b0b24d5ab
 DIST linux-6.1.11.tar.xz 134811904 BLAKE2B 2a1dc1acd63308d72a927f39bc5a9be0bc220673655422c90113300598e754d16021cec85751044114d161a82e476473896bd778180d889d54917ce19d176b4c SHA512 5a2a61fa9f624fc9db70545c0e6f36ba714ce09e627f05bc0147c31d229e6308f6977d298271f38ece6e6099b99e3a25a7762a767c2123b83ec205574207a726
+DIST linux-6.1.12.tar.sign 989 BLAKE2B b55e15679dbf0a29dcd5ece9cb68fb2123132818810fd03492a6d8fc5556814bfc8604b38a25dd0b71acc4ea8f515ce60d36d6e24eb944fa8a48bc851b2c25f3 SHA512 7459ad3491bfcb2dccfde4a929da7b78e842dd34e0230ba49da152891b5157dcd54cf84696988da560cc918852b1d59b76f7184d39e7c444385e20266aed8b05
+DIST linux-6.1.12.tar.xz 134848688 BLAKE2B 1ff8d14fa1544a9d613fe372073e6735cc9444383e598a1c6a546177e1a9516b7f5a0d16aac4fc141fef134ffe14a0e40ab5db4200c11c953fec7f70a7bc9079 SHA512 e870aa9038f0508c50af5329721a5649c3537deb333d18f006bbf6d3c310b64262630eed5682022b7eceece9ef0956d2c110555cc9257591b7a221d063976735
 DIST linux-6.1.6.tar.sign 987 BLAKE2B 3d47959aff69520879ce9f2d63b2e9f3d8c0f33c9a5e9caa98902df1d37115e87627470680250f256f80aaf3a3152d11b42658e0c89ead28ef1b88df2aa77b8d SHA512 8b31481f4e8034f453129f98d8caadedfd771d7a9ba23c2e41c2f932261263183ddf78ceafea3f38c14f441c2c857caad0ab98056da510d78a21d2fc35774ba7
 DIST linux-6.1.6.tar.xz 134782796 BLAKE2B 47fdcc432bd473b3948bc4b618caa329887026b86029dfad055a9d4dd5cccfdd86df48bed7dec7f9f1a037cf955e9c024f368600b5ee8bbb0a46e4620abbde10 SHA512 b162ef2033485796fcdef5613c3a11aa7fb23faa590a1d5391e29af4526dbbad49554d7a7d94f5c5bd7cb9f25b8f73e898684b4bbe9a1e45fc181e7d0fd3e0b2
 DIST linux-6.1.7.tar.sign 987 BLAKE2B 7f7ec4620b38c7435afb5255b1f002de4307463e6be36614a5e2352c6f672255d16288c8760ffc0f9bb015997ee401c89db458bf004c961a7584f99dd87f31a2 SHA512 5dfc368eb50c27a87de1615a1284b353f5cdfa26ef9878c85c4b3643bc11749f8f0ccd337834e58f5f25b1332238c54322799da9adc3ab9118317f3fdaec2aa4

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.12.ebuild
new file mode 100644
index 000000000000..ab59a222a25e
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.12.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=g6
+
+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=${BROOT}/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[@]}"
+}