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

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

commit:     c3db6f8f0e62cfacdeac24e0641ef7a8769f302f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 11:00:52 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 11:00:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3db6f8f

sys-kernel/vanilla-kernel: Bump to 5.15.131

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index ca5c58712109..431496cc0ba4 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -42,6 +42,8 @@ DIST linux-5.15.129.tar.sign 993 BLAKE2B 4b6fbf9e616ba50ae6e50576cd0d3a5f7c4144e
 DIST linux-5.15.129.tar.xz 126560168 BLAKE2B d08fcdf39d6e4e2451e52f17dfdb15778092919750a1e9729809606c6c82d1e27ecc70b93428e462aed4b9e4bf3197c93d081cb07592105e9d377d63d10d7bdb SHA512 f4de238ea61b040037ad57777837049e2285adde3005b93424977e3e460b87ee004427524c64cdb0e0d9d88585f48b36f351cc88d140230ba1bd9f25120ee621
 DIST linux-5.15.130.tar.sign 993 BLAKE2B 61b2dc0d2c8de7be07e997bb9ac1e13349b84b9e1d8e56c2a42b52ed7666e132f4be5d72184dcd56cd3f16e7c02ca950878d37fae1976d83ff5ca256fa313b04 SHA512 7943b5033b3b2c0bcf7359e8812f555f0d25b2ee1f755757e2003ee8a826f89c4426cc1b620654c5fffdaaa094ae3acd0bfac27abbf2ccb8dc69398faccc124a
 DIST linux-5.15.130.tar.xz 126554096 BLAKE2B 9c0f42be91d15e97a80900704c11601799d245ca72006adfd14dee88c403c63ea8cb66dc3ad8039fe7d3625494f5b6c57f8fdf6e7accabad3f3f4a65c588fa64 SHA512 93b5a36ff3d745269c337ef390ba74733e2ded76756aa11f8cd8ccf230bf2ebcd0ff30593b5be97d8c336cf5e96eca4c14d7edf751e56a561581f0b821339eb7
+DIST linux-5.15.131.tar.sign 993 BLAKE2B 1ae63f986751fc0dfbc2f16be0ad28fc5db9d8d2d3367204c04deb0e33f0a1f30025b59a5d69f8071cc871f2f7d2a5431f4d677899e7040d22a612f6c68de476 SHA512 96f8961d2f32f144e3ab58cfb02175f5cc2ad829d1473dced4ebd53aa52ad281d723a55351d055147321fca7a9b66a63273282f6ea9d61879ce979c1391fc0af
+DIST linux-5.15.131.tar.xz 126541144 BLAKE2B 39b694232a1773b9a755b2811e7aa01d6bf30cbc2132e9c7ed16e8f5ed5ff83c0724bca09dbd459b1393dfb49e1b09844f93885d37e577efc961e5657df80787 SHA512 db043eb583568f6eef2adc2b9f48012728b6a91ac8ac6d38a3eeed3c710043a222dbbca2c3f40eab93f6b27f5715c1139fa0aa23ac431809b15cfb925706bbd4
 DIST linux-5.4.254.tar.sign 991 BLAKE2B 4f5a5e4ea2c930a62e3743c4f10d8e9999530a106134c61635f2f1fd627e6cb375a6d21a2f66f0bc02bc99e419cb0a4db3499af090f8787f523e009789205007 SHA512 71b4b3777c238034d5624be9ad79f40634d2e861ae2665d2aee1701cc3d5a09e6a5d1a114642d0d01a97cf1556022a658fc3deef7c59e93ab9b41c829018bfc5
 DIST linux-5.4.254.tar.xz 112963588 BLAKE2B e0e395636643c49063cc1fbb04e06476ecf17471818f909559dc8f77fa5de69b8774ab8d6b16b4a2a57f32a7bf90126d381360fdd52069fc435090cde07769f8 SHA512 ccd82451c72eef0a0f35eb8c0e296e3018573ab99b602cce0a107bf2514bccf93113ea86d16205cb1b6a9f7c0198d411a250b215aed3cb0b4be6fcd27b878039
 DIST linux-5.4.255.tar.sign 991 BLAKE2B ed1e0fe2f8516b8c4728b9ef7ad60e51af66a3ac991e9de740f270cbcbb29e3f4ac95c1b2db736a8b04531b5f9be6af594eb1012a12d56f7c5a5797952b55766 SHA512 db446deca7a177372f53519feca9b54cb570830dd3b67f4aa1b40db0efa17bedfcf85c888f38235b61d85afd5057238aa0f6529c1ad1c7f17cb59af56bc60a7c

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.131.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.131.ebuild
new file mode 100644
index 000000000000..f68caf0fd433
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.131.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
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g7
+
+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://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[@]}"
+}