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

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

commit:     cf3c48b155ddac7d9e2ced4a5556e7e8304435cd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 17:11:23 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 20:49:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf3c48b1

sys-kernel/gentoo-kernel: Bump to 5.15.54

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index f7f91b943a08..72df2b8c133e 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.15-56.base.tar.xz 2245780 BLAKE2B 0f5e5d7c8a29f590598f4721307e
 DIST genpatches-5.15-56.extras.tar.xz 3932 BLAKE2B 2b167a35d9dfe16a18b22318ac4597147fb25bef53a66108c2f2e4d6e6d3df1c9d4b1fd6d63ba4a8078f94f8cd69d14b359123355ba266ef72b44f7d9addca9b SHA512 ce91556981720f3718921993eb15f5af623cad8dc40a36bec6cbb0d52153fd1288bf97927daab1b1e3ccd1451d4295b109ead0160c657a00c62c2d6f25fbc09f
 DIST genpatches-5.15-57.base.tar.xz 2275504 BLAKE2B 23dad9d2e9dfc1f77f6e39f8d9e68a6e3168d581136d50d53b3503278bb5e4abfc25e2f9fdab63eeed674e370bee8ae7cc5c54058f6942abaa4eeac49258d765 SHA512 b675437c320b28f4b4ee979fff5c32ea607fd795b090206b49d66fdb95fc2ca1b959fffd33b9e5241a160c2f19902efc8218f2c39eaaa312a5b4149282e08b99
 DIST genpatches-5.15-57.extras.tar.xz 3932 BLAKE2B 670c631eb992f3ea25caa61037c8eb5135fdc1c9dc9e9cc91122f753fc2755f5e8a22a832267bb5e620a604a450cec7fe80d6b6ecbeb7fa5e5db2356df6b2163 SHA512 8f3685cae1613b3e93d33d67746267c4860d839d0a9917bd9668c7d917c83ee1300e1f7fe14eac5dc34de94f440de0127b65a2f862bc821c354e8c36beabb1a5
+DIST genpatches-5.15-58.base.tar.xz 2355372 BLAKE2B 27cb7a5b7ecb66f55a6c9b294e77e14f8c231df39953e19e0c6375ffc084a92dcbdad22e430987d771c89516e4b66b2e938347ef13f932fd593c38fe7c670870 SHA512 70968b3808b1a08d3041f6e9aa08b96f54f98cc26932a66bc8eb91663f83054615057f4d14e03bdd7150f0d83ee371cf718a1bc70ae9f41124afe506287d754b
+DIST genpatches-5.15-58.extras.tar.xz 3932 BLAKE2B 00c41224b6449df6c03c51b0528ee7da9b718d3feaec3dae3f58177983645e2f798ce8221708d7a470a057e37f1d7ebfc3ac843d97b3ce920e671247ccb6bcde SHA512 194275a95d28aff48262aafbc770931b1add0861c1333122c1b82e95c5a39c318a1d57fb2bd5c986f806f84b417c2050287ba55d91d8d40e93541c41cffb7951
 DIST genpatches-5.18-12.base.tar.xz 549680 BLAKE2B d6973dfb0d7749fadfc511b1092dedc67b3f8a57e2a117674113f43177bde8608b6106c4c84fbf5f5a161b9710cfad28a3c2fd419fb3c4088d98f9a504ae0cb8 SHA512 c7ad63058bb77c92d3ecf618a41164476a56f2b7b879c667c7fc9666fa1d7f81b599d6ffc5f0fbaa3223e7d399dbb6348ddd511598581083f7b78d505dd81e7c
 DIST genpatches-5.18-12.extras.tar.xz 3920 BLAKE2B 89642c29bae1b15664749c11e581ebf1d0b42801cbd3e436805faaacc419fa7d946a05e7d37bc8d056e36768d181b2e71dfdd6b28943ea112dad9f17a9c2bde1 SHA512 301cd52af9db5a8ec91891a0258a262261d87cf22cb01c27a531d0274ee23d0e928977abe8f5928d3dcba430d032a3cb418193bd1f3e09a923ca6e8718ec7420
 DIST genpatches-5.18-13.base.tar.xz 578484 BLAKE2B 03215db005e5a3668898b1ac4c25aeee5f20d6802d00b11d24d41f506ca9f730f031f5cde187f81406a3c75937d65f854acd3c0e2d2cf9f9cb3ba99454304180 SHA512 bdf29085cf76022aa21faaee63033e3231b9757282633eb5897717128bc340cbf38b12a2918b169b452e85aafc9fadac2645df414f877f43950a3147e00dea68

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.54.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.54.ebuild
new file mode 100644
index 000000000000..3e9875ab5936
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.54.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##*.} + 4 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+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 ~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
+	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[@]}"
+}