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

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

commit:     a4fde1c13109a2cc626277821d9cb55357594369
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 12:57:39 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 15:08:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4fde1c1

sys-kernel/vanilla-kernel: Bump to 5.15.80

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 4698d8be3ca0..ddfdffdb5524 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -30,6 +30,8 @@ DIST linux-5.15.77.tar.sign 991 BLAKE2B 9f4d4e7d3f21a02f95771d7931212f026ed2543c
 DIST linux-5.15.77.tar.xz 126468704 BLAKE2B dcb7d95f577be18735f14c1a75148579af40bc35e57228eb7d35453cc8ddf9b6f9f71a7a15608be22049557ba307eabf5df42504f95cd6f414711733ff6b0738 SHA512 3b557ad399606deb2e00077da7c57af534ff5bd395297db534a9c643ff6e95b29b315d15bcb453255875785264347949a7e52ef3a676b7dd12db10764a6a5646
 DIST linux-5.15.79.tar.sign 991 BLAKE2B 49494481a44ee6917f39b985a08f544e3295ece6c1b143cf27248b10975e4c2610d5f7102c9df1606478ae18689429d6971ceccb78e8a06f1d76746628cfe243 SHA512 6bf59132c8d773d663209266393b5d327fb60ab7dc6f150aba1ba32cd1c4a47304a28a548114999d208cd24fb14418181317eb6dc7c37c840a489aa934ed5c7f
 DIST linux-5.15.79.tar.xz 126467592 BLAKE2B cd87a3892bbabdbbb2eb0731125c8e48fd3602f10411452b9c8834b38977a9868db79e766cbc542d03c63cb239062c78d413db5815fe60039fd92e67178afdc5 SHA512 5583f5fda70b2abe42212b254fe069f645845a0d664a806435acb898f87470ed25f6591810a406840a5a85479061aea6ed991cdfed29ca540b567d025e5d1326
+DIST linux-5.15.80.tar.sign 991 BLAKE2B 755c03e2ac0a88fcb973fc66e6d697056817d26cb9dd1167637c8b0a4599a954eb1a9fdb933d78249209370109bbe9c963b4417e2beb1fc74f47677c6474c41d SHA512 ac44a4eca608b274cdef9e0781c2d2fce6687ec556defb2d1ebe4da03190f04b3662ab29c9f341e62c4af429fce2b544f8597891f8649de120136e89c7b35453
+DIST linux-5.15.80.tar.xz 126478832 BLAKE2B 750121c79c4c7a64735cfe9417eb15689d1e9796810c4ae1f56f2bba9ee5cf4c5c920fa8d8962b24c7ca016ca6e23749a5da86310e52e6710744f61f2704cf0f SHA512 6434e6010678dd3c15b201ad9dd12a2a6d8293522038052259fb9957346296b156aa8ef29b6b7207de3ce4ffdb3af41bbef4255a9f73971eb15a2513c9901fb3
 DIST linux-5.4.223.tar.sign 991 BLAKE2B 83aff68008cb382f7d6a9be93ecf6737cd3dc7d7291da646b24d74f9930bcc072bb4033a54d4c9cf0a3088ab908995f61186ae84c05a4b9f3834ffed271ed7ff SHA512 e9fb0e7fa915ffa1b72a9f9e447fb4afb834611921bb5e12ee6b7291385bf8e3d6113f7d9c3587cacaacb14acd8fbeb067eef1f44ef90be40ce8ea6b1cfd3e09
 DIST linux-5.4.223.tar.xz 112946132 BLAKE2B e5669ba0e0e05d468eb8671da24fac4188a6cdbf66201d3a4c66759435997be541994dee2e3f297f6968857c675dd9c6485efde87f9421f7cc0618b692b005ac SHA512 45fb543b2ef59be495106e253bbb2249fe71f9727a9a7d7a16738820db12f9fb5f580594699f736d157f930cf3a712e09595689a3f9954cfebbfa99f04ffc681
 DIST linux-5.4.224.tar.sign 991 BLAKE2B dc31a065cb747f537923a743d84a473e3724413141242a351d684b155578272156e4476646f3eb5b5bda2fee190604234294a155faf72d7075d60cba32d4b2a8 SHA512 13a8c4e7b2500ae32b22c0fd49f447a3ae2cb673922ae8ce478dbd713aa09acbc0f7ac2356d1d9303a537dc1710d485d50c4607e6f98ec7055604e1fd4b44ef5

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.80.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.80.ebuild
new file mode 100644
index 000000000000..e9d460c7094d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.80.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
+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/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[@]}"
+}