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

[Michał Górny]

commit:     d2ac321b9b8f1374c83103217d72f83ca7d02aee
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  8 19:21:33 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 23:21:28 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2ac321b

sys-kernel/gentoo-kernel: Bump to 5.16.8

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 0e6377b75092..6f3309fdf255 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-5.16-7.base.tar.xz 421780 BLAKE2B a4d43c5c598c6c263330acf2150286
 DIST genpatches-5.16-7.extras.tar.xz 3800 BLAKE2B 2ca7dd167d60ee036ae8a9fcc2258719c701cc2a64e8a62e150ce369f2d7ab4284148987f22cd6deedbdac8bfa9d72cda36c7dbfd5e353034c0d79601c923b78 SHA512 3fae1914f2d5cfe03a72d24abfeb5bdc2c0387f050fa0b50f15a20f26afbe4dc1b79bcd619451c858845a06221cb3226e5c026e554120828d133e1f9f126d586
 DIST genpatches-5.16-8.base.tar.xz 422008 BLAKE2B ab4eb1aecf4f17f68bd60672de39a63dcd3d5d9af585c72c946db429fbb71fed3dce5fb92dcb9ae64c4587bc5a0244c7c7e53b72d25ef077b6fd291d94b8abbf SHA512 e71340a9fef92f81db28851b288c2cdcb5a39a59867cc291749d737a5f82e1698c407d7e663df30b5c7182b24c7b7cf34da7bc9a81dfa795872de021651fa8be
 DIST genpatches-5.16-8.extras.tar.xz 3800 BLAKE2B 9f463f068279061ff6312d27c9a01cf3b36ad9ed4216e99b10fc77af8334e4fcbe61e03ca162e439d0abc227e6d48f56ea5019c39d41136193b3523acf6e5fbb SHA512 84b8279b8879035a0af3438652ad9a582899224eb69225865ebc9cf0f9f35f4eaafcc89e31e9666bde5882975306ff28b2ca5394633f8f6998b869d1b3b34653
+DIST genpatches-5.16-9.base.tar.xz 463080 BLAKE2B 05822d43a6d02460235e6017aa97102ed9cf2c22a54e0f2f0e1cb0dd4eff1fe69505573bc3bf3d044d60b0f61da0b18c395e709faa9c350fca994f52fada06e3 SHA512 ce4c5d3751f7b61610a4d195d104a4d56eae780eb66633ad3abce35e2d776b232f6d714528f3e92d52a187abff521b9d4ffaba9ec06a9096ec3e5ea39b2449bd
+DIST genpatches-5.16-9.extras.tar.xz 3800 BLAKE2B 314a28bb2a1e65b075182ea9ef1aaff2a92e8561c408fd9eb824ce3db14df8be8f3bb0e1aa1c9d4965f99939b1aa5b66fdf88d41a7bb0c8adf4fb71a24c43eba SHA512 8816781fd5671e1e0f6c2579684216a651e3a59e84ef8e89f77891ddd7457ae17f2e9bf9a2f4887a5b1d81011cc2501684c4bf6b46e56a115292541aecc34422
 DIST genpatches-5.4-180.base.tar.xz 4403360 BLAKE2B 3e153a25dcbce57a218800df3da5315a808a08469dbc1cf05a7924b27af33d3d8f92926ef77f055f5853f3fb1bf2e78fd1724df21e62aa04fbc7736b26490ddc SHA512 2b6f816d1d0f3c61ae2660ef9dca958bb61ee46e8918cb6f5763e7d9aad898ec07a89eb221267307388bde61822a8698567af764159cdeff76655ca28a55ca27
 DIST genpatches-5.4-180.extras.tar.xz 1812 BLAKE2B d633acaa2c422e7611a8df1d8fdb15a0ec303f6bcd707ea54dd7d373a49b1bb6ecadfb02804909ef8931c8c6e96077a6d2904f294ae1169896b6c1613af48b68 SHA512 9f673d8f284cd3d6bd6ec73f7eb7a5f1a3e85017f21dbb278d015e7151774be10b78b7a0102547fa30aadd906f5f2298749ac0d64385f833a6b9f44045426ba0
 DIST genpatches-5.4-181.base.tar.xz 4404096 BLAKE2B 22087f6ae44e18ed7555b5ed18fa673f0db1da6ac80e8fcb8c9ff32b73395cfba9dd6a3f4a4a1c5ab6e43692c34de41e69f5f64a63b9a237659aff95b0dd88be SHA512 d041f79cc2dc8be90f1cea603d73b48bcd1286ec9ef8ad2a9dff15a0217e845d2e6d56e31b2c8ba840afb3855ff8e5732bd1eecb30066e07877944f24581a6d0

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.8.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.8.ebuild
new file mode 100644
index 000000000000..8cb5db5233d1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.8.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##*.} + 1 ))
+CONFIG_VER=5.16.5
+CONFIG_HASH=07359bfbe209ebc2bf6ff2f7b52eb69cc36e21fb
+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="~amd64 ~arm ~arm64 ~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[@]}"
+}