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

[Michał Górny]

commit:     5f06eb139cb5790de53fd81dbe27cd4b3c103496
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 19:40:29 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 22:17:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f06eb13

sys-kernel/gentoo-kernel: Bump to 5.15.21

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.15.21.ebuild     | 126 +++++++++++++++++++++
 2 files changed, 128 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index ed5e65804a9d..783868898bb7 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.15-21.base.tar.xz 979868 BLAKE2B 217af3325d15020a43cc661746272
 DIST genpatches-5.15-21.extras.tar.xz 3876 BLAKE2B 4c07b166a474bc11502de000f1bb00d8f0c25914a7877b2a94db844c694e0e7a4c757e8a10880eff40438b97214326ba50e716070d79ce1ef7f68c65d876da39 SHA512 384a2111655d8fd78a2f6165e99be0c74b36cf90333a465a4bb4cb6cda5ba32e1d435958987094a2d1407f02df7331ff2bd4fccace4f0a6ebe0c300692598f41
 DIST genpatches-5.15-22.base.tar.xz 986832 BLAKE2B 48fcd267e6e28850d226693b902fd66696024e75db6a75bb78ec79c7ac8afdac62643c4113ff205c301024d245f075716e0bf8083f97917dcfc8b1fcd71b674e SHA512 e8c64bd91caedc3dcd98301dbcbd2003b4aceb5a9713bd908a69448eaa2aea945fa8162e57442862b03daa0e1a4e7642e4504701b1f34a6edb127692e582e0e0
 DIST genpatches-5.15-22.extras.tar.xz 3876 BLAKE2B 95daac6c95b82d628c0551b4e18e7c3ad9a5722b5ab8f087889b15bdeea8c6f5e232ee8b365bfb4a7c6730207d4735a0fb648b389626f35cda2593caa83ff3e2 SHA512 0616c4a976d22a5491039a6bc3babdd7e9095a2c53e2a1530d1ecfcf50a2dbfca637c1b6771078efc92e3371ac15f332f85f653d267ea8e6262ffd305be2723a
+DIST genpatches-5.15-23.base.tar.xz 986960 BLAKE2B 8c64fb7038c358c4249af8d9274bf406249246ad0315d87266b6f22435e24105269797815679f863a4827aaed70e42471f2c4b82420d8f7021eb35c13a2f7f64 SHA512 0ad59d266c94ebc7614f2b8308d2a81c260677f7667de1bab58d5d2bc41a55bce7550e2f109bc7fe69303eeac2d58fe84ffd03c5d389433942928b786208a79c
+DIST genpatches-5.15-23.extras.tar.xz 3876 BLAKE2B d41bee55c7c742a138bacfb45459f6449a80521b6857fdc55f675cf2434102176c493b9239ba73ab2d07df3062d995f9cfa76a168ad4913e5623453496519464 SHA512 3171e72c60211f2c331959851d85954ad94c947884408934375a4b495fe82c35f66c7408e6b3edff18ceb6888819c9f64b13a8b7c9433c80c802cf0316bf222e
 DIST genpatches-5.16-6.base.tar.xz 410464 BLAKE2B 19e5c3718dc8bd9b10f42b4448da16717f95da8a5ca33145bec2703c850ecfe4978144530823319bce945287642a44d368eef24448b45b12d28f5fe450325e99 SHA512 80c38fece09b566dbb65b02beeba3b895c41f18fec08ab9b09a6200450a88be8fb10c04dd80c88dadb13e3aff56f2e5983063cd2d852d9f1fd7ed92113e74887
 DIST genpatches-5.16-6.extras.tar.xz 3800 BLAKE2B 43e9801bfd91b817bc56eeeecf9a86c77ef00c3899a13d78b022dc119c4130d2635fb801b1e638877b68bb17c2ce57edea5d14f8a93acc165c715dc0f5615173 SHA512 cb4570ee5ff2dee8a8e992c7f9d173e4b4c7a680cc8225a53ed9e16887d7ceee3ca7a461aed80bbdbd90dc236b26b1094ee6be207afe1bd15117dbb4025b9c9f
 DIST genpatches-5.16-7.base.tar.xz 421780 BLAKE2B a4d43c5c598c6c263330acf21502866f0d6698e409b51f48c1690e98204e786d4ca8cca252dded8ea276124e9ee0598e912d42cc458ddf096239f3b97cbf392f SHA512 e76e4ffe549b2533f8c1674963a6fe22f70ef169f46ec13681efe896f1141b6a0341f942856a6ba934e2749589fa68512870e727e2fd411b7d2f5e4cb9b86594

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.21.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.21.ebuild
new file mode 100644
index 000000000000..491f7ca35578
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.21.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+CONFIG_VER=5.15.14
+CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f
+GENTOO_CONFIG_VER=5.15.5
+
+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/mgorny/gentoo-kernel-config/archive/v${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="~arm64"
+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[@]}"
+}