From 02e3e7fba81c4af1a2d8b7c1aaa62ca6feaa9726 Mon Sep 17 00:00:00 2001
From: Diego Rondini <diego.rondini@kynetics.com>
Date: Thu, 16 Jan 2020 16:46:45 +0000
Subject: [PATCH] linux-mainline: add lt 5.4.18, stable 5.5.3

According to:
https://www.kernel.org/category/releases.html
version 5.4 is a longterm release, so:
- add longterm 5.4 series at 5.4.18
- update longterm 4.19 series to 4.19.103
- update stable to 5.5.3
- remove rc, as it quickly gets out of date. rc users will likely build
kernel from master outside of OE anyway
- set 5.4 as the preferred version for linux-mainline

Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>
---
 conf/machine/include/sunxi.inc                         |  2 +-
 ...-mainline_4.19.81.bb => linux-mainline_4.19.103.bb} |  4 ++--
 ...ux-mainline_5.4-rc6.bb => linux-mainline_5.4.18.bb} | 10 +++++-----
 ...linux-mainline_5.3.8.bb => linux-mainline_5.5.3.bb} |  7 ++++---
 4 files changed, 12 insertions(+), 11 deletions(-)
 rename recipes-kernel/linux/{linux-mainline_4.19.81.bb => linux-mainline_4.19.103.bb} (86%)
 rename recipes-kernel/linux/{linux-mainline_5.4-rc6.bb => linux-mainline_5.4.18.bb} (77%)
 rename recipes-kernel/linux/{linux-mainline_5.3.8.bb => linux-mainline_5.5.3.bb} (77%)

diff --git a/conf/machine/include/sunxi.inc b/conf/machine/include/sunxi.inc
index 164523e..b2a74bf 100644
--- a/conf/machine/include/sunxi.inc
+++ b/conf/machine/include/sunxi.inc
@@ -13,7 +13,7 @@ XSERVER = "xserver-xorg \
            xf86-input-keyboard"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
-PREFERRED_VERSION_linux-mainline ?= "4.19%"
+PREFERRED_VERSION_linux-mainline ?= "5.4.%"
 PREFERRED_PROVIDER_u-boot ?= "u-boot"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
 
diff --git a/recipes-kernel/linux/linux-mainline_4.19.81.bb b/recipes-kernel/linux/linux-mainline_4.19.103.bb
similarity index 86%
rename from recipes-kernel/linux/linux-mainline_4.19.81.bb
rename to recipes-kernel/linux/linux-mainline_4.19.103.bb
index ee530b9..14cb95d 100644
--- a/recipes-kernel/linux/linux-mainline_4.19.81.bb
+++ b/recipes-kernel/linux/linux-mainline_4.19.103.bb
@@ -19,8 +19,8 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/linux-${PV}"
 
-SRC_URI[md5sum] = "bf96b6783a2d11178a2aaa3cf376f975"
-SRC_URI[sha256sum] = "293ec1ae0f6b3b4be83a217224b51d137f2163cf2d9d294eecf5d0a354e4e29d"
+SRC_URI[md5sum] = "6287e6d6658e593a2978dc718f7de3f3"
+SRC_URI[sha256sum] = "b4784571bd7f3dc10ae3dc4414876dbd73fc6750401299b206670ce3e5c4bb43"
 
 SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \
         file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
diff --git a/recipes-kernel/linux/linux-mainline_5.4-rc6.bb b/recipes-kernel/linux/linux-mainline_5.4.18.bb
similarity index 77%
rename from recipes-kernel/linux/linux-mainline_5.4-rc6.bb
rename to recipes-kernel/linux/linux-mainline_5.4.18.bb
index 0992c2c..5c433d6 100644
--- a/recipes-kernel/linux/linux-mainline_5.4-rc6.bb
+++ b/recipes-kernel/linux/linux-mainline_5.4.18.bb
@@ -1,5 +1,5 @@
 SECTION = "kernel"
-DESCRIPTION = "Mainline RC Linux kernel"
+DESCRIPTION = "Mainline Longterm Linux kernel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
@@ -21,16 +21,16 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/linux-${PV}"
 
-SRC_URI[md5sum] = "58b2b15fb3c429948051ce4f12f30c37"
-SRC_URI[sha256sum] = "b07532aa008438e0bce2b8f0253079a4f1654a048a75ae1477c8826f32feea7a"
+SRC_URI[md5sum] = "dccb4d028c97b6fe5d0bca14a1afcd58"
+SRC_URI[sha256sum] = "92e9f1fd69543e9ce2a9e6eb918823b1846d2dd99246a74456263cd5ad234d89"
 
-SRC_URI = "https://git.kernel.org/torvalds/t/linux-${PV}.tar.gz \
+SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \
         file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
         file://defconfig \
         "
+
 SRC_URI_append_orange-pi-zero += "\
 	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
 	"
 
 FILES_${KERNEL_PACKAGE_NAME}-base_append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
-
diff --git a/recipes-kernel/linux/linux-mainline_5.3.8.bb b/recipes-kernel/linux/linux-mainline_5.5.3.bb
similarity index 77%
rename from recipes-kernel/linux/linux-mainline_5.3.8.bb
rename to recipes-kernel/linux/linux-mainline_5.5.3.bb
index 2e1350c..9a9052c 100644
--- a/recipes-kernel/linux/linux-mainline_5.3.8.bb
+++ b/recipes-kernel/linux/linux-mainline_5.5.3.bb
@@ -21,14 +21,15 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
 
 S = "${WORKDIR}/linux-${PV}"
 
-SRC_URI[md5sum] = "6f4ab59d6ac7311f4245fc359706a0b7"
-SRC_URI[sha256sum] = "78f3cfc6c20b10ff21c0bb22d7d257cab03781c44d8c5aae289f749f94f76649"
+SRC_URI[md5sum] = "3ea50025d8c679a327cf2fc225d81a46"
+SRC_URI[sha256sum] = "2bef3edcf44c746383045f4a809b2013e18c52319c827875ed8e89138951cab2"
 
 SRC_URI = "https://www.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz \
         file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \
         file://defconfig \
         "
-
 SRC_URI_append_orange-pi-zero += "\
 	file://0001-dts-orange-pi-zero-Add-wifi-support.patch \
 	"
+
+FILES_${KERNEL_PACKAGE_NAME}-base_append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"