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

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

commit:     1e327453b8816b6ad6ade07929aff39e73cac664
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May 25 14:20:34 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 25 19:24:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e327453

sys-kernel/vanilla-kernel: Bump to 5.15.43

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 3aed7225aa79..d56e004e698f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -21,6 +21,8 @@ DIST linux-5.10.118.tar.sign 993 BLAKE2B d449666a55dc6befeaeac7a851c88eb04c6abe1
 DIST linux-5.10.118.tar.xz 120395788 BLAKE2B 19550892ca372803456947a8b1a6f774c04c6383262273855235d40fa1005df6ccd93638abe9e9f0b52fd0692863f07fd18901a7cf113b16af80a2030b2e9ce4 SHA512 5ce0746c3b519abe9e20d1c80264a6a8e49bc18907cc0712fd0520f8e74806028a1b3929da636d6ab88b195895f1873122122b1506b7047c37ba30ed22b357f1
 DIST linux-5.15.41.tar.sign 991 BLAKE2B a5ffcbc8a9127288f6ec5d640178a286114343643d91d218a85e9ad9feddcb3d1febaf0d36f6ec230a732cdad0f8bc41967308049b3c7a4bece24c70ab546552 SHA512 e8420f18f3ea201669fb1ba3f6565d41ddb3c6063b81ea27de5ae51501e01a1fc73283d0fd55255f74003857ed9b07645eee7ed8a6322e986356d7b5685b10ce
 DIST linux-5.15.41.tar.xz 126321620 BLAKE2B c92592a3994c607242053cde655ebc7ba837e2a8d06594fd14c54c63e227fab42eb9ed3e1c452a76e7258c3f46cfed447306f9cbde62c5cd96f04a334edffafc SHA512 f93bddc7c7890c5014c0b506884bd5487cddac462f74e965e869538f97e22428739e5f71badfcb6ccb5b20f642dd66b53286d85036d239245cca9865d826044b
+DIST linux-5.15.43.tar.sign 991 BLAKE2B 6ee0c91a3c9fbd24dc3e00ba6ab379c4763179d66cf15609bfacac2255facc76ec5f3b1d5468706f22eedda9913d7f7e6acc65eed3bd45d45cbb51c38dac6432 SHA512 7ff83540856cd84bdc1961308f8a44efbc12b9653febf404044c42cde6e5fe0ccc3e6ef8121497a59013c48e5090cc8eea0df250934b3adf35e7e0fbf9adf974
+DIST linux-5.15.43.tar.xz 126315992 BLAKE2B 361e41f62c614e7c8bfd92bc300c06028b77312ecb67b3a3c6d241f076150b1f66fd755cd6795f929de6576919756d503e887c773f88e8f9900381fb4e28c88d SHA512 4b2ec6ae113d69290279857def9f772d96949ba2cdb9f5b4ed2f21a5c8174a71b42d54309f608bbe674fd1157a8f742871fe4d2b54fb1a93625427b03d19a8dd
 DIST linux-5.17.9.tar.sign 989 BLAKE2B a078037dddf7634cf5e854b79a873cb743a3809a4be3d6fc4c8d9ea2340ed61d118dcb58edecadcdc653ded2e4c552d44b56d5d962d833b6b37234726ac35b5c SHA512 07c2d483e0b02ed17b27d774513cca9be47b7d163964e7f2b14f0be273e8d67747a164274ee1fcdf67abf39f7141297322eb5f39cf9cf4df89bd03f48fc95143
 DIST linux-5.17.9.tar.xz 128449736 BLAKE2B 83dc3cf66933f42a3cdce0015716017ed7fd7810a380a9374bac495b9f0a96b1b95b05bd012332c4156189f6a02d8a9b8b33c9391458adb9909a75bf661d8547 SHA512 8866b6f0ab8cbc122bbed0083ee9b351193780143259b818a15cdde1581222ee728a60344ea9267d7f3e6b1563b24a23100f46e6bd185fdc1e169b804e48cc2e
 DIST linux-5.4.195.tar.sign 991 BLAKE2B c80a3a547d82b7d394155f396e3beb66df61272dd5f57be00fcf3b8b6bcc419914fde3488b950f29f6c235210e8f777e28199a4126530963749ed3107c49a249 SHA512 a770e02e59031a8bc74c832c1f9947d0f2edd397de23eef234f18b7070128c8adb1836ca4297dce1afa9f5ddbdb97fa4404e2c90faa81d5502d8856dca4112fb

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.43.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.43.ebuild
new file mode 100644
index 000000000000..0ef902726d5d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.43.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
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/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[@]}"
+}