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

[Michał Górny]

commit:     005117b05c201a486b581592766d71f612875dbf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 12:20:18 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 13:42:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=005117b0

sys-kernel/gentoo-kernel: Bump to 5.10.152

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 3f677e06c3a9..6baee6bd1ede 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.10-159.base.tar.xz 4292244 BLAKE2B f2afd1af247c7c7833787f4fcba
 DIST genpatches-5.10-159.extras.tar.xz 3868 BLAKE2B 2cd0fc67c5b6f89303e3dcf5492b944eb048623c3ee865521933793af8cc2837d841e5f740035b1ad46a5b2f805f6fa8f1004f824ee3967c545c417e7c3b2513 SHA512 3b5b76c7220c1068ee2d29c48635655af4a227f542a870c3c140f7eea256f3d3e2c3df160c6bf193e595f150c2b51f66818c646af1ba679f94ec0c4086fe8b27
 DIST genpatches-5.10-160.base.tar.xz 4292896 BLAKE2B 23f6fc8d45f13b190f6fcf4532c266550dd186d48b67d8d48b839f683d453394b29c8898abbe730699c52385e28815d9353fec8c2efd8fdccb25d4102f5c2f3d SHA512 0f5ad6a3fad45ffc8ec01d43f02caf872d819e7f5e744207b2f6bebab3ec356e83e5208ac08ef23065ace4a67295621d2a5aa74b1c720f1643311b2819ecce08
 DIST genpatches-5.10-160.extras.tar.xz 3872 BLAKE2B 4168fd4f59232f91d3f50faff5bdff7da05e6b0decbfe5fa8b0cf7ac21a083eaec162d0be6422667a2e895b0005ea526ff134a4a353f035b442687716033178c SHA512 2876f3dcaee91cd20d5f41f77e0f375c3548b9d0a988ded464c9a39ca53f3b0ab7eb1f9cbe75b6397106fc48a869131724814cd7d01261d5f511dc3e6c00a3e5
+DIST genpatches-5.10-161.base.tar.xz 4314064 BLAKE2B 1f083e3d49ab20680612144efb9bd5202146c7790b572710417df25ce6825f3126e08efc404c3c83d8af5912478da44516112319804a59aed27aaa363c4567f6 SHA512 a18ac16bcc00b19b3803ad731f10a69af2d50f8dedab85e021dd77221840caff81c1c0ed8565b4f0f4ae283eaaf7b2239c12493798cfd7d8ac34dbf245c75bc0
+DIST genpatches-5.10-161.extras.tar.xz 3868 BLAKE2B 4bee960a0372d930fd91c93ef6e25467e814fab8afdcfdb19a5e31b0b900b9189322efa84fa02483a1db2f25477a2b1a3cd2e5ccee50a4db1e068f6a4ceac11a SHA512 fa2eb3d7914620282810ffc65a2ba9287c19c5819e67969d0800e7ebc9e67e9b2b8fc239c913b9b38f28f2ac55fcfb158949b55219f709abbe1b76194a22864a
 DIST genpatches-5.15-79.base.tar.xz 3195612 BLAKE2B bf8edc209ecc99da4f4c05b575b095992e64ca421e9848a75ef1ff7bca84377eec93ac3bc7d23bfd4c91d529cbf1693e231b606b27ba2ead46e9c3037db10c21 SHA512 c8cdadb66f904f2083f713a58bce743e56e27440f01fe98b3ddf82aaa43401c2fabad029060e7c01590dc294edcdfa8ec6c784f24ca87a1b9fa8703ed626e4f3
 DIST genpatches-5.15-79.extras.tar.xz 3932 BLAKE2B df50c7ce655f1f81d46ab6f077963afb0997ed2f6c0b70aa49c34a445d3f8938cce7201b75221705fe27c0a6f699dc553f932eeee7960a21dd89e3c55dde9306 SHA512 31e8c8aeb98e01dd1e0b25c51cfe48d5b6bc98617833229b283d35da6d7572b95dd8141592a2350ff01554bf80d918d2137ef2eb248c483ab22fc3db20a11fe3
 DIST genpatches-5.15-80.base.tar.xz 3218432 BLAKE2B f2478969a4e7a24bd7a30328e2d17d5daafa9fbd741dd7eb295c025f27c08ccf8efbde13003e084c509a8bcf5f1d28f45189a28467b31c48c2a4d344a726ec4f SHA512 60737de4d0f8e3acc02ed07a82853d9226daf54b3b5a1b990d94e78b3dcd9fae26b9e6cf8854e5074b88dd826d286440155b70c4fc19f271ce795b2bbcc61b1a

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.152.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.152.ebuild
new file mode 100644
index 000000000000..4824ab95a1fb
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.152.ebuild
@@ -0,0 +1,131 @@
+# 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##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+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/projg2/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 ~hppa ~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
+"
+
+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[@]}"
+}