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

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

commit:     2b9dcbcd63e555bc1b31eef950bc1edce48662e0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 15:57:59 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 18:17:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b9dcbcd

sys-kernel/gentoo-kernel: Bump to 6.1.18

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-6.1.18.ebuild      | 140 +++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index a23179fc4ca7..2fd14ce6bf5c 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -34,6 +34,8 @@ DIST genpatches-6.1-18.base.tar.xz 833216 BLAKE2B f1b86487c82d4354347171df635192
 DIST genpatches-6.1-18.extras.tar.xz 3804 BLAKE2B f31c07ec6318b91e6e7eabeb62bc28af362fc097297b31521d464e298effbdf52cdb94b43a1811fc10ea3dc9387fa47501c4987d6709d73603ed15ac7949dd92 SHA512 8611f8cd72f54b7c4360d314eabcccfaa99722f568da32710a39f47ffd1770b14502130be5ce3d3a14a0bd93fc9fbb73f65a9c9636a8d0e9051892d1e5221ef7
 DIST genpatches-6.1-20.base.tar.xz 1052484 BLAKE2B 9599ee78ab289960d7d0c81db8d509a43f8dcb524163216af9c2bcd37eb1fe60b9c7e607faecd19974676c5cf863a4edbdc668b39ebb1f37fec98b1eceab42a5 SHA512 9e99a69ed5adc7fa8a33cab86ea187c42e888c6d768cd3d39d5491c8d96dec2fc5f4c11c02075b01de1530ac629e63876152ffa7643d3a3b899fd1655d67d1f0
 DIST genpatches-6.1-20.extras.tar.xz 3808 BLAKE2B 4d121cdba86a63a5564f44f2b33841ec07d456da813070f73cdc2b983b5fe466e92b845a6c4d0959aedfa3ee9a8c57fde08a84aa6a31926d43a5ac68d4c168df SHA512 8b17882ee84adda037433b2ab13aaa378812f6d6f3e87246c1befe54c0254d1261b3fbdd89410f133ea35e798bbca597e392222ba1bfc93bf87e645600609dc2
+DIST genpatches-6.1-22.base.tar.xz 1112816 BLAKE2B 4fb3e3e6b08b201856257c72e297428e8ce90bac110452cb47df21799e140d18d7bf82f4fa36c331c9a199e63b1305d151b77aaa2f9735dbd0a049b7eac7b433 SHA512 06cdf0df64e699c9ab3daa122b2daa9bda56e2fce0497665fbe2fa488c1208ab0d13f84648f3fc8627aa2a325095be9a115b2bc656b9228fc78e98068d4d8685
+DIST genpatches-6.1-22.extras.tar.xz 3804 BLAKE2B 6350caa854108959e150ba1537044b9c781b24b740c632f30d0ca4de54d795c45993623fd0822131cec50cc46182a76c036e5481bd4617ee3ffb5c9f82258050 SHA512 5a48e06b4f9fb94d53b7175850c1876edcd76ac45c1188d754a9963388a2df23d510f8a30116a47db45f06f1274e25c6897957783f0e8eeb3d0e20ea626052f0
 DIST genpatches-6.2-2.base.tar.xz 9540 BLAKE2B dce2bb1156f0e9a7ca19b618d13729908001939d6ec6361ca6619808a120e61900b5f4de97b2bef0e63aef81a83c7e2a0d736f3c344d9a610eb5c6a21baeb111 SHA512 50aabf4c24dbf13595556314b2ba8f1d0219355bc79c0fddf05ef7a6d244fe3c54f95c733e02fbc032a582495c59688f415af5b62b3401b436cbb5f0ef3aa9ac
 DIST genpatches-6.2-2.extras.tar.xz 3804 BLAKE2B cdbf51c28ff1c3b974665f558ec774eb70874a3941b97f966ee90642f3a1c8732333348e891156a40455c8b80c2a2002fdf1515403eca7b8d075c28b09a2ed78 SHA512 cba0fe9b3d13f3b1f6ee413a44698694ef6b009918dfda76e4d8402e66f1e857bf889fd4eb7ae093e864f7015eb3fe14aa704a5a3b68b0b92ca494bfc4b43a71
 DIST genpatches-6.2-4.base.tar.xz 15256 BLAKE2B 4a6bc8f4b75be2afe87d3d29ebdd45cc6a6266717b793a611edcefad3b39c3f70f14533b538eb175f0c16e901006d52e09994072cf9375dc0606db0478472d18 SHA512 0351b19b50bff5922d916b215c8b5b04a31994973dbde9553b2f197009447c9d5dc992f0b9ee25bacdd1569477a0beed4e0359dec390ca4914ceeed3e73592f5

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.18.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.18.ebuild
new file mode 100644
index 000000000000..dd5577ddd24b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.18.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 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##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	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[@]}"
+}