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

[Michał Górny]

commit:     f02b4f6f5f2fac2a6ce64e6043ec821e9eedcb37
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 17:19:13 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 19:40:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f02b4f6f

sys-kernel/gentoo-kernel: Bump to 5.4.86

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index df290944c28..2ed4e62a92e 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-5.4-86.base.tar.xz 2842360 BLAKE2B 
a5056a63d5c63621f0b728fbe7249
 DIST genpatches-5.4-86.extras.tar.xz 1772 BLAKE2B 
a5efc07916c932bdb150744f7675d4ab255c62563a2b88798cc3c9b7aaab21a06fe4d94fdd0ee49de48a2f41460fec8610613ea460fd5df5df50578b12d060cf
 SHA512 
39a4effcda32cc194daeb3d9429bd857cbbb803079d40f0968a0741ca3f753f22b27084eaad052d8c9cfb8aba3c01e37b91930e33dae08e2a8e9f74cd7697cbe
 DIST genpatches-5.4-87.base.tar.xz 2852988 BLAKE2B 
a8282ba7fde85ec400b85f1cc2263f7abdf5b518c451fd63c4e878a203c81cc26974cc5c9d324ed289b78d2059ab97a68b8b10a6cfc212db760aa8fbea57cf27
 SHA512 
1a989b50f901ea09abfa884efa353c102c5b7c143d224f0360b6460d4f8faccb4e1cccc9a6cdce54ff7ddc5cc9f6be725e8e5714d60ab23acb59435859f17ae5
 DIST genpatches-5.4-87.extras.tar.xz 1772 BLAKE2B 
c7a99559c06cbf8e2cf217655b5003bdab13127d4e7e93d5b67e3d83c31dce3ae6cc1ab6de7adb62c51ff6a91c2d2c4efff1377f7bb516ebac552f398e22df6e
 SHA512 
c57ae9f86e050eeb929358fe1919213410b089d774c521ca2657fad7a6d8da221ba303fb404bdc303526ad6a0a9434c08ff7691454736fddcae2fd978cf506d9
+DIST genpatches-5.4-88.base.tar.xz 2936760 BLAKE2B 
ef7a26374e0602b3f2e9fff948829dbd756b8edc1ad833cafa49cec3af5cd771dc52777af079ef7ae4f7362453953828c1a7565823cdda0c9d0b4b0d74a57f94
 SHA512 
4f2bf7e63820df6c616a6122c8dd6812e056fc85d023f708f5f9a0f856ccbbcd4e3aeb3c1247d8ee2650e2d96b0c86c99de5b7d53e8117351d4378198a4ea52f
+DIST genpatches-5.4-88.extras.tar.xz 1772 BLAKE2B 
dd72b20e1fe7f1b5f566c3d588d24cdad04e40d0270c9be60dd14c07c6a4ec9760dc57dc709d78bfb8d91017b6a4d6bf4c45a65dc019e9eaf02e02a56133f145
 SHA512 
f4e449986ee4c90ac79234d14e0e336d2c8cb74589ad6371067669f94041ee3b848848d2498d27da57ec71b050079f5338a87111af6f8edb3127698d0a39b478
 DIST genpatches-5.9-14.base.tar.xz 656112 BLAKE2B 
5793eec0a89629823c027a92758bae2ef2b92cda058b313358f3487a8f51fcebc80a3a12e5c58bc1e8a98b299111fe22d18d5952382c0151e3f1b104d461b879
 SHA512 
a53e9edeb5d88685de2412adad6de6eda92f002851cc74ca6329bb63f63cde2f9e42272c1b583918586dd7858bd3bb0b8f252cb90e22713f25fbd55f376e1113
 DIST genpatches-5.9-14.extras.tar.xz 1768 BLAKE2B 
a99628fbec37aabea2644b761ae4eeb81e2999d3cc9352c8d6575646762a74eeff14b3f9765b61baf4074523cab3f3cc693f07d0a4d06bc50ae13baee2fd86d2
 SHA512 
eaf3cdf93e8545d663408c14ccf13f38a13fe7e5f5582d63af766dca6cf398cc17395a813d71a0b7bb37a43685b70b1afab1d27ef49dbd20d1c62f6aaf9f28d6
 DIST genpatches-5.9-15.base.tar.xz 687008 BLAKE2B 
825634d9d632670a57b992ad0d8bda3496629a9e977ae470cd5e25d628b673f0953b4ea8e326404d349bda2bb209c870517c8f6698428a12f788550248213fb6
 SHA512 
72d81a9d6bb9eb3801702ad7d63226c53e163886c52e2ac0ac8a240965746b256a3a24f9072ab115d1fbee27ed74de9014ca1e6db8780aab2c5ccf4ff8191306

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild
new file mode 100644
index 00000000000..0c806189a34
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.86.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2020 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.77-r1
+
+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 )"
+
+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[@]}"
+}