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

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

commit:     b0b2f0a6337a134d52524d9fe11b8ad78d3743f9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 05:03:51 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 08:28:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b2f0a6

sys-kernel/gentoo-kernel: Bump to 5.15.152

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.15.152.ebuild    | 141 +++++++++++++++++++++
 2 files changed, 143 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index d7a5426cbbc3..27a36fd05424 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-5.15-159.base.tar.xz 6297632 BLAKE2B 104b3e6ccc068842ab71997f342
 DIST genpatches-5.15-159.extras.tar.xz 3936 BLAKE2B adb536a978a0ae1a2327142d7e7bde2871b1b42017d04b3302d40138b80a6fe72faa957c30437bc71c7eaaea1da0ccce1baa244ff62e71581c7775ff066dede9 SHA512 452d9370dc10481e2274261c01a5f9ec75086906158bd30f93314e2af8c095060d5a6760524c21412aa4752ca77d4818e1879c5d3bbd9378a63d56ab2cb9b3f2
 DIST genpatches-5.15-160.base.tar.xz 6317352 BLAKE2B ccee78c3ccba8755f0e9de9e62c870d7f85d5302d2cdafd178184bbbec51d1a69be990c49f58fe1a1f897ed7e59bba1cc5eacc7589b4476ee6fcac19a90b0e78 SHA512 e36a435f9e353cd48ee12322f998a2fb4e9cf29eeb9e6f6f95534a48524db17b6eb654aa514ddba1108135eb92da7ef6af54f532bf29ca89b566d8903c1456e6
 DIST genpatches-5.15-160.extras.tar.xz 3936 BLAKE2B 7b4d7802346372f862321837b1b554dcc5cd666be0a39fb56c6a6364060c3c5b5fe37d77d131beff6f0ed4c6290d9c9f9eafc58e9a923e268cafd2814ea9d18e SHA512 4ff242b000ce5969dd50c424ebe94a417271a2af081584e91d155ef11c3b11536fc8a242b0e536491396317ead92a825590208c5f317dc6a8975bbfae28a17a1
+DIST genpatches-5.15-161.base.tar.xz 6394340 BLAKE2B 9b30c56e1efcc866985caa448061cf8fb8973ee99a65c55787df122518bafa358760222944420add65ec777ad3012f06f74e0b8a4c2ecef32d5b882e78735ba2 SHA512 63cc6a96813f197a0d37e8a98a603ee594244cc6d18fd2e0fd566ea4a72866c425abbf847e9389472a7a3ceaa6118eb72e2c09d838db4698e0402f3a92bf229d
+DIST genpatches-5.15-161.extras.tar.xz 3936 BLAKE2B 3bbf29d5ff26051c5f115439f42a07a3af47a681065e00561f8636aae51142b82b87d7e2879839d5abc7bec944b193aac31d2eed543275b94f47dca2eda38090 SHA512 20e5ac4f8e8903a86cefa2cbb3a4962f3dd60ab56f71397208622230ea1f4d481d703d6594fa9269e46d2369514d1c6deacfcfdbd97cd50ad9ee63c220f289b4
 DIST genpatches-6.1-86.base.tar.xz 4574456 BLAKE2B 905d051daa077a0aa697ae78187ccb149c5e14dd2d171e451d85559b68ac0a4e8a80a3b13332bc2c8b58d8be182b12853b9e784adb307987faaac5d2ef43ebf3 SHA512 7d28fedd6a157a680de9c69d11f5d243c02b5714e0570bbac9d429ed1e5937bf7250cf5825d6365debb0b0621301cd4999dafd0680e4815e47ea1452ace3e406
 DIST genpatches-6.1-86.extras.tar.xz 3812 BLAKE2B 6e0dfca04eea9e737e68e8bd94f246628ac5a3e1ad911c41c7c61ce33baaf27b42805af53b0e7969d902078fe989e2b3122d92445b721f92209f5fa5a79eddbc SHA512 4daa5eeccb39c9c033541bb5dd123f16358f0a67f0b087ed0ed22243d46d429a7695f05bdaf84a229f3f483eb73b688b5dcb18110a87f9ad22b84eff24f765fa
 DIST genpatches-6.1-87.base.tar.xz 4590376 BLAKE2B 03810f1354881a70c49256a9b71651016c78aadf9d29e82e6077fec4d3a46487c530a987ef6785e78b149fe7f9c1f235f877382cacee59f6239366d4ac3bc5b2 SHA512 dd828b301272d8d0d80a9f51ce0b9b31f493b482af2cac7ab66b1307e3df44d88c7df4b968178d876bb6770b8408346a307aa5f22118f2bac7a35a045659a195

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.152.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.152.ebuild
new file mode 100644
index 000000000000..11ca570f5262
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.152.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2020-2024 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 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g11
+
+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
+	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 ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	hppa? ( 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
+		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
+			;;
+		sparc)
+			return
+			;;
+		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[@]}"
+}