From bfe528abbcbbb1455da1880cadd861c8b53d7925 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Mon, 20 Aug 2018 14:05:45 +0200
Subject: [PATCH] linux-dey: separate kernel source information into a new file

This way, other recipes (like the ones for kernel modules) can re-use the
sources if needed.

https://jira.digi.com/browse/DEL-6115

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../recipes-kernel/linux/linux-dey-src.inc        | 15 +++++++++++++++
 meta-digi-arm/recipes-kernel/linux/linux-dey.inc  | 13 +------------
 .../recipes-kernel/linux/linux-dey_4.9.bb         |  4 ----
 3 files changed, 16 insertions(+), 16 deletions(-)
 create mode 100644 meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc

diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
new file mode 100644
index 000000000..2af545a1e
--- /dev/null
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
@@ -0,0 +1,15 @@
+# Copyright (C) 2018 Digi International
+
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+LOCALVERSION = "-dey"
+SRCBRANCH = "v4.9/dey-2.4/maint"
+SRCBRANCH_ccimx8x = "v4.9.88/master"
+SRCREV = "${AUTOREV}"
+
+# Select internal or Github Linux repo
+LINUX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}"
+SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}"
+
+S = "${WORKDIR}/git"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
index 0565743b0..34704e6b6 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc
@@ -1,28 +1,17 @@
 # Copyright (C) 2013-2018 Digi International
 
 SUMMARY = "Linux kernel for Digi boards"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 DEPENDS += "lzop-native bc-native"
 DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}"
 
 inherit kernel fsl-kernel-localversion
 
-LOCALVERSION = "-dey"
-
-# Select internal or Github Linux repo
-LINUX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}"
-
-SRC_URI = " \
-    ${LINUX_GIT_URI};branch=${SRCBRANCH} \
-"
+require recipes-kernel/linux/linux-dey-src.inc
 
 # Use custom provided 'defconfig' if variable KERNEL_DEFCONFIG is cleared
 SRC_URI += "${@base_conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)}"
 
-S = "${WORKDIR}/git"
-
 do_deploy[postfuncs] += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence_sign', '', d)}"
 
 trustfence_sign() {
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb
index 51d65d05b..e8afd6ffc 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb
@@ -2,8 +2,4 @@
 
 require recipes-kernel/linux/linux-dey.inc
 
-SRCBRANCH = "v4.9/dey-2.4/maint"
-SRCBRANCH_ccimx8x = "v4.9.88/master"
-SRCREV = "${AUTOREV}"
-
 COMPATIBLE_MACHINE = "(ccimx6|ccimx6ul|ccimx8x)"