commit:     f895b51888f73ba1cad4a12ab56d93db8e191b86
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 04:01:01 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 09:08:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f895b518

sys-kernel/gentoo-kernel: Bump to 5.10.125

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 31b0d213c72b..3ba21ad48c53 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,6 +2,8 @@ DIST genpatches-5.10-132.base.tar.xz 3685068 BLAKE2B 
f46967d4a4fc013f6b7edb2e8ff
 DIST genpatches-5.10-132.extras.tar.xz 3868 BLAKE2B 
207e7a4bd474202ad112c450b49e8ef3ead28eadfd1e35916a7ed7d2439c9b435ca2a6ccbb56a6e761b59580751c85993d3ffb6ade8908b8f1993638ac8cfa20
 SHA512 
ffdf7573a027e5fae644ab22358bdcf74c7d023e28d3cbd08f01dfc02f6776956320cd1bf4e91568de64bb6eaa88682f393a257233b310133f35b2badb4bee46
 DIST genpatches-5.10-133.base.tar.xz 3705140 BLAKE2B 
ea0136c10a49158b3baff338a098c00729cce01d1ef0c1d08b7f2e225d3e10b4b039be9d5265b93d55e7069752d9c224797b4bfe1032ea10910a4e70b78c0121
 SHA512 
fd2e06fb495c020768d671925301e359008f1c51fa49fffbb1cf8dc23b5793ecd1b563d2729b312a9929ca8df9a5bfa2f3bcdc4e4a099d299f80f65de9055882
 DIST genpatches-5.10-133.extras.tar.xz 3868 BLAKE2B 
30b7a0fc22202becd9b3517aff1f4ac797f6dd1437b108d5c694307641e158c68078514d7c2e32456162ee558659391092ee6e8e5cd0e7d620481563165605d0
 SHA512 
8e3ad4883726c772d2988ce9618c8fd1236760ca87c6645e1c7bab99fd540ae9cc1371a566bcfcb52bd816e3c21f5c83821b4e77831efe4f1b89eea63b3ff544
+DIST genpatches-5.10-134.base.tar.xz 3707528 BLAKE2B 
e601b3a289541d53c140ebbc3616f5e12d642490148e579bb681ca866841998e05ede2afeba018b671a1ab471d284a015b781b725e4a3449ab93ce00e4c794ad
 SHA512 
a5103de1223d9cf9431bf58ce76d58a7f8a6491a4301697d0011221e67c4e230e42c3eadc0c3882213b05d3a4baa7bbbbe0136530fb94e702ad43cd863740e7a
+DIST genpatches-5.10-134.extras.tar.xz 3868 BLAKE2B 
85ed4b88733e22c7b0500719b0553b5f58d3f2195ce17b01f750c6af339579a5d7b043b7c9e29439318cbc4af4b834d4dc2f35bd42afa3d933f8f2c0a5b0a4e4
 SHA512 
24342bee361389b44f795f80af7b4142652c3c27b40281b96ebd9e844c1974a626c5801d9840826693dfaaabb06ffc8fb54b184b41b6a3a0b3cc8f41f836e468
 DIST genpatches-5.15-52.base.tar.xz 2177024 BLAKE2B 
2fd4767dd3ae66cce6a179105389ce6e57ef0bf46f2ed5cb9a350d300472f813d22cdabbde4201acd6c76ca0c7701d09753351c12b4eea05fd1e93142ae4d526
 SHA512 
cc5fd2f260366f8b2715e09c4124d269b168bbacfd40ff36d6ab113419b30331ebd000adb01e5e6df4aff27487e528dc2f3e154b7df32d37e1f30f5c13e247be
 DIST genpatches-5.15-52.extras.tar.xz 3932 BLAKE2B 
8735d0c2d8e5e3a14f01893109e8feb179d6632e0dc3254b57d7545fb6280ca09bf9c2baaef7ec02bf337cb0f1a0d42f2e44dea2168cfa2c2ad20969b64a178c
 SHA512 
c461a48096d46bacfc4a2d89060b6e72584d74b215b3ba5c969529bfb4330672c15b7e5f015492e5b1ef081942eea60342a7d413af3fe28f2fde730b41553ac8
 DIST genpatches-5.15-53.base.tar.xz 2200544 BLAKE2B 
a6f1e11186e771abe56bb453d45f6228aed255ef6e7f8b93cde7cd22d5d6068dd7abc1a7025851ae27f7bf8e6076d5a78c009e940645fe39926ceff20cddece2
 SHA512 
bcb691818b050f1c9138827ca2c86bbfe43cf6521b9f802dc41c4ba4f6e42e11e79494cd54ac391bf1129fc30f7baf9272f81821df9ef8ad79e2553655606d39

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.125.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.125.ebuild
new file mode 100644
index 000000000000..161f70398d65
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.125.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##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+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/mgorny/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
+"
+
+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[@]}"
+}

Reply via email to