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

[Michał Górny]

commit:     9832799f3474049a3b1f976bea0693ca0434d400
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 13:45:30 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 17:03:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9832799f

sys-kernel/gentoo-kernel: Bump to 5.15.25

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 469a66a58d0d..34dda60bc1fe 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.15-25.base.tar.xz 1018612 BLAKE2B 493b8c695f2bfcdfa36712143ffa
 DIST genpatches-5.15-25.extras.tar.xz 3876 BLAKE2B 17a20913e907e6b6a87afdd7775b7f9811bc3eed5374b957244242fdbc655519606063656bb8e5f51ded3168f73e99832d0cdf66e830811dc1e5ea0c0b8a2582 SHA512 1b8f4424996351a70c26f5a90c2490078c1a8daa80da578e2e3b3d1c4be6a4474d40cbd2e6fae8b1f1b9389cdaf2257e01a14ac6c2f7ece8a883d745555a686e
 DIST genpatches-5.15-26.base.tar.xz 1059876 BLAKE2B d3a7b03647f3ce4a10ac4b75e52723d26cd56f880ca786883c236b3569c7312555ca57325a039bf9713cb44b930190b2e099de6ef9d677a9cd5e8ef9179fb52e SHA512 241f1cf431626fd0f406f5a661363a29293a23057c58a4cf63bce6383d126e4f276be371eda670abec8699036d46c1896788f1f56d47239fdb9eeec6d5c8a51b
 DIST genpatches-5.15-26.extras.tar.xz 3872 BLAKE2B 84bf993010dbdf678e9c42e5807bcd1cbf6066d0ffacad81d8a3d7c16c65cf0b59b219e691aca1fb6932e6aaaed9a0eabcea8921e8042e5e6f57d0ae45e53826 SHA512 55cc9f5f2cb30f2b81b7815254d2932f851f5691fdc92c5a01b3a8977392ac9eebcb77b826571530ed435c4504560dcaeeab65e0c51c35c23599876b4992bb62
+DIST genpatches-5.15-27.base.tar.xz 1109928 BLAKE2B 4f6113b0b1c378bec52a94c420265c3454b4b46dca3ebe25cf9bbd3d65761ac2d1bf14a5f60afcd974ceb319036c4e84adf247632bd93174dc144779d1169f8d SHA512 77f39c84e78e64ed221a813292a3391ba1252c7bb5206d78f2e2c4b8fa3e6f082cd327ac45c30851840e62288f2958470d271d9ad2afbda2fa9f21d4b4f07c56
+DIST genpatches-5.15-27.extras.tar.xz 3872 BLAKE2B fc757f0d4fcba7b53aea34736b7a0cc0a7ca14b73bd9c249ad2c89b283475f3b53e4391870a239bd329f00e55c056f05cfc270ad00d57acd69cc26331cc20931 SHA512 102dc6ec977e184ec07cc3cdc2a39285f291bd3e3a344b5e53935f90319efcb5ca70ea1936d5d37ffe03f66148aad4e240508e3cf212d483abe145c21e6818c3
 DIST genpatches-5.16-10.base.tar.xz 464508 BLAKE2B d590a7041f6309674e8000c735a232bb2f70d872863e4122fa5a8cc8bc0e68b641685b4bfb10c81d286124084eba2f6815e9d650978b52fa2fff70508ee361bd SHA512 cb591c67a3253b35d2d8dcbd229231507d28cbf2c1dbc2f734ba7e0fbfbeba6ca400f99bee6c9b94c90fad5facc9ee46c85fa4178087865d2e942a0717878a60
 DIST genpatches-5.16-10.extras.tar.xz 3800 BLAKE2B 79c288854d58ee20f8377be8bb15ecdca30b27fbfbbe314c2db7260576036258202f620d2ea2c2a6725fca1fe68fa1a158b207d36ae13630b3116397c3868cc4 SHA512 34069ffcf17636489af7d6df3e322926f566f43396297867c2b1a512fa884062bf86d50675c313ff29ed68f6fdb9039748fcd14c9395e29e9beeb166f45eb25d
 DIST genpatches-5.16-11.base.tar.xz 516420 BLAKE2B 3e3d1a7ed60355a6d0911742fe1fe27961bd6efe16c25bf700ffc9aadbd8d02860d8b35a9fa3de61bd6d59024364e698cf4d78a7abe2eefdadd79b5aa086778e SHA512 d513a67f55edd3ea469b36ecf93eda8f623fb2f899c8cb373ee5092838283fadda029db6d97687dc27b734634e666106c054d0f35498af086aadab4aa59a2e7d

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.25.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.25.ebuild
new file mode 100644
index 000000000000..a918564b8bce
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.25.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##*.} + 2 ))
+CONFIG_VER=5.15.14
+CONFIG_HASH=8cc461d9cfb256bb831225bb38e29fa944bd890f
+GENTOO_CONFIG_VER=5.15.5
+
+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/v${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 ~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[@]}"
+}