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

[Michał Górny]

commit:     00542289140d6440bb92e623740ac6ec30162db6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 23 17:07:43 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 23 21:16:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00542289

sys-kernel/gentoo-kernel: Bump to 5.10.46

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.10.46.ebuild     | 105 +++++++++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index aaf91e5a037..b6e22560b41 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.10-48.base.tar.xz 1580692 BLAKE2B 
85f19398f7a3967b471077c1957a
 DIST genpatches-5.10-48.extras.tar.xz 3408 BLAKE2B 
6f347e53aa1eabf134fdd4f234d794820d9aedf126084615fe5eaf29c8e8f30828678b9df544ed39a9ea47e9bd9e5b1a93ea94a90a7aaf1234354cdd011cbabb
 SHA512 
3d19cb7079c56c7675a16302c272a1da1b72b902d66f341428747aa12d1fbf949366e12ed5501bc15d92ca89eb93b32eea283156ac5317a75f11806907e55cad
 DIST genpatches-5.10-49.base.tar.xz 1588092 BLAKE2B 
d31ab75b6106e81654a69d1d0cb1d765cad83fcdb20a4cad9bf44749146aeb4c19cb6c8bb743b26ec48cb6439c64f8b3af9011468ba6b140dfcdd00adf14286f
 SHA512 
cf6973eed088a99b9e9bc5822f87e75bec61f94207a783f25ec5e835fde565dfbc04fe3dc5c6709f213479b86bbfab26003661108607a17df0169ee2ae5f43c3
 DIST genpatches-5.10-49.extras.tar.xz 3412 BLAKE2B 
3feb28c887152586b0e5c282e898d447451cdc7b0dcd0749d69890b72fc1d38f9a0a9dfe62d09c8f37ee198ff809edd949137503dafbd63120b566a837c83e32
 SHA512 
dc916a8848358891c749ab2853d49a2e5a3e7cc0c696b4f523902c5526fe3463730209bcd9a229dea86ed628a8da63b16316b565752e4eba6ee68381af92b6c7
+DIST genpatches-5.10-50.base.tar.xz 1622300 BLAKE2B 
edc737c022aa9855ce8afa6120618376dc1fed512f34a8269fb209389abb8292d14ee1c3020a33af181d099b6acbe970f960921790f5b356d742ee61750d34f8
 SHA512 
c543389c2cb737b874d91b4dba700c7709aa3997a3bf7c6831bd0b543f8611f37a5d87c4b3f9b775dee2bc3a3856ff0b34dd35ad8cd8ced60d00a880e7e7bc75
+DIST genpatches-5.10-50.extras.tar.xz 3412 BLAKE2B 
cb86ec70bae4b4260f973dbb23251e0c9f9841b12cd3e1e405215e9d54828ed4f7e32aeed131000f7ee467c3b23068f1dc6ca7e056a8b0308add810a0d6bc7c4
 SHA512 
39dffaddc87116a9ce91fdd07e9dfe7b4ab9c8c74328f3a6e7fffd5b2258837f2e6ccbf27d394fb4be15792c032b12a6289d3903a7e9e221fd411028d78f0073
 DIST genpatches-5.12-11.base.tar.xz 611232 BLAKE2B 
af0db172fa831bc84b1935d387e3d7b360c5a94d8499b6fa204f21b7a822c844e88a87f4a2724d0b8b508676ee564dbbe304893bfdd3197d67c8f6aeae011cb2
 SHA512 
f422bc1aca29732db09184ca2fcf7478536a87e73b59325f063c73103c8ce425858baa78b185eab61a80dda15e3818b45a669c69f7898382aa3563b315ad45b3
 DIST genpatches-5.12-11.extras.tar.xz 3412 BLAKE2B 
2eba600cd1e769a7252b063968b87cf5f54f285f791f84089fd1f3060e3400a76dd645841bbb213830cedf274e41959ed48cbee081d556c82f059e2a3de4db51
 SHA512 
2bc29ba1aa4b71b2407906f2c86339eb15fb124f964ddd3fa9f4a39dd94ac18fc95d0780cf1fdb99286b1a27aa88ada32665feffd9a3ca7f53bfb66f0212e7e2
 DIST genpatches-5.12-12.base.tar.xz 650292 BLAKE2B 
81b5a3b95390522c328acdb390fd1e8515028e55dee9a3693992ce2aa5c2defcea37b14c385d72e0c6a9b31f239c7d02eea45e4428332f477e897fa94c02d71e
 SHA512 
bea0fee6fade3b1322a52ec2201b828ab28bfb3c0528ea562ac7e3cfaebeb758b971820a2b1ba695dafe219ceb2548c07713b3684491b893e6055ce4f8943916

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.46.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.46.ebuild
new file mode 100644
index 00000000000..5151cab9b14
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.46.ebuild
@@ -0,0 +1,105 @@
+# 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##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=5.10.42
+
+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 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"
+
+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
+
+       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
+       kernel-build_merge_configs "${merge_configs[@]}"
+}