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

[Michał Górny]

commit:     8888b8ec9628e906a4c1ccff8a319220e1fe3761
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 17:41:08 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 20:47:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8888b8ec

sys-kernel/vanilla-kernel: Bump to 5.19.6

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 85a278fa4f7e..0138d8bb24f9 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -32,5 +32,7 @@ DIST linux-5.18.19.tar.sign 991 BLAKE2B e4bff93a2fb9c06613f0aefb27e159e9ae0526c2
 DIST linux-5.18.19.tar.xz 129890668 BLAKE2B c02d07137bb30b429ea3c822efa1a995271cc7c07d7ea8df460e9024f66ba372d1e1fc30d80fe7f7dbab77f0c9a3821aeb2b777d2b0de161c94b46a18fb25184 SHA512 a80445c6195a9cb7922b47e0874ad1f495ecb76a28edb4b7026cb2790154d60042521a182785a2ccb83200c9ee37f38c97bd4566dcf74aa9f961c75dcc1dfa65
 DIST linux-5.19.4.tar.sign 989 BLAKE2B ba3eaa69dc251491815722f35100e17ac5920d02e15bac9a5cc7151a36b3f0d6a0fd42c17854940496e3479c2c0a8d66f799b51ec81b6a517bf5a639fa9913bf SHA512 35b17075b3d620666f199ec72b3b4389e5d5f31380b80aa58036840ab9e9ecc403ccd5169f2a75642563900c97bc253b483f74ab4891236131fa78169f33c47d
 DIST linux-5.19.4.tar.xz 131611920 BLAKE2B c6c13b1b6abc8e19fc8d668b751fff395b745b3a82aecb0b95f4fcfe98bd68d8958e438d57741b18a777008ac5296b08df3418d081e807c4e8d87185b0a8a90f SHA512 1d03f5b1ecb61adb52fcb2222b4d21548ca65e9fc0dc768d7b63c984644c9998bebab78cff4ec37af0fa15e4add84bb3fbd6c1e69d4aeac39dd0c59afa9f5e62
+DIST linux-5.19.6.tar.sign 989 BLAKE2B af1848224de41fea363df3d6ef1a3d923d242c232e384f960cd813df1f733f4f59bebf61d932455f3742c8278170ba2ed7eb2fd3600cb9636082bb50f8408020 SHA512 29f22d3d55718a8aecac6bf7caf889f20e01cbcddb5d3c2047ae701d90505db045d6414857d61caef8e6a31cd8ce9bd5016e18405c6eefacbeefeeecc7ca22dd
+DIST linux-5.19.6.tar.xz 131649076 BLAKE2B dd6fba4d56d26923310426589b28c83f699a62b676a76257e0ac49bc85d30ffb24f7a66a20108dfc5bdaa1454fb0ece3f28c483b246d3778cff220de527ec4aa SHA512 b39707864c7cdc4290fc6f4ea545da1b6029eeea54d2bec88affdac9b0187e28ebbf99badbb974d5cf4ad854fbbecb98d7385d5bb6efc74e52a7d8dca146e82b
 DIST linux-5.4.211.tar.sign 991 BLAKE2B b8a72fc09b476ff8539eb9208b7164864822b501ca4b0478a7c32d3b6add1a37641905ff15e4043c897f734033eb8b3dfe1ee981c7f7e7664ca3b9f083083081 SHA512 50e50b7d028877b07fed0d39045d20da36017e5fb57fadd1b0554896e416446c20d5a30d0fcea25fe57f13869c8647029b0ae5b12bd1917eb6150c130069b55f
 DIST linux-5.4.211.tar.xz 112946912 BLAKE2B fd34cf8643768dad40e96ff12058bbfa6240d456b0f0d58a67d0e40c527b91c3571783ef0abdb2e36d6c6314cd1782e032b64cb1a5c8b7aa1d586e191df024ea SHA512 7da542bc6ae6f46c5ff235c09f2656c29465a71edf2a83f0a7ebc57c6eb14a0f7ef4bd0c25614f0b4e191f80e617517341e8b1f14bb6bdccb003beaaf888cb2d

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.19.6.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.19.6.ebuild
new file mode 100644
index 000000000000..7d4d9d893827
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.19.6.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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=5.19.3-gentoo
+GENTOO_CONFIG_VER=g2
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="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[@]}"
+}