From e9d4b905765c87d0c89326cace951e592b235923 Mon Sep 17 00:00:00 2001
From: Diego Rondini <diego.rondini@kynetics.com>
Date: Fri, 28 Feb 2020 20:55:55 +0000
Subject: [PATCH] linux-mainline: use .inc for common code

Use .inc file to share common code and parameters. Also, always apply
orange-pi-zero wifi patch unconditionally: it is easier to spot build
issues while updating recipes if patch is applied regardless of the
machine we're building on.

Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>
---
 recipes-kernel/linux/linux-mainline.inc       | 29 ++++++++++++++++
 ...-dts-orange-pi-zero-Add-wifi-support.patch |  0
 recipes-kernel/linux/linux-mainline_5.4.18.bb | 34 ++-----------------
 recipes-kernel/linux/linux-mainline_5.5.3.bb  | 33 ++----------------
 4 files changed, 33 insertions(+), 63 deletions(-)
 create mode 100644 recipes-kernel/linux/linux-mainline.inc
 rename recipes-kernel/linux/linux-mainline/{orange-pi-zero => }/0001-dts-orange-pi-zero-Add-wifi-support.patch (100%)

diff --git a/recipes-kernel/linux/linux-mainline.inc b/recipes-kernel/linux/linux-mainline.inc
new file mode 100644
index 0000000..84234e4
--- /dev/null
+++ b/recipes-kernel/linux/linux-mainline.inc
@@ -0,0 +1,29 @@
+SECTION = "kernel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
+COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
+
+inherit kernel
+
+require linux.inc
+
+# Since we're not using git, this doesn't make a difference, but we need to fill
+# in something or kernel-yocto.bbclass will fail.
+KBRANCH ?= "master"
+
+DEPENDS += "rsync-native"
+
+# Pull in the devicetree files into the rootfs
+RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
+
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+
+S = "${WORKDIR}/linux-${PV}"
+
+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://0001-dts-orange-pi-zero-Add-wifi-support.patch \
+	file://defconfig \
+"
+
+FILES_${KERNEL_PACKAGE_NAME}-base_append = " ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
diff --git a/recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-dts-orange-pi-zero-Add-wifi-support.patch b/recipes-kernel/linux/linux-mainline/0001-dts-orange-pi-zero-Add-wifi-support.patch
similarity index 100%
rename from recipes-kernel/linux/linux-mainline/orange-pi-zero/0001-dts-orange-pi-zero-Add-wifi-support.patch
rename to recipes-kernel/linux/linux-mainline/0001-dts-orange-pi-zero-Add-wifi-support.patch
diff --git a/recipes-kernel/linux/linux-mainline_5.4.18.bb b/recipes-kernel/linux/linux-mainline_5.4.18.bb
index 5c433d6..758fb64 100644
--- a/recipes-kernel/linux/linux-mainline_5.4.18.bb
+++ b/recipes-kernel/linux/linux-mainline_5.4.18.bb
@@ -1,36 +1,6 @@
-SECTION = "kernel"
+require linux-mainline.inc
+
 DESCRIPTION = "Mainline Longterm Linux kernel"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
-
-inherit kernel
-
-require linux.inc
-
-# Since we're not using git, this doesn't make a difference, but we need to fill
-# in something or kernel-yocto.bbclass will fail.
-KBRANCH ?= "master"
-
-DEPENDS += "rsync-native"
-
-# Pull in the devicetree files into the rootfs
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
-
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
-
-S = "${WORKDIR}/linux-${PV}"
 
 SRC_URI[md5sum] = "dccb4d028c97b6fe5d0bca14a1afcd58"
 SRC_URI[sha256sum] = "92e9f1fd69543e9ce2a9e6eb918823b1846d2dd99246a74456263cd5ad234d89"
-
-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.5.3.bb b/recipes-kernel/linux/linux-mainline_5.5.3.bb
index 9a9052c..eb26b0a 100644
--- a/recipes-kernel/linux/linux-mainline_5.5.3.bb
+++ b/recipes-kernel/linux/linux-mainline_5.5.3.bb
@@ -1,35 +1,6 @@
-SECTION = "kernel"
+require linux-mainline.inc
+
 DESCRIPTION = "Mainline Stable Linux kernel"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
-COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i|sun8i|sun50i)"
-
-inherit kernel
-
-require linux.inc
-
-# Since we're not using git, this doesn't make a difference, but we need to fill
-# in something or kernel-yocto.bbclass will fail.
-KBRANCH ?= "master"
-
-DEPENDS += "rsync-native"
-
-# Pull in the devicetree files into the rootfs
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree"
-
-KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
-
-S = "${WORKDIR}/linux-${PV}"
 
 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"