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

[Michał Górny]

commit:     ba656319c232b5e5bd96a1d346c2563b5485a2d8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 16:40:17 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 20:22:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba656319

sys-kernel/gentoo-kernel: Bump to 6.0.16

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.0.16.ebuild      | 137 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index a947e3b2ec26..abe3e3e2fac9 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.4-233.base.tar.xz 5294692 BLAKE2B 357046687c6f2797d5d7090dad35
 DIST genpatches-5.4-233.extras.tar.xz 1812 BLAKE2B abedf631da893391a98a98cf48d264f9eaf9f9f7811bf595c36a774c8dde21f105afaf6f4e113e04de472bd6ce0c759bd41fd95aa980b7e05499d8571f3e8a44 SHA512 16b09d0a4465123079360ef9f070e0c163f45f9784714e98fe53f7174e836fe7b2562af01e5c2dc932571bb3eafe2d9afedfd60b5c8467bd8410de651ab82473
 DIST genpatches-6.0-15.base.tar.xz 709204 BLAKE2B cba74ce5f9a6d8a00991f87fe33771f615640c8c3adaee94432580f5df51cb2a488794a376c9355d568ab4b3014fe23e4c9fb000bb9ed6948b4225211df862d6 SHA512 64d5d04b8c1b3c3967fd22cfd975b7f9bbf37e7d7d4e966c7017b589837cfa02200a80880f13ac52942fd845c9835143d809817f5517c91992e30e101b15c775
 DIST genpatches-6.0-15.extras.tar.xz 3804 BLAKE2B 84856863ba0897a7ac9238094fec3d46a39cfed7db81d1021b236fcf0bbd4bd893ba44af4ddcc9ae955ab66424afd70ead4fa714a1b68e11d7e66539f94a6cf5 SHA512 7e49da632e9bf5a78c80a0817708e571452f92a99fa91daca8495282fd0ed955bb16a5fb57ebbfff68e9fe6733655c4d04967c6931d1acf6dc6102a44bd9b04f
+DIST genpatches-6.0-16.base.tar.xz 995192 BLAKE2B 17cfba17971fadc2e389f14e4787604489f8a30760f3687df364d053999819dfbe63264eaff4b04bf7df00d66278e6d56d856e09a043407e282bbcb2fbce4c7d SHA512 fc199b59ee9392693147cdfcd11d26cacc5ae5b4a76a3734f32e2b86a027e0d13a4ad5927ab06d333b7ec89f1983acacd876c272cb48e6555e1b067b0c7ae63d
+DIST genpatches-6.0-16.extras.tar.xz 3804 BLAKE2B e03fc44e706291fe586f115e0cf58c78fea7f259a02cbc05cd9bd44166de7f329c538e00a86ca9151cdcad66f029f52266816199743fcf176e0e0295c785a833 SHA512 06ad99c99c6b130e6b6aca4918ffdd693b04830ec475a397f697e70ed2356c43a177a67ef46141d28fdc7ade2eb9941f24402c82304340b000f28831f4ea83e2
 DIST genpatches-6.1-2.base.tar.xz 15048 BLAKE2B 84d1f7b4cb2c13e70b0d542853856f05de48739400f66253fd277167144ae0c259579e539d43ce65d2ee206a2820ec2ef288d9296c68a4dbd674c43d378102b9 SHA512 e349b8b535e8ab9f70cd01c513480cf75bd10dd2f2d5ef15f97734ecc9e481f137dc1cfa4c50f8a1a2f3549bf0142f83f7224603f881e66af130cbe1f8023496
 DIST genpatches-6.1-2.extras.tar.xz 3808 BLAKE2B 70f549904446897e8f955146dba039b43681e03e0d72049e35473ac6ff5d05a1a72c124d410fdfe065d5652c0f0312c6eb4907afbb475e3cd9828c3f0edb6fa2 SHA512 9f92c3b899a8b106649003acccd33cb3cfaf9838ec421998d3b587893b2e6705068fdc0ff7b52ae78203dc793b6064742b721e68bb1e8d7160c48b419062448a
 DIST genpatches-6.1-3.base.tar.xz 331284 BLAKE2B 66670841382237e0d222ba04fea65c98420c15160c7c9073b3107efc2779aceca0bea1643be6c06d5d1ea15558cf53676d25921013bd437027090be4acb85228 SHA512 5873cfa3f67a8118d92b141406298760b54c8b3625081c5dae79fe0c07e3eae20474cbc85601e871a6bdb5b3ed2f70e16e1939d8e4af67db7598af845853f0f1

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.16.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.16.ebuild
new file mode 100644
index 000000000000..8dad214e738b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.16.ebuild
@@ -0,0 +1,137 @@
+# 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##*.} + 0 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.0.8-gentoo
+GENTOO_CONFIG_VER=g3
+
+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/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( 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
+			;;
+		riscv)
+			return
+			;;
+		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[@]}"
+}