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

[Michał Górny]

commit:     1d0d49e159d73930db871ffb66cb52d5dcc698de
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 13:44:28 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 17:03:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d0d49e1

sys-kernel/gentoo-kernel: Bump to 5.16.11

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 901495f07038..469a66a58d0d 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.16-10.base.tar.xz 464508 BLAKE2B d590a7041f6309674e8000c735a23
 DIST genpatches-5.16-10.extras.tar.xz 3800 BLAKE2B 79c288854d58ee20f8377be8bb15ecdca30b27fbfbbe314c2db7260576036258202f620d2ea2c2a6725fca1fe68fa1a158b207d36ae13630b3116397c3868cc4 SHA512 34069ffcf17636489af7d6df3e322926f566f43396297867c2b1a512fa884062bf86d50675c313ff29ed68f6fdb9039748fcd14c9395e29e9beeb166f45eb25d
 DIST genpatches-5.16-11.base.tar.xz 516420 BLAKE2B 3e3d1a7ed60355a6d0911742fe1fe27961bd6efe16c25bf700ffc9aadbd8d02860d8b35a9fa3de61bd6d59024364e698cf4d78a7abe2eefdadd79b5aa086778e SHA512 d513a67f55edd3ea469b36ecf93eda8f623fb2f899c8cb373ee5092838283fadda029db6d97687dc27b734634e666106c054d0f35498af086aadab4aa59a2e7d
 DIST genpatches-5.16-11.extras.tar.xz 3796 BLAKE2B d4df94755fa8b69b345c6df4b9362d1b007c3ad420a6cfcbb9cea79da1e918db6944771cefae0985c63af5ada87f13de124aa96adbb80900a4fb5faab830685a SHA512 058a18c26fc651dacf9da50ad0eaf882f6760df29c37e8ddf2188151c4ec4131c094a04339c08bf54822e37c1b94e1d2c87b4cca7ed4b84d75bc19f80ebea784
+DIST genpatches-5.16-12.base.tar.xz 589172 BLAKE2B 97e255628a387adc723a6f9bd5430860b1b9beeee2e7cf7a3106ef7219bf7d9ecce1b640181c277b725ee967846e7531bd9e0be1310ab63a43eb321b9dacd402 SHA512 7d298161666cae130bfd21fa1279245048cf59d78b9f237c063e0f3d4de47584736ea02267e96a948169c7c91b8b4d2b699136765b8a3118fdbd77cfb20192ad
+DIST genpatches-5.16-12.extras.tar.xz 3800 BLAKE2B d9c10bc2a613a2bb665c5c9f5cdb3be1383762f366066f65921fa2e52a8de492493a13ddec71d18925a90450c17f1ec185e7e19adf3400420723894dcd8e576d SHA512 2be8582426c64d37916ce072cfa6f30310628dff165c7d292be94be4a7124ce39c2a6ea6370ca0190aea0f0841693ba57cb9109c9340e50a4cbfca835a498670
 DIST genpatches-5.4-183.base.tar.xz 4413940 BLAKE2B 2f71eaa7ceeb4e1940c329a47ff05e80970a45db81b69ed5d68767a26351b7cab4f090934bff6bf1cd7efbe6688e2eecc50c9db95e6070844d44bdfe8c59102d SHA512 3a077767398efaf020af82ca249b11d2df9ad0a254f5c76d9c88ff4a588ec9ee2cbf2fa1dfd0afc5b2e78f9db8b0cc2f8bc37681b056313cdbf27564744fe358
 DIST genpatches-5.4-183.extras.tar.xz 1812 BLAKE2B 6755576f737a247e0a09a3eb19886c09fbf2495a50c1af2f70df08b00a62247f83b904ae8d2d98dbbae528830853d87639304eb17b5a336c324d982a41cee0c1 SHA512 603e76667384e94dc0e8795ce6cb9b2966b81d6f3dc8fbba71ab84c20857bc31e5cf15ced293ae03eabd5ce3b0147cc39b59382733f284241d018fb0d5b8319a
 DIST genpatches-5.4-184.base.tar.xz 4427792 BLAKE2B b8f4a7219641518d8435dd8c4b99c33157a3a937edd307da40d5c4fd80873e3fb66003f370310a221df28fc25f3203176a1ce55b4c5da0899034c4f3617c98f3 SHA512 7b611a3ae72349dc2d708d06cf0de7522978bcc8f09d98271efbb9c3b8afa1c1e33ed18036655c9ffc0c38d6bd7fb665a7116f01c98f9fb04cd994372e30d3c5

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.11.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.11.ebuild
new file mode 100644
index 000000000000..3aaf144fbd06
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.11.ebuild
@@ -0,0 +1,131 @@
+# 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.8
+CONFIG_HASH=f38101bdd0124e3ae7c3116b66f7fd1cd76e5601
+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[@]}"
+}