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

[Michał Górny]

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

sys-kernel/gentoo-kernel: Bump to 5.15.80

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.15.80.ebuild     | 131 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index b84e4be9f92c..1a4e6388808f 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.15-81.base.tar.xz 3257712 BLAKE2B 66e0d129053b2cf3ba59681318be
 DIST genpatches-5.15-81.extras.tar.xz 3932 BLAKE2B 0783c48eab8d9f53d07770a3df525df2ffdab8f36d3d7db2d22e2fc5b0d1fe904644b013a3d1a5ea3d967636d4ff91b3f208ea8f004adf310134b98ec5cdd0fd SHA512 be4b557066d8d2327724c8be440ebcedb01d0eadab7bfa0f9f230111cba76a2623bec0945fc887b91d6e5c73eec3eec4fa29b2e76606e7871e81a91fdc4b2bf9
 DIST genpatches-5.15-83.base.tar.xz 3328188 BLAKE2B 5d8da81e1c5f936ce49589d1dd10f41246a6059c410c0215b495ca7401eb618aa6c87d2ae23b08f27e3be5dd6b7f88e5d4e90ec9950924db9a08375d45cb2da3 SHA512 fdcbf6bc1e17f04df9d8334c1c75f21e5ca60fb99157708a4c599e43ed20a58664fe54fe8467924623d612ba2ddd409af4840195369fe274a4f55a84fce12ade
 DIST genpatches-5.15-83.extras.tar.xz 3932 BLAKE2B 42ba0ee79654687ad5c858344ef7a1787c23fdadcf312788b2f53e739bd6319b3771c89d93eef7f604bd4f9275777421fcac09f8030af81cff6b3d9482b8e804 SHA512 55873c4cac9a4c5bf030b562c927fcc663a9a092602366d170541050386d427fac2dd8ac013d13b700bd874e47655d10b2cedb5b4c1034f41819c675aea80506
+DIST genpatches-5.15-84.base.tar.xz 3361044 BLAKE2B 355479d56f6234f63cdf7acad501784edc72f3e55ff6ac0e09ac26004c38aa30fff62893036ab413d0e8f1334a41568c59e075452b5c3909f88b8f48f0104748 SHA512 7a7a3b03d5aa348c7e4c5d4d7e4972c8538778367a9eb1984c1f0b3ab202ad27b92d1fd7f29dbc3fbc17cd413d3c1a571f5201355b27c22bf0f55bf7f0d57206
+DIST genpatches-5.15-84.extras.tar.xz 3932 BLAKE2B 1729d46e8de60b40e69fdf7f63048d9c4142de4a4dfd75695f3303034b1b1732aee6c20a62a3f2d7b4b464e22babdd6261ae4249a79f79bcd7c817faef55ad5e SHA512 223124d0323024c383ca342969404fcc514596364a90cc98bf8a8e0105e5c2420973a2efb6a47c732775a4672fcba4d3d4386a8fa5350e8ce8a98dcb6f5718fe
 DIST genpatches-5.4-228.base.tar.xz 5198204 BLAKE2B 35942e1ffbfd792f2479ce2b97c7f191cf5fc5712ccf101ee1f5f7f0486d53da2307237fc2d50fe0353c82557df03fbdfbc669949616dfeda69970628ad98ee5 SHA512 333dd865d3f10083566ddf43ff4d159a6842c3ed92c703dbcebd0832b0fdbc53c0025856eb1608ac485c805702608e52c600e08922fb831536bc6a099f74f1d8
 DIST genpatches-5.4-228.extras.tar.xz 1812 BLAKE2B dc4f0815c8915ae371db4da0ecc1066a269547ba1a967a6067121de25c06445356b6f1339088d402e7f9ca5dbb91b49ab717dc3168760cb26ff3e279177e16e4 SHA512 7ab2f0466b677b3506c080bacae1217b54b35ccb45f65000757bfa09e3ca2834a3b78c4b03730f11c6948be3e3a04c1fe3bc562585248039185d94ba805adfe7
 DIST genpatches-5.4-229.base.tar.xz 5214840 BLAKE2B ede38de7b09b59ab96596aa4e47f7d2dff06e8e3e403e0b3a15092991bd21504ccffdc21b8fc5857fbd21ee89842f7a6d74fd88b5c7426ae2a5dd3d50ce8db51 SHA512 ad086f2b00e870d54b1605eac7fe537654c09830b69c316cee71a7bb5e621e6ada37ef780c4d2c3ea9678e4a72c19355acac2648e16943ba0dde4e711909826b

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80.ebuild
new file mode 100644
index 000000000000..4ea02f952baa
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.80.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	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 )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	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="-gentoo-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[@]}"
+}