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

[Michał Górny]

commit:     e6d5b6b5ee0de3d4d6fdaaf48a1e80b95b223693
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 11:19:01 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 13:42:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6d5b6b5

sys-kernel/gentoo-kernel: Bump to 5.15.67

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 55f530ceab8f..89a9ef24fc32 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.15-68.base.tar.xz 2897744 BLAKE2B e1aebd74737e787df999aabb0153
 DIST genpatches-5.15-68.extras.tar.xz 3932 BLAKE2B 34fd77b8464322ad369de5b86dd8dc83ce7510bca139d4e6036b0b2ab34d1c80698b5f965e44a09dd25ee3b4d80abbccc5920e7984803be2451281c74ff735ea SHA512 970a1e5a03f786d05bb1ae9217a467442f16344fffcf2c77a2572c6db656b0fcd5b3329eae193999c47bbb45c8b02f0fd9010760ef74a6aacc474729f0ee9369
 DIST genpatches-5.15-69.base.tar.xz 2924208 BLAKE2B fc4f14592624fe2516c917425c04eaeb7e45073fb77e5830fefee93e3d25c448c8a523862ae89cab99220599c7ab5992d03cb5f81354236f77bc2e21ee802fe9 SHA512 ebfcc2c23304a6b316ecf226fab1200cedc7893093c99ca50cca4c1ad393dc5abcaaa0f2d4789909425a8eae2ebf57d4651f95eddfe40ac39522c95de59961d9
 DIST genpatches-5.15-69.extras.tar.xz 3932 BLAKE2B 03a0b738dd90047356abd306bcdee18e7468d111dcff28cfe4bc39c7328d146c69178b1fdd19cef92c0076ad981e845f2ad37778a0907bcf0fa572011d747b08 SHA512 bf29f35d834d6113b68a3ab0a2c2ab2b241c2fa13e47f59669d23a6510cbfb29d24f5947582b2c24f2e4e3170e798d6d0a4171c47973399431a32b76a770488a
+DIST genpatches-5.15-71.base.tar.xz 2956404 BLAKE2B 20b54274b121a6e15d8960cc62e63e822db1d5fcf3a3e2f3810b70026015b405af6c5840702e418a13da2a712653f06a3f5d8af3de2157e40f1b41c8e0299a44 SHA512 ca2e20c2b6db7b2d064730650c1645524558d91de787aa947849541f2a6b0d29c919307373b6ab0a62cccaa0bddfed382c7aaf5d4b00620e1ce97d4983ade3c9
+DIST genpatches-5.15-71.extras.tar.xz 3932 BLAKE2B 53ae8469ceaf8524672ef9f7155dc092558135681438ca8dc233dcf99d458a538902ee805d8572b8ec47203966177e3cf199c47ba3ff48ceff7ae1e7844c2707 SHA512 c35adfff42a907787088d7756f77672f321b5311e08c639bf4fefa344517ea5f1d038e50bc3bbac3e321c16ad3b0ee9a35ca96f031820817ebe063b79a98a7fb
 DIST genpatches-5.19-8.base.tar.xz 643396 BLAKE2B c383c7efc908fa3e8ebdfb750d92df6adfa1e0d00f253eae40fb5db5b84f8848a5c1a4fdcda693da998b1ba9d1afb1019cbc2574ceff2b099d2125ead515efc3 SHA512 ebd5eaaefbd362d85fa8cb95b0ca4192bf7a0835ec58ea25def13e502f87f74bcc29219083f39b85462b262f526f771270b5a8d93ff49126e1653d948a9ccb9d
 DIST genpatches-5.19-8.extras.tar.xz 3808 BLAKE2B 8cad0dd5deaca8f8b379c96cfad02add0cfe7498f17e84d11e6b809e366ae0476734bd003b287456459febe2ff4c1fa7b3e54c47243cd571a34ffb1cd927a1ea SHA512 a183d09ba7b1fc3f89b7754709df8d093ba70b09f71e237844214d65bc5821b6328c436c7ef697c30bfd38fc833bd178497190a2e73914a03ec0dfa4cbcdf7f2
 DIST genpatches-5.19-9.base.tar.xz 665036 BLAKE2B 0d0f0305b82cf97240237cbde866bccd757a27ef91d23843feaa5d05be9f4d647165ad69b796d21a30bd7d92674b6be873aa529052a41ef8c200ee781a3bcc6a SHA512 e86ae26fdc5e0cedad066be47ac7d162ac7f546f253855394abf5c6da02a1c2ad99ab601fbb54775ab36720ac3e8161c9bd3fce2ddcf1ab451e30bd680ebf33b

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