gentoo auto-resync : 22:12:2022 - 07:56:26

2 files changed, 137 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 638bb95c7a72..8244d2859811 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -36,6 +36,8 @@ DIST linux-6.0.13.tar.sign 989 BLAKE2B 381ccfa7cb46511df7b42ca2fd4f97dc209b91beb
 DIST linux-6.0.13.tar.xz 133926352 BLAKE2B b37026b1cab3079507ff80de9a32c753552689d30fb13898b9b7dd419dfb73785259976ad13fc08b5085b71ca94b84f40b5caf236b13b435c37a3736d64130da SHA512 6a1287077c7078e9a1bed5401e2eec7dc68cd0a278f6fbe2041a3e92fe005d2a21d251e7daade68ddaa7b303615ea40f0cb7aa702c1535327f4220088b95994d
 DIST linux-6.0.14.tar.sign 989 BLAKE2B 1e1898dbc31fe96eaf0c58d62a07115a28522e7b5fde9510f138ec0e7873f25bc84bd097e529d40bdf4eb908916747570e2b575118de3930cc5092656e916cb3 SHA512 03a67b2195a42edc818861b66e5ad5ff37fbe6056047e5695cd02c83e4a0ba270fa2a13b4994a6034c0e69553399fd570c69f4817b75f10fcde75f17aafdc143
 DIST linux-6.0.14.tar.xz 133938728 BLAKE2B 95adb29df31e257d1bbc0d01b7e908e08a1ab6643fa0e5a185e728629da86a88e6f8d1269f77bc64206dda3d4af10dfb186366c40e108566c87cf43fd05a3555 SHA512 4a409d18bb5c1bf0807a1670ae9a72984fc7df6b0c0fb3289b88eaf6a7d8456fc8481f8e9f4688fa9d27c4a1d85df61323e2bd5b1e534a3b64940aa9eb0dde80
+DIST linux-6.0.15.tar.sign 989 BLAKE2B 214ba7092718635f5dd39f2374615854c276e450ee81b8811b2e5a9dcff300eb38c4acbda4ebc1dcc0d7a2866e4a6bea8c2e5280309428164df8294bc616f8b3 SHA512 f39bebbb1d60ab7457e861ac7005a5cb975cb53519d777ff66119d2ca087f9a654cf1f11ecb4f7b58af6da574c698dccc69c9daa99ded277da178593c5fdaf76
+DIST linux-6.0.15.tar.xz 133929584 BLAKE2B 2d01f57c447ad7eecaa77a9b245ab1a79a35bdcede9d0b234dafd96d383a14a878868a6872d9c24cbc1a6a1332ccdeb15b492724063423ee833ccc56f9c5348d SHA512 1db7e086aaceabf12749728f100842c68886158202250cd9a582083488ee7073bc925f933f44b5c70a8f8c5bea48c73462da9ba979ef696005f16031d11312f6
 EBUILD vanilla-kernel-5.10.159.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7617ee5c663b367b096292bd58e9b66905d1d40a8325714668ba3e04bf1d21d809950198aefab7b63b152c685f08b9bc497f SHA512 4bffc17a9a76ce0fd938ddd272587a294719262af38165686bafaa48a7a543068817b0b5136365e512a0f141bad06d545ded287786afb89df3bcd253280f30ff
 EBUILD vanilla-kernel-5.10.160.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7617ee5c663b367b096292bd58e9b66905d1d40a8325714668ba3e04bf1d21d809950198aefab7b63b152c685f08b9bc497f SHA512 4bffc17a9a76ce0fd938ddd272587a294719262af38165686bafaa48a7a543068817b0b5136365e512a0f141bad06d545ded287786afb89df3bcd253280f30ff
 EBUILD vanilla-kernel-5.10.9999.ebuild 3234 BLAKE2B d1ae98cbcc1aa58bb90e787f61a60a3a1f5936fc7667d2ccf9d441c1445bedeec835e40609c28b586e199adb2ea75b68b01b1422d712eeef6d8129c516afa935 SHA512 304afe6d49b898671901bf8d8ebb380a4adb774d3263ddb19b8797d97708badb281e5cff02ef95392057be52e13004902d59fe5d91f5a2d7db0a734ec91a321b
@@ -48,4 +50,5 @@ EBUILD vanilla-kernel-5.4.228.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8
 EBUILD vanilla-kernel-5.4.9999.ebuild 2574 BLAKE2B 6a8f6619bc9a88b8076a80ad6158b8996544b2608a78571107ba0b7be09b5f35add48d99d54ab6a2232f110156df1cbf6f325da036be23c793b4f84bc0f995e5 SHA512 c95bf760e931180ca9cf09c91e7fe05039f2aa2d743ddc8aa3e14d765928d40fcea628754e0177cc66df3fddc0fa2fed54d962e8682c5aaa7fa416f0fe3ac323
 EBUILD vanilla-kernel-6.0.13.ebuild 3833 BLAKE2B 7c090455c5ac0a6b565f9cab974114e41bca494d7d95bdc18c2579d24253cd15919173dc25c53de1f03f7165cce7596e8c615d5244e4f5881f63557900b765be SHA512 b4e7c79adff4cae9d2a515fa71f2f59cbf40eda3ce5c1f71e0ab3235a84baad434d531bd1bebaf853ffcf9ad3709046f477254849e1e310eb937be86d29cdd1f
 EBUILD vanilla-kernel-6.0.14.ebuild 3833 BLAKE2B 7c090455c5ac0a6b565f9cab974114e41bca494d7d95bdc18c2579d24253cd15919173dc25c53de1f03f7165cce7596e8c615d5244e4f5881f63557900b765be SHA512 b4e7c79adff4cae9d2a515fa71f2f59cbf40eda3ce5c1f71e0ab3235a84baad434d531bd1bebaf853ffcf9ad3709046f477254849e1e310eb937be86d29cdd1f
+EBUILD vanilla-kernel-6.0.15.ebuild 3833 BLAKE2B 7c090455c5ac0a6b565f9cab974114e41bca494d7d95bdc18c2579d24253cd15919173dc25c53de1f03f7165cce7596e8c615d5244e4f5881f63557900b765be SHA512 b4e7c79adff4cae9d2a515fa71f2f59cbf40eda3ce5c1f71e0ab3235a84baad434d531bd1bebaf853ffcf9ad3709046f477254849e1e310eb937be86d29cdd1f
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.15.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.15.ebuild
new file mode 100644
index 000000000000..d2f94947b12d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.15.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 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.0.8-gentoo
+GENTOO_CONFIG_VER=g3
+
+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[@]}"
+}