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

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

commit:     8740fbf2d2446b63d10cc3cb135f45c07d9acf3d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  1 17:05:35 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec  1 22:21:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8740fbf2

sys-kernel/gentoo-kernel: Bump genpatches to 5.15.140-r1

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 768532743f97..62ad9abb8840 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.15-145.base.tar.xz 5716840 BLAKE2B ab0ea42db784aed619fbbce1600
 DIST genpatches-5.15-145.extras.tar.xz 3936 BLAKE2B 3e0d75d0029aa817b3e7f184b34150adaf337c05f37122a46290b24d4769a1ff1b5fd82adc2a50b09f2b0be235ea9f4f06a4c3111dc68cf2acccae1bd39a0d67 SHA512 4f3e94e59bffcf5a9f6f7ca98c34c7302ad843860532e6022f6ba33d1d9c1a89b3dba606ec771ccbf063f01808fc51b9a1162dd8aadbf898d17759488a04ef5d
 DIST genpatches-5.15-146.base.tar.xz 5787940 BLAKE2B 7926adb4f543d2cdc99a4ea1340d58599cae1ddc14c6d0b21701700b6d63dfc8814714c964bd955d86d42600697c5a45b8fdc6d26eee7ecd21a627e20c230025 SHA512 c3354b3b5a9ac108ad8a6ec2db9d69e6633bbe464976cd9bf0c91f3953891b1ebd8b501d4318161849cee4a3040b61c711f8def3cd66f4a2c5aa03ffa3e7db54
 DIST genpatches-5.15-146.extras.tar.xz 3940 BLAKE2B 4eefeda553205910fbcf214be699eb3ef7e99fd6d5693f50338262e99a5f0fbdd42321171aa29e18792af5de5e86d45cbdf538537b0bb4282695fd5b07414e87 SHA512 8855066d40f32931f768588c0f660fdc216f2a4b8a1bb17fadb7c2589e0764c846cfce70499af429b048bb514e51ca89e88c4319fb56d3ff5636baf0e638aedc
+DIST genpatches-5.15-149.base.tar.xz 5788128 BLAKE2B e8ffa65bf991542507f5c890ce96f9cf2a82fe4e4f996cc3fbf38d744c231f1d6c05d337bd31777dae9ff6b6b354f99d338262fc7ee479ad11f0bbce8be42c14 SHA512 afb377cb6ef87b9a23a6023d7832fc97928809a45ca01ec2cecafa370466a7eec5ee5553285a3b1477d0e48c8746b7cb61c23f619f5ab3566132f9e575ba131b
+DIST genpatches-5.15-149.extras.tar.xz 3936 BLAKE2B de630fc5c43b2fa8cf63faf881c8949a07fa3adbf50b2b11b1e390835b89fdd04c28ca18c097d35164705527e97aa4750c58e7ed29e92248e9cf45f6f4154fbf SHA512 25a85e0bdbfbbe10e0576445032ee49e3845beb83291d10352409da14a612e0c48779e4635003752c9e0befddaa577d2e58d703452e7b40de7ac042cc840f612
 DIST genpatches-6.1-67.base.tar.xz 3816044 BLAKE2B 9116263f1f3cbb472ad09ad785eb643cc4deb16f94936196c1dbb3d500b6e20447d07d434f4fbc59fe8cfc03076da0aa0ec22a3c6d93e09d0dfed6d6fdfe7add SHA512 609935fec85285a34e4fa6032f552230aeb7aed1caa867d34810a25f68c2295e0a8f886e0a093f111b1623ba364cfd6e17b237d670d42c8c539778810a02f681
 DIST genpatches-6.1-67.extras.tar.xz 3816 BLAKE2B 6aa8e9614221c2b9d84df9f75e5b8eb530ae8752b406ad698be86a8031b47940f9efb1de9bedfa0e466d0bad32dae60c5c639815785353a49e4b439de79a80ef SHA512 a911476dcfa9767f4adb946bcdcbe475e78f83753a7880a7e3a96aed347f1ec520ba8d75fe4e5565b2aded25965cecd3c7f79fa12009af043f7408200e27189a
 DIST genpatches-6.1-68.base.tar.xz 3834732 BLAKE2B 3fc3dd48708491bf32a17cbb8c23e531e2b95e60ebcbe3faa6fbe2c60e610aad9226d1846774ddd2af56e985371780e10a249a50e2ac46d7e482428f67b289d9 SHA512 28b810ad914e12035ef724f7dc4b3cc6226cccad4997804a9e3ba5a4f4a420f5f397eade002dd7a9231efc2b0c1850c40c44bf5daa358c24e42bb50da05141d8

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.140-r1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.140-r1.ebuild
new file mode 100644
index 000000000000..c2484efb4288
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.140-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 2020-2023 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[@]}"
+}