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

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

commit:     7d985cf08c810ad21f467151b93a2ae8d4a6852c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  9 12:25:56 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec  9 20:23:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d985cf0

sys-kernel/gentoo-kernel: Bump to 6.12.4

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

 sys-kernel/gentoo-kernel/Manifest                  |   3 +
 .../gentoo-kernel/gentoo-kernel-6.12.4.ebuild      | 144 +++++++++++++++++++++
 2 files changed, 147 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 90a8bf022d3b..ac36edcb4934 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -18,6 +18,9 @@ DIST genpatches-6.12-2.extras.tar.xz 4060 BLAKE2B ce854b442562d86627eed172c94d67
 DIST genpatches-6.12-5.base.tar.xz 331136 BLAKE2B 6af9e74cc62063482672566432da6173b605d67ed0555ca1486cc0ffde606d84446c40d832276a9ee2a6d2584aae4a8de22a186a2c5b68ced840135b87b37457 SHA512 4b6f205a9fef89118e408e492b179289338e9453563dc95746826f71f5c995d4b36ca14ff106ef5ed6112f5d8dcf6992c7e368ab8ad3fd682c9c0219956ff02e
 DIST genpatches-6.12-5.experimental.tar.xz 78160 BLAKE2B d04df4de8991e23396474c717dcc9ae069bbe877c921589fd61e19d16ab38be7bbe416c44406a8b5aa501bedbab18f2874d218f1af0a5ca8c853ee666ee98172 SHA512 27296cacf0fe5dd4a71033955956023bdbc3c5d21d9ee61030845e978c28170a434fbc5554c2ffbe315983ccdb31feed1e5be6ce51ae439b6bf5c4433d8c1999
 DIST genpatches-6.12-5.extras.tar.xz 4056 BLAKE2B a3e17cf0578b3cb3d5edb399e7030283c35cfb71357202de8b4ce28b0c21ffa5d5e777d6f6fa64f5791ecfac6a37cce3f7e1a926fc16bf75ebfe7029af9e4c03 SHA512 52dd7cb88876ad7a643eb39c7e86a3341438b3662b9821ee1f479aafd759962db247d7d746ae1ee63a4b803c28e8b7fd14e89efafe918327663df5029651c3ef
+DIST genpatches-6.12-6.base.tar.xz 365140 BLAKE2B bf281f8314de03b6ac24de430632999188ff1573f46f58cab999f92fbcf0c2e5fd14413892e5a961eb1ee8b64360a253e8cc26d24f8687b413ff9cc1df72a4c2 SHA512 ddca7ef8f67bdc182ccfeb6ed2e5fd08297287fcd5744285c549643a854c7d6148342a3ac1a13ad6cdd87c334acc5abc58a7f6e6a58f34db8ce9dca2b0802152
+DIST genpatches-6.12-6.experimental.tar.xz 78104 BLAKE2B 52c6578ce4e6d3618e30d8ec2032c7e7fb642b4eca551d5bf3cbd635c40d1f7fcc5e453c05ff4376ca0261892e73ccc534d74ad33b68e50eeb69486c9d0b8e36 SHA512 9e924b32bf695ef62c4009152633a188927702534e2825f66cc2bbd75ddf0bdb141c8a7dacea4e33b2fe259b1da70010ba3dbe4c44cbdd7164b1a37f6f70df36
+DIST genpatches-6.12-6.extras.tar.xz 4056 BLAKE2B 4d3a72ea884a1b6cc84034277d6cfb57f7cc3fd43e9d229b46707c07dcef1af73bbd61aa880805ca5746c3b470335ad48c10d55f442f3396f0aaaa9a7a23c73b SHA512 538ba6590f3f4ff9bcb44131393a95a677ee6c59b6ee67ad2519ff242fb182358cd217d5e0533e11225646ecc92e8efeb4688c332db70d35a977a8e3cb475787
 DIST genpatches-6.6-70.base.tar.xz 3723176 BLAKE2B 19017743aaa0e1c717746592f253a14ca476eae1658742c6e487023ee5a670473fe582a814a1202f2aeefc78d7dd3dd249810d7665299f740fcfceb1c8c11f84 SHA512 dfaa2df7ceb9411e9e35fc9f4822f7d579c1106b49c57805d657ec14699764a54e10d93f717801db7e33698b1c01dbab489e7b9953b1ff23feacbdec5a99c95b
 DIST genpatches-6.6-70.experimental.tar.xz 5760 BLAKE2B 819eec9931b944363d5da41bddcc17007f9825d6caa736e30869d175cceb138a87a2c22c2b17ebd070b583d69840d2b28597dbf80ce2835e1088cc6c7fa86660 SHA512 b6b1a58c549a1350e4b1479544db9658a8ad78f61dd3c486b909351c29e61d9d6fe97230f01437775d32711633cde4300be1b00bfa6dc9687e60b126427689da
 DIST genpatches-6.6-70.extras.tar.xz 4060 BLAKE2B 65cc5e2a27894992dd78d6cbfe5601f2e10b21f6e588d8a8d75f1f265f1fdab3ab03dd4d5c18e3ac5f48a6a72f021e2f125c5140224b26f0caeba3def4054042 SHA512 728495f3fa06f52f0ececb3b5e69b1cd4c7aa29d8ca02bc7a537616a2c1cf81859b5f624e125332a1def8176f7a878da58843ef8d363a5d622009b31548879c6

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.4.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.4.ebuild
new file mode 100644
index 000000000000..1d4087944e1a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.12.4.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=1
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.12.1-gentoo
+GENTOO_CONFIG_VER=g14
+
+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
+	experimental? (
+		https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.experimental.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}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug experimental hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )
+	sparc? ( 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
+		arm | hppa | loong | riscv | sparc)
+			> .config || die
+		;;
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		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
+
+	use secureboot && merge_configs+=( "${dist_conf_path}/secureboot.config" )
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}