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

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

commit:     480bef0133d173bab432cd47a135b6da28fafe56
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 13:36:44 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 18:39:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480bef01

sys-kernel/gentoo-kernel: Bump to 5.15.84

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 4b7c247ab455..68a7fae0078d 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-5.15-86.base.tar.xz 3451248 BLAKE2B f6e8eed94bc50e40f5286fbba797
 DIST genpatches-5.15-86.extras.tar.xz 3932 BLAKE2B 327cf176552393f6973d19c72b5972181654e3b0054f64d38c678765740955e5fd0b261457cadda6c968e86c4c8dfa34680bc16fde93a44ca1267aacbb74bbe7 SHA512 4808519ff151f7e7eca7ff0d7d9f5d0f912309708da9689b15d0f17e2bc37b89ebd0157d0ee44a8e86b5929e3ebee739536edebad389f9fee3445c89daabae42
 DIST genpatches-5.15-87.base.tar.xz 3545732 BLAKE2B e69eb4d31984b65ea5e0c216d066b358e6cd4fd9c8c9e021fdd3e5022fa6a9fc804b673bf4433d4b8c6f13aa3d0336f2976aeea50245fbc6640674acfc8bce3d SHA512 bb9ca966cdbd5ef5da3cf4f11038f03495e643c07b7d93eab31d484d5615781361706c54d82e42887f0e5e867e7b8c62f565cb57527a4056be2cb10f0fa19cb0
 DIST genpatches-5.15-87.extras.tar.xz 3936 BLAKE2B 05717f3f9ccb161a5076c6623f15465729ec898ab7a8fb4e611d07acaca96df6b890a3af0890dedf6acb06c7db148df625fafeca5099eb96e31ae981e00a23e3 SHA512 ddda9d1daf3f71a8aade12758db2d698b2230a20b3df059437fba02b499d2a90f2bb5a5c0796b1fdf842ff64e515193ac97aa324a4047bbcceaf4849eeca2674
+DIST genpatches-5.15-88.base.tar.xz 3548532 BLAKE2B 947258e9bb979febcca994f82b9ca18df494ac0d7db4664a96ccb4737ac71151f21070d30e4e5665c53d4c444bf06471590a14d17f83396809ee9013064db317 SHA512 e071daa0620c62e5ba273c6f5c4134f7c6f179b25a7dbc10e1f045b6becef1182e0f27620be0f03f32926d5c2109f7802335dea9caac1d576c47bf92c0532045
+DIST genpatches-5.15-88.extras.tar.xz 3932 BLAKE2B d504a1d8dc4510e870c34d5e355944d2e79646102ec04d5a268774e29ead5255ae6cd51f3de1b10992c8bfdfda3dc16379b3e6aebbb18bb528caa801551498a5 SHA512 85d01fff2ac04bb439ffb2a648d665358b5631f086db51b1ccadf31a8a74f94445c5942d6ac25676aefeb7a86f3286a8a7320fcc30bb092c212f2061d3143263
 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.84.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.84.ebuild
new file mode 100644
index 000000000000..1039b6b5f28e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.84.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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~alicef/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[@]}"
+}