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

[Michał Górny]

commit:     f31096bbbc9e0e8b8d912adde90131e71137a07e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 24 17:56:05 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov 24 19:52:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31096bb

sys-kernel/gentoo-kernel: Bump to 5.4.80

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

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

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 2ff9388ab7c..cb7851ddc1a 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.4-79.base.tar.xz 2551752 BLAKE2B 
8bd8950877671f66d7227a2cc0ee5
 DIST genpatches-5.4-79.extras.tar.xz 1768 BLAKE2B 
4c890e06a2733a06fee44172925a465204b8f435df40583eeeb553de6c2a26197f50ab100ed47b6c104ff5e4344534fd149d84f12e5f43f4c65422ef9a0e2cf5
 SHA512 
fbea0554d4cdffcbc4f43f9bed3cd57e5a3f79776f5e46d23daa65b884b5fd6fd43e248b04258434e44026669b6d1a707782a01dc217142c954fef2afa5acdff
 DIST genpatches-5.4-80.base.tar.xz 2561892 BLAKE2B 
de5b2235bb041cc87bc9e227aaa7fe8c00796d313b590d375d7b8bff384b326652c71a4715237bb213af15a6bd7ac37ce5ab2b291146917ac852667b09e40305
 SHA512 
00cb664d33fca3185c6efaae58a4f7464bd8bde19e4b90714786dc9fdf6add1e9af9f8dc47b8d0558086518ccfe247061379a45d20718519dd655f41880d2a58
 DIST genpatches-5.4-80.extras.tar.xz 1772 BLAKE2B 
b549a8901e55cddb1742e394166f8d948ba67552f1b7488cdaa5b7b3dc1a08370ddf7b32a9b243842e995472ae03837e53ae7e95bed6bee0417874f031f3785f
 SHA512 
bbf37e04615bca2a1fbca6b490bae4665865f4f5221f0268ba2f2ff5779fb3eebb0685654281dc5753b553d20a6864a950661cc75fc425b28844dbd524697caa
+DIST genpatches-5.4-81.base.tar.xz 2591356 BLAKE2B 
63c0ef166e2691c6747a2b2a8317aeac286ddac1454ae1eba7a34035abeba67ea2627257d17f266fde57da0684f83cb102b465252a3b95075c1442123c2473e4
 SHA512 
88d4deb9002cfe6aa8a8045770cf5c7ffde8cf9bad324a72296b1a5202c94386807fad53460147420363b3c73613be424bb54000e5cade7baa4df254ef2c61ab
+DIST genpatches-5.4-81.extras.tar.xz 1772 BLAKE2B 
93bedfbb023ab9d3913751cd242a4221b204685751f57d0ac31494fa8f8caf8e5faeb3ae10eed5332016f9a40b20670a6af6c4198eeae1136b14a3b28174beb7
 SHA512 
8776735a73aad4672d4b857d750f985ff6681f8e565a906106e2cfcd4d7839fa518d8fa19b39a0ac948736a3384656be44aad239ce2516786c797303f492ce01
 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-8.base.tar.xz 443192 BLAKE2B 
48c79a97fe1201bab87ba601feac1e05ce12f2db155e53e0a543c7994ba8dfcac75b17e315929c0b68b8136913fdf93005690ccb260640ccc31527088beb326b
 SHA512 
c365018bcfe84ff64a8171951fd4f97bb89044633df137926d22bedc738cd17ebe72c26800eaf30171c3495ce2b1bfdc93866112756bdd2207e6e184b5f1fb6f

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80.ebuild
new file mode 100644
index 00000000000..b32b759734b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.80.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##*.} + 1 ))
+# 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[@]}"
+}