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

[Michał Górny]

commit:     d211b0326630f2642965e01fc3932e6f6558c176
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 15:29:48 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 19:06:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d211b032

sys-kernel/gentoo-kernel: Bump to 5.4.85

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index a6cbb52214c..c47e01385c7 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-5.4-85.base.tar.xz 2833404 BLAKE2B 
56a8a49c1c61693ea344d26fedbb8
 DIST genpatches-5.4-85.extras.tar.xz 1768 BLAKE2B 
5a5e25a02014fd06b8742a2e505f9998d766c6c95d1a515f0c5a6f3b433163c97c1b8ec758be9bff0c017c947fe4c9c1210fd5fb9d1d838f8571ccd9178d251b
 SHA512 
9ca5271fda3619765363f8fdc5e837b0c6bd218de7d956795e9ef01e9000c85d85f0b49479b8d20a33227008ecbb268d9353c622b37f81619329f358b2fcdff7
 DIST genpatches-5.4-86.base.tar.xz 2842360 BLAKE2B 
a5056a63d5c63621f0b728fbe7249b63097006a62892d4f347202327d17c1cd8e5efe5f7f134be2f01e2020e1628fcff37f9639b2fbf84f451c2b814c65c9257
 SHA512 
509110cf81bdf0e28dbd7affeac89d516059b50e368c4b75b70596c279b972f66cdcec430b577bfc22fa0251f2502c03b01a4dd325901654d921d908b2066f0a
 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.9-10.base.tar.xz 521384 BLAKE2B 
ea65c4e0977bc07459297883aabba1589b746de718c054127b1cb5fb2d79702798dccd918e8f5542d439d316d3c6c3ae38514155ff2cd5f61c7916eacfaf5177
 SHA512 
54836cd45b62fc97c857f85bd96ebcb99d5f5d80b3c80c31e70a48e3aa8e54eca5eae802e9a8780c0eb0a1d166c190f39751512580ab10eb122a887d31ad3a57
 DIST genpatches-5.9-10.extras.tar.xz 1768 BLAKE2B 
8177c3e2b8d92785b9ee71a7733432c783977a4c18f2db282c3c5b079219a911f6c302cad0dc3bf14c886bd3765ffdb2808f353ba0ecb89bb01d522f24f54c0b
 SHA512 
462b35b3ff7a142877d11ddf02992a50043ba677f9f10619a308424f3e4df54d45436bc148fc503581c1c707a2a936ee278b18d95c02c6d5cdfec08f94257171
 DIST genpatches-5.9-11.base.tar.xz 580544 BLAKE2B 
59989b81c77e174e421b4fd6f570b7b8daf3649c4869eb61808607c98999467c60f9fe0a9f1c798807e9395ee064fd183a3110482536f1061b80349156af1b83
 SHA512 
5f5570bb06e62220304c235d5cd93c0d7f738bcc978cd1215ba262dd6bc9a0b0d43cf8d51cf36f2f0a66996b79f656463c7a0323e14f8c46899f28b0420155cf

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.85.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.85.ebuild
new file mode 100644
index 00000000000..0c806189a34
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.85.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[@]}"
+}