gentoo auto-resync : 22:07:2022 - 20:47:41

2 files changed, 137 insertions, 0 deletions

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 59110c1bdd6d..750ac43035ef 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -41,6 +41,8 @@ DIST linux-5.18.11.tar.sign 991 BLAKE2B 9132a1d3cd6c72930518136df59dbb0a88831921
 DIST linux-5.18.11.tar.xz 129829072 BLAKE2B c13c12fee97349ff8a95219942857c83c4767f4dbca0286c2b2f366a323d05c1967e7557a9cbb6fe39045fcda48aeadb6dfee97a1340928b09873f35272f6a45 SHA512 a60109ba386825cba6184942281c2e055d1dd836408138e7052feb385b15be00d8ed27784754ded2ba2210045f828f3c14a8c6e1e6836e7c1d6119e598027116
 DIST linux-5.18.12.tar.sign 991 BLAKE2B 8fcdbdd14f841aa43856b2b9f52714411ca7eab5635301614136a93e1c3c1828a54f44fa2368eb9acb4594d73e30ca6732aca2eb853a9886fe2862ccc82c6df0 SHA512 165491156d9e18788bff4a3bcaeeeb455cf64381ed7a27fbd776c33d18d8b3e17dd977c3126eb72f2fdad2a1f1d382654ad45c32c8c99f175912d643949509b9
 DIST linux-5.18.12.tar.xz 129857044 BLAKE2B 000df730f6651173292a43745edd615b501d959f4d963a11df600a6bcb378db0750023c9025c8d63091658d7540693cc0e486f3bae3b49610135ca34f0b8edd4 SHA512 d414299f5d7286c2fad903e54375dafe08a63110ae4c758138e11b71b2269effa9d8247711c17858eda73a9a389ee7fa66736b0fd93e8ef4fa8f8d2fd7017623
+DIST linux-5.18.13.tar.sign 991 BLAKE2B 24d2de0e73e9cd235f58f2ae4c7008cb6d5868f55c62ca7901bcc1aa692fbb336df730e212910d6bd76d2e8e98c59ce4a5793a26968ea162cae3bfdef02737aa SHA512 b547e241db4a68c946cb23ad1b30446d12298422525b5b96d533c9d62157c48e7933f5aa646b80d25f22f2a1f0313b1075fd51ac37005c381f8878c9bb5f917c
+DIST linux-5.18.13.tar.xz 129828032 BLAKE2B bd365ff9a669ff17aeb06a9e227b1d2adfeb65e59c31edc78fa44f4522c9943071aea3f62058cf0f68d509f6d847ff98a469793f107a92ad069d5c6b81f13594 SHA512 f78eacc594db7f27941b0ddf5d4995890f7372ee3bd7ad377c29d263f1e61e5b73c43f7350eb26b0de746204f79e64d08f7622c1441ad98984458ea4d668e13d
 DIST linux-5.18.9.tar.sign 989 BLAKE2B f763fcc33c0cdc17835596b89f3589aa23c2e42f9569a31ce359595c45f558fdd79b04a29a3165a18271d23b2f7bd2388b589ae147c9395b46bc18271844d5d9 SHA512 c9928fb16009c3c61c19a9d0d3821496bc642c521bfbe942e9769a5f7b85eac1546f7db1878741f4e47875ace99732342ac75e39985003301fd405757f820abd
 DIST linux-5.18.9.tar.xz 129826700 BLAKE2B 9daa0be3f6f528aa4d761db357448c007f2647530940a12688b7b8b769a605d64b5ccacf0215759fff3383e8a9a179658e4e272bd4747c51663e120e0e12287d SHA512 8db3c73c91cc3cabcf24224bed97a790c562d28cd6a6562b924e7c07cc671d3721d7210defd5c9cc4bddfc16afee0086dacc40397823ca3ccb890f2f938f5814
 DIST linux-5.4.203.tar.sign 991 BLAKE2B 4e13305b908e1e158c61ae0667186cfd42e7dac237624cc871f584efc68c53d5de3a90379e801f5e26655293c584ab84e16c5f87d503c1e5381b6b9e8634d8d4 SHA512 867b1ac576df3db177f8c684291aed7a2094405a8c9f18c49c2f5f1e4c68b6fe4dbd211d65cdeb07db3522a6f485c03ce4993c687c0d93d85dd8af31b60fdb4f
@@ -66,6 +68,7 @@ EBUILD vanilla-kernel-5.15.56.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b845
 EBUILD vanilla-kernel-5.18.10.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.11.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.12.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
+EBUILD vanilla-kernel-5.18.13.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.18.9.ebuild 3834 BLAKE2B 089a5142097136aed9e50be411036c736928493f7cacd70ff451025fdde045114693698d288ed6d52b99b26ae7547ad709fc21e202b84c4f029c7ced6d3e385b SHA512 f1f0db25333caa37608432990c4ddee1a95da706ebda26831eb1ffb35e92e01c066ac90a8926a6ce08a1b6d5d22e5cb57ceb81b9ceb9a60d5dbb80c2cd2e13b8
 EBUILD vanilla-kernel-5.4.203.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
 EBUILD vanilla-kernel-5.4.204.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.13.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.13.ebuild
new file mode 100644
index 000000000000..facbe03b0e1b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.13.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/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.9-gentoo
+GENTOO_CONFIG_VER=g1
+
+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/mgorny/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/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/mgorny/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[@]}"
+}