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

[Michał Górny]

commit:     6a112eec25b0fe18581edc910e0b78b681ca0806
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 27 13:03:56 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 15:09:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a112eec

sys-kernel/gentoo-kernel: Bump to 5.4.93

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

 sys-kernel/gentoo-kernel/Manifest                  |  2 +
 .../gentoo-kernel/gentoo-kernel-5.4.93.ebuild      | 96 ++++++++++++++++++++++
 2 files changed, 98 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index ece1eaeb37a..c7ea5d2f082 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-5.4-93.base.tar.xz 3001024 BLAKE2B 
d5f3020aae1a920a076457cf28ae6
 DIST genpatches-5.4-93.extras.tar.xz 1772 BLAKE2B 
0ad1eff5f82120235a1f326176beeaefcf7aa547eecc94ad103a5be1701dd922ae0309431a10233c0df5bf63c5ba970bdec32e6ca782965e369be2fa5a4577dc
 SHA512 
b5415fe59ba41d60a46e0c123abcee0bb72b5a7d7358789947627ae086c7391c09f116a16c32b2475c278ea14d7275932046d686aa4a849942cbf64440506c92
 DIST genpatches-5.4-94.base.tar.xz 3006280 BLAKE2B 
a8130e4be0b40fd0c82d9da6c3f42d3e45dc0119b7a981a62b0577e16cb73ae7edb76b407ecdaaf0bd53a118164208529d9bde3958c9592cedb3ef04815e64e9
 SHA512 
bf4b59da586a4f5f4a03b40273cbb6d5e9e49273c9c15fa2d3dd7eb002c0c24db895fa3987c93268c1dbfb1402197192f2f2c42b22f443a50089ce26d0f721a2
 DIST genpatches-5.4-94.extras.tar.xz 1772 BLAKE2B 
d7f9cbdd2739ff180d7fa1de7ae24f9d0beeed259b00b0a67e6a3e9dfeb7a2e7136c0682af7e50491fa9010ea3e3e03a37cb8eac96047a4d4e58177d64caf72d
 SHA512 
eee973e296444e301a6d9f59e82e39b2d2b1aa6605fe62c54a3710f300bad9e3b3a13c14f16f357a6c8775c50b47d390f537f15030c4fb08a6d81e5ba4008f1d
+DIST genpatches-5.4-95.base.tar.xz 3022876 BLAKE2B 
e935ec5e2cacf478fd8ac2f343d0e582cceddf811ea4d87d5518b946b8b0501e7aff29d406407d3f0d276ea32a616f022789ee1318b282c6fd77b3aaf0d64631
 SHA512 
4e87014b78683372d525d6409c5c038429423371a1369f2c3b1455e53f5360290dd323ccc24aaeeb4a9e66452e9c87dba439c75192b77e4fc7bc888bc1c4cdac
+DIST genpatches-5.4-95.extras.tar.xz 1772 BLAKE2B 
29c822d815b565e99441f122bb978db211288f69ec3e3795e2555aa58cc3d2911debaeddcf202ce7be335771310589548a9de82d0500982894b621d0f773d7a3
 SHA512 
860978d98d7715b1359e0f3e47a0369ee6ef9e1cc4fd4201ad879dcab0aac644f6a951875643ccb70d31b6dad8b23d0b4ca7b32e50739bd87499760829949749
 DIST gentoo-kernel-config-5.10.7.tar.gz 1146 BLAKE2B 
f755581e9f3be3122e5f6e6fc133d3e5c3116d4580b53f95ff5b2cee5150233fe82be5cd45637a9792ae4612be5d2cb4dd954506f97fe82c9e96cb8b772cb342
 SHA512 
8c64768e83d2552e69a29c6c3f958ef6a1e5a767acd04b3bfcd0cd49453ab5d0aa54fcfee76a8c9d07f72abdbf70380b070e3d1584e7b7d05a6daa3399892f51
 DIST gentoo-kernel-config-5.4.77-r1.tar.gz 1289 BLAKE2B 
6612741cfbf458f4bd8915b476aac3aa6934e8bbab344da877fa4ad52b6133e01f5d44bf0e5d048e79e56c1a351774135ee55f1aa839b230e2418db7c5d9b123
 SHA512 
2a09dd85af37447b278847aeaad114ef47470726cec015ed5ee1b54b3080f4b2c48de8b2f7b817eeb4e27c753579cf0820053e22caa762cb1552116d8d69eba0
 DIST gentoo-kernel-config-5.4.89.tar.gz 1240 BLAKE2B 
50bd2e64eb1a62d2f0d67e02b78da56cb507fd7a5993d663b880c94ecd535898285ed01e00d5d07fc1ba0d044657e776456736d8fdcacecf7ca464979a8a1d06
 SHA512 
ad31f9895b9dd45edd7f8715516edfc303c23600f243f3ca122c7c554c9fdbe3c3aa62970a24ef7291d7937e04c63c0258f6348e796686902a011c055c1bed01

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.93.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.93.ebuild
new file mode 100644
index 00000000000..e8748c9098f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.93.ebuild
@@ -0,0 +1,96 @@
+# 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##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.89
+
+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.config
+                       -> kernel-x86_64.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+                       -> kernel-aarch64.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+                       -> kernel-ppc64le.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+                       -> kernel-i686.config.${CONFIG_VER}
+       )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+       !sys-kernel/vanilla-kernel:${SLOT}
+       !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+       debug? ( dev-util/dwarves )"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}"
+
+pkg_pretend() {
+       ewarn "Starting with 5.4.52, Distribution Kernels are switching from 
Arch"
+       ewarn "Linux configs to Fedora.  Please keep a backup kernel just in 
case."
+
+       kernel-install_pkg_pretend
+}
+
+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.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               arm64)
+                       cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               ppc64)
+                       cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       local merge_configs=(
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+       )
+       use debug || merge_configs+=(
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+       )
+       [[ ${ARCH} == x86 ]] && merge_configs+=(
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+       )
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}