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

[Michał Górny]

commit:     505e08f5c71b2a255bea60db9212e686a8933f24
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 23 13:53:15 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep 23 16:39:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=505e08f5

sys-kernel/gentoo-kernel: Bump to 5.15.70

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index fc418ce0f649..826427b02a03 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.15-72.base.tar.xz 2987972 BLAKE2B be108e6921f5a04605ab7c557e1e
 DIST genpatches-5.15-72.extras.tar.xz 3932 BLAKE2B 00c700eb5307d1834977c88e134fc2bea16f258d6eb374e6cb6d85c522cbf1730d6e2e937e7abb392350de8aa3cff6811f5ac0d3b93822fbd9a43c20abb525c2 SHA512 a08ba388711c30d3c101ebbdfb671c63f85ce3d07ba4545c3b01b70687d65f31fd9a1afadecdc49f0d9b113c5596df878acebd425b868ffd9111a555d4ced47d
 DIST genpatches-5.15-73.base.tar.xz 2997804 BLAKE2B 8915a7983e7766c43e7e4fb91f38ba690e60df58fb8c7d6b5f833b21df459bf5949c35e510275c793f6987e70923cdfebde739f498ca16f772920e262f391172 SHA512 3859fc75041d4c7593104e158ecf833fb0ff07aedec5143623132114308d9c877a9f2a405d83cf442f0048c046c3fa3700f51ab836de448ecf2c7b4064630c61
 DIST genpatches-5.15-73.extras.tar.xz 3928 BLAKE2B df7fca514f8db011bc263a94cba0406c7b95d2befcdc2f50600b1e71fce6a4e7314624a4eda38ae2037f4eddfb6ca4873b407fd075ed4b5ce23bd326cd03c48f SHA512 d4d5562d77ee0419bd17e0f447c84977a3adcb598655ea42eef83ab5452555dca4e2dee2355cf834c215cb22b12c9ef809da80108375d3a3aed09fff852681f2
+DIST genpatches-5.15-74.base.tar.xz 3006272 BLAKE2B aa1fb6c630e8ec452a067f56682ba7ba99185de818c6c6d8db467818dad51336a45b73485a76d788ee4ec0966fc7fabfc88074856cbd0340c8d26b9b448c4980 SHA512 b339fd9bb8916a37c2c78b4fbcda69a836e85fa88e4d96ecde37c64a7bf481aa847c5c5e76db8408eb8bb066b875b5b290fefa7b86d11084e138539ebbb423f2
+DIST genpatches-5.15-74.extras.tar.xz 3932 BLAKE2B 56ab108ca50876eede0c3aa9abdb7c1b4aba485b9ebd5f72b065d95e5f75c776b5454f457886cb9f3d3107438312f66af94543b3b95cad9b4dda20b512aaaa2c SHA512 dbea0a898270dbfed6f9622de259a54dfc2f858f32f7b456b71c5de7e614f390e87e200e08fedeb930622808c1d70d611931f4e4b36f227ab9b0b35307e35623
 DIST genpatches-5.19-11.base.tar.xz 766852 BLAKE2B bc8fa5969dd4c75920a094b5135f60d728a36a431fb5213c338f6308761b7f8ce24e3991a2de70b7c2d87a9256cafa3b22db7c683e38fe10363b15043073092f SHA512 6cd414842f48d9ecf85e0f07fd930e526db089720efaf95916b8ec9394f458a6b1bf178c8e55d6ecf9a7ec5520cc43c50cf1248a8c3467ed069594123586ee1c
 DIST genpatches-5.19-11.extras.tar.xz 3804 BLAKE2B 3186d10e8a31ca501f36ae3e7945acbba7a17cd7d006b51a7a4136d2c1064efb070fb7870f4b1959eb87456131608b5d31a91987c79f8720b267537a38643211 SHA512 10c4b7c51bf4a891ee04826df0da29096e31601126435bcde168f7c3d32416395844e03d3fd55b9b225c7c8dc0216ae8691705c53786f06e0350f6fb1ec03f69
 DIST genpatches-5.19-12.base.tar.xz 780072 BLAKE2B fe63576626355f3fa1638ca4de11e63342b6302c068401bd6990b56ab96d28f7bfe3066dbacd28022e5117347980e19df06dce20b021d67fe5830c71bc722470 SHA512 ae55b6c32eabe68ea2a1d4a319b0ecd5204be1236275b6d113c9fb44ff449df61e9a10c28399b4c1853763779145c71708f67206e98ca51fa535a90e3b316ebb

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.70.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.70.ebuild
new file mode 100644
index 000000000000..4ea02f952baa
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.70.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##*.} + 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/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
+	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[@]}"
+}