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

[Michał Górny]

commit:     81c831b030433ec522795da8f4d76709da3395aa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  9 13:49:40 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar  9 16:25:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81c831b0

sys-kernel/gentoo-kernel: Bump to 5.10.22

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

 sys-kernel/gentoo-kernel/Manifest                  |  2 +
 .../gentoo-kernel/gentoo-kernel-5.10.22.ebuild     | 90 ++++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 5e8075ebf8b..24a3e62e380 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.10-23.base.tar.xz 721640 BLAKE2B 
ce1bc52582180682df3a74f5fb03f
 DIST genpatches-5.10-23.extras.tar.xz 1772 BLAKE2B 
71ccb1fcdb038c28d8e35c5f93a3956cfd277df6cf9ee0b65a1984044bc032fc979066fb1f7cc103f3065d83b72ca2a5f6d7df76a163630127858827e1a34b6b
 SHA512 
3854ebd16b7dc0fc3c2a5aa40bd74bdcc1be1597bd4196b488e40deeed5917c2df162c1b27079f38c3792b30de7f100e90bc9db42fcd12cdc9d3647e12c84182
 DIST genpatches-5.10-24.base.tar.xz 754560 BLAKE2B 
6d3afe050ca1fc8cdbaa4597249acc0798fadba3a66c14bba3e691d00eccbef3f17eac06113087628a0a973dfb64f79edcd6131a62798a08ceb3f59bbfce81e5
 SHA512 
b79544a7f6714bfed0368093bf42211a835afe6c2805a5bf30ba1ca046bfab50e58643f5c7d5b4453f7bda28162b6f153b0ebd385244811989db3dd3ec656dcd
 DIST genpatches-5.10-24.extras.tar.xz 1772 BLAKE2B 
c49659f3d785406da04f773fac28fe4159dcc996941a0f9e67ef02381f3d31c548921eac82ad09c512334d2000109820319d8f84beca6ad78ba74a79b15aa82a
 SHA512 
470b81f57a4a25697b272fd4bbdd270dd32010520139e9386bf0f2573383de81dfeeb9cc6cc036c280cb8ad9da444ae3be0306456a4210c409f9bfd4a8c2a84a
+DIST genpatches-5.10-25.base.tar.xz 765788 BLAKE2B 
c86796b881ee8d4d471372dc405c409e55c15fdf4b19f51ac0837e0663ec98930b85be50f60f665c28793ac8fa38df2db0877fb6152765acd36da3df2e26c182
 SHA512 
cbe24da6d68eb2bf3190b3559185ec37d54e623b117fa7858fcaa43eabeb001941c0db8a1b3fa817537ba930bf726f350df9ccff8e4a82d368bf8b3125ba1cc3
+DIST genpatches-5.10-25.extras.tar.xz 1772 BLAKE2B 
deaff4896b8ce8ea5387ea49cde3e0e1aac77f16a1f8fbc673ec3a71a3c46fccf34d65177f00023345355f09adb3bfe33d52aa046686267efb924ea1fde757c1
 SHA512 
cba0da17f51de2b58c2f369f4eaec3f1f05c88c7e49a12deb392a0542a02337549eb7eb960d09873d1f7fdd1c7b07be7d2fb592d64272d3fb6957ec6e0974658
 DIST genpatches-5.11-3.base.tar.xz 11280 BLAKE2B 
83a975b07b3e04e19b008e5a5c4f08fa551b3558b68afb800cb3c886f782a21950d5ea1029b631a6caa2658f02e7ae819e8d8c137a076470120d94deab99e524
 SHA512 
0a8b19f888af853e6a12aff9d6675f7a9977fef92efa19e69c79a6325fc1626efe7aa9fec8c42ee65ba29f0757b166567679a54d0351f19ea502183e92a63ac5
 DIST genpatches-5.11-3.extras.tar.xz 1772 BLAKE2B 
165d5928e6afc65544392186737efd1df9e1179591ef7edd85a1868971ea76016161a38a615e9e692c4515fe7fc19424a0cfd01420b5ec57a60c8d1d2d223cb7
 SHA512 
c74015c4e1b824c61db9e9deca6b30a839ae9a8fb5747cb6c46e2af99a9221f11bb971099554107bbfc58ea5389d96e810f9cf8e55d0bcc16a093eef941c6ec8
 DIST genpatches-5.11-4.base.tar.xz 247120 BLAKE2B 
64e8bb77aa399a797a9dd9726ba51a00ec43d850504680c52b9fe3ebc1277e1e2216a43719bd79b12e3267171f1031feab5adffc35bfffd87f91302b9f8714ee
 SHA512 
9480fa377439c010f6aaae8c5ec6a512070cb30bb6171e31617dbb24ef54687d13bddf4768c5652d8e8c640d4c6b9c85fa0b434d8634d58154ee205db2c1cf28

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.22.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.22.ebuild
new file mode 100644
index 00000000000..0bfad948130
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.22.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 3 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.18
+
+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 ~ppc64 ~x86"
+IUSE="debug"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+       debug? ( dev-util/dwarves )"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}"
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       default
+
+       # 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
+                       ;;
+               ppc64)
+                       cp 
"${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+       local merge_configs=(
+               "${T}"/version.config
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+       )
+       use debug || merge_configs+=(
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+       )
+       kernel-build_merge_configs "${merge_configs[@]}"
+}