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

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

commit:     668ba68b18435e6f3dac9b6ed54b9b45ccb5dec4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 12:28:36 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 15:52:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=668ba68b

sys-kernel/gentoo-kernel: Bump to 5.16.18

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 4a0d381c1953..735a6d254b28 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-5.16-17.base.tar.xz 753196 BLAKE2B 8f4be6ddb70a7407f6515d180ae8a
 DIST genpatches-5.16-17.extras.tar.xz 3800 BLAKE2B 9224e534e09bf58189462be87516fa21fc37228fe60399ef670e40320a8bcc5edbcd0371b5da5ed445ca84c0127ae6541a07999edd62f67a8619f977c70d08bb SHA512 92a0580b4e38c43c3e594fcae0cd6ad1c04621e8ea543ee7c039bd47bec9229c23f72585d98d4f237e5c80fd1a3a21205a4b688ccd67df77e048d4b417dd3884
 DIST genpatches-5.16-18.base.tar.xz 761144 BLAKE2B f4d4b5225a2ef03e422230497861714663b430397d3118c8e1cd880eea9fbd2393a4b6848c674cce8892fdb145c06e4b3d828be05836d76a1c56501e07d840b4 SHA512 472f456ff01545dad0a9e21a3560eadca63dbbaa5dfea0cb4496d3ea8f10fc968967a97a7d483ab573312de53b6d719f8baa21761feb7b7474597af53e50abd0
 DIST genpatches-5.16-18.extras.tar.xz 3800 BLAKE2B df1212d36eec642a4c5eff67afe7b531b1ff85ee74e594f7ca3ff1274a85ac380c986458f40a5d378392c36600a122a929b0ff5bd730e9442e34d77f625671df SHA512 14700769fb872ab062cccd49e45fb530aeb75198bf9f5715a98c2d106ba088230282d120d71d694e3aa405a6aac1bd23fcff11864ff738cd38aa766862edefc9
+DIST genpatches-5.16-19.base.tar.xz 770100 BLAKE2B 2633ec6c3161c7d58e778b8bc20b125e511973204371f2642b73a01b5195729be3d0ffe1a63677afaba2331538d2f45b3cf14380f9395cc8c59c39b7582617fc SHA512 c05e9e41b8bf259ae75c429a1014818bd517620fcdc3873343cda29c1b6338d8776af0ae97e24c75d79bf8382b3fac84dff8c3b066ec95a428de60569ee5e123
+DIST genpatches-5.16-19.extras.tar.xz 3800 BLAKE2B a833a2ebd95684ff8f56b6ef78198353a06df41b41d41003b34a551e8ab901b34bece5f79132550c2d167a4bab782cd13fe4b4e22115cbc8306c5d48ed197f06 SHA512 0c82d90d8fd749c33b79c84171fa11c55b18d2f907bd97c544d08ab8a622b31d025930b9f93c4b43f669ac0f75e066fbdd06c169e7ff0ed3648901bcbc78f78e
 DIST genpatches-5.4-189.base.tar.xz 4492528 BLAKE2B 9fc86ea4e71968c77f4fe705f5e01220545becc1f062a53875e4cc451a880a2482d70c1830b98ba447c77131422cd8305f2636c702737a94cda749f0927b2706 SHA512 f4c9946b88d8b61df0d267d915fa047de8774603c0e98fa6ef2cbd930e5c3d83fe4755327dce54739a580d674260ce45c3cffef9180369821f947170398a5de7
 DIST genpatches-5.4-189.extras.tar.xz 1812 BLAKE2B 04e839c3c648cebfa8e15aa956670ecfd1c7a830960e7facff9015ad37c9b8ec0a85f510a559846163a277da9b669a0512d22b45b6ac7c1dfc9fdde99acbe9da SHA512 9357b36b51ffc30e92197affa4e60e0e01180c218cfdd17c91538b2ac12ca79fc534ca0b4f6a019ff3db97c8d41298fbd383d8c4c7fd0d8b1baaaac0494a330e
 DIST genpatches-5.4-190.base.tar.xz 4508904 BLAKE2B 89aa6c02b3f145a6b5efc42fc880c297e1a4f685f622d6554c3a8a3a614c980bbc3d76b7b4e57e54d98db7279cc4a979a441d1ce4a0812380a677dc99aed48db SHA512 b9955dcc6ef00928b0dfd0ee4e13c5646068c488f0b4ded998a47d73532aa6fcb615c34415eefa8f70a2a850b42fc13f0c0b753ddadece6a10737c628238af7b

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.18.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.18.ebuild
new file mode 100644
index 000000000000..7279fa0709dd
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.18.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.16
+CONFIG_HASH=95484c155424c62930acc1c61803f608af3f1cbc
+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/mgorny/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 ~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[@]}"
+}