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

[Michał Górny]

commit:     1c48172908c3e691e02e71d470efe505313b6207
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  3 16:08:41 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun  3 18:52:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c481729

sys-kernel/gentoo-kernel: Bump to 5.10.42

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 9d93168d3bf..10e6c18d4f4 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-5.10-43.base.tar.xz 1461848 BLAKE2B 
fb1bf2fe69c6698cdbd345895010
 DIST genpatches-5.10-43.extras.tar.xz 1772 BLAKE2B 
1c2c2ec1b7a2814572b464a02e582821bb04c143524dd98ccdb330463230e1370167b8fdcf269d137f4087d21b60ba07dc72c5da2d47f8dafbb1a9598611b804
 SHA512 
e8085e8d9c5a82d9d8b10d2212577fc3878beaad4e52f145bd5490b3e7f440762f95ecb7a2266eb99a91ce7d98fbf48f241eba86329aa35a1d9103733e7195a1
 DIST genpatches-5.10-44.base.tar.xz 1463796 BLAKE2B 
b4e002718b2542c1806eb89cd552f11e3ed9b3a2c2e531c590d05d8796bd6a462457c1afebf1794e10dd2419c45102acb7d4e371055b1ae750a959bb3720ab96
 SHA512 
4e0d54ddc9a43427c418a9c0891b8dd02088a9b75ca011328401af994c54a5fc5498db228f3ecd6aa752afd058483f460e86fbe4393c24815974300108e7324c
 DIST genpatches-5.10-44.extras.tar.xz 1768 BLAKE2B 
287454aae7ff60ac375b570e5132c33f81471348af58b999ca1355d15e7fd1f0839c369e28e18496dd0f9a43d6bbaed03318a9358a5b9384c3f27c109f7447e5
 SHA512 
d69a0a32dbd79eafe4168bccf55c0b0765e5311bd2f81ef93ce4f709990b6a789eb057b2afac7364b18e5f811b9610e7d8e10efff07a6e396c8e897b76a50378
+DIST genpatches-5.10-45.base.tar.xz 1520656 BLAKE2B 
b2dbe0274ff6a90e2e8b5edd99b1505654f4e7fa777e8944a0e7ccbc23c3c8f938e061d470adb678f4a177738b22d855812c38890592a55f6746ff1f52da4e93
 SHA512 
b997601f68c852ceed6307c2966ba7eb6f7f4e17f30be38153b6b6604d0bea18ab0f4f66a1bb79474b0b330e30288c441026df18bbb761acb071b0f8ab8f00c2
+DIST genpatches-5.10-45.extras.tar.xz 1768 BLAKE2B 
c7a3221f2c330d1463f88ce23d0ac70692ec4f390b7a10cb6ce6be19e948f8595b2b7ad0fae90b4cf1c94bb8c1469be545cf3352b91e99b93cfedc7cfcc9d7ae
 SHA512 
51e28cb3d536e4df5743c55e1f95803a44ffaca7da75ac73dbe575051ddf3198dff4c69a0bf32fd479962ce518f5ed57be8fc3c71f426edfafb814c350f16393
 DIST genpatches-5.11-25.base.tar.xz 1030312 BLAKE2B 
c3e0f5840c32292d36be31a8606934bfa1ccb7e31f04cd214574009577907d00912bacce1f85dddeda77ba99f40f61fa5aa5259a693c74abd63a05be5a44f2aa
 SHA512 
5adbe3770562b57d7180a44ccca8e665cc5b0d9ba5168c4b3555b348708edd7469464bd770124d9a8641095bdbe786d843ae3da64b845d577999c9e40360c970
 DIST genpatches-5.11-25.extras.tar.xz 1772 BLAKE2B 
0bd2afbd93cd7553c8e058f61c515ed9d47e9f328529e6cf36a7100b363dc8e4c3004afa06a0c0b95963bcf69a216ae6a7bf595062401725a4a25f942f44a3e8
 SHA512 
114094a87bad0dc4a265847fa18b88a2795daf151de8451bb4fbe4af70f3f4bcff8905d8d90522f85914bb7ba7227ebab7f69ab59112afb2187332b393450fec
 DIST genpatches-5.12-10.base.tar.xz 564792 BLAKE2B 
127e64196c8aa0b65dab7de4dad4b97052c53451f27a1948453d8910afd59b3a5c4ffc316a439bd053b433b057df127bb252d994f6447a82dc1434eb317e0d1f
 SHA512 
e4c9eebb61de9af0fa4a53472c18f39f87196a804c63ff796eff992f75450719400e7bed5cd8ddce6b09db8330be443ddb2ce0241d8058aedcdb5e332a4178eb

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.42.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.42.ebuild
new file mode 100644
index 00000000000..624447890ba
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.42.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.32
+
+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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~alicef/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/pahole )"
+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[@]}"
+}