From 27be059de47d2620fa0d7a5052b0a5d0e92dc4f1 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Wed, 16 Sep 2020 10:48:08 +0200
Subject: [PATCH] digi: switch recipes to maint branches

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb        | 4 ++--
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb        | 2 +-
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb        | 4 ++--
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb        | 2 +-
 .../recipes-digi/trustfence/trustfence-sign-tools_git.bb      | 4 ++--
 .../kernel-module-qualcomm/kernel-module-qualcomm.bb          | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc          | 2 +-
 meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc  | 4 ++--
 meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb     | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
index b49765d0d..243ff2143 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
@@ -1,8 +1,8 @@
-# Copyright (C) 2018,2019 Digi International
+# Copyright (C) 2018-2020 Digi International
 
 require digi-u-boot.inc
 
-SRCBRANCH = "v2017.03/master"
+SRCBRANCH = "v2017.03/maint"
 SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb
index efe133157..dd3b5a540 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb
@@ -2,7 +2,7 @@
 
 require digi-u-boot.inc
 
-SRCBRANCH = "v2018.03/master"
+SRCBRANCH = "v2018.03/maint"
 SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb
index 99287edae..2fda3537b 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb
@@ -1,11 +1,11 @@
-# Copyright (C) 2019 Digi International
+# Copyright (C) 2019,2020 Digi International
 
 require digi-u-boot.inc
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
 
 DEPENDS += "flex-native bison-native"
 
-SRCBRANCH = "v2019.04/master"
+SRCBRANCH = "v2019.04/maint"
 SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx8x)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb
index 1d522300e..ef49e0c04 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
 
 DEPENDS += "flex-native bison-native"
 
-SRCBRANCH = "v2020.04/master"
+SRCBRANCH = "v2020.04/maint"
 SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx8x)"
diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
index 23e190c78..de5c09fad 100644
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2018 Digi International
+# Copyright (C) 2017-2020 Digi International
 SUMMARY = "TrustFence signing and encryption scripts"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425
 DEPENDS = "trustfence-cst coreutils util-linux"
 DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}"
 
-SRCBRANCH = "v2019.04/master"
+SRCBRANCH = "v2020.04/maint"
 SRCREV = "${AUTOREV}"
 
 S = "${WORKDIR}"
diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
index 73d8df971..4437359c9 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
+++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca
 # Reference Qualcomm tag/version
 PV = "v4.0.11.213X"
 
-SRCBRANCH = "qca65X4/master"
+SRCBRANCH = "qca65X4/dey-3.0/maint"
 SRCREV = "${AUTOREV}"
 
 QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
index 772b3971c..3fe0b2f82 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
 LOCALVERSION = "-dey"
-SRCBRANCH = "v5.4.24/master"
+SRCBRANCH = "v5.4/dey-3.0/maint"
 SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint"
 SRCREV = "${AUTOREV}"
 
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc
index ba8ece33b..4e66757e4 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc
@@ -1,6 +1,6 @@
-# Copyright (C) 2019, Digi International Inc.
+# Copyright (C) 2019,2020, Digi International Inc.
 
-SRCBRANCH = "master"
+SRCBRANCH = "dey-3.0/maint"
 SRCREV = "${AUTOREV}"
 
 DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh"
diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
index 8dd3c771f..9d977bb28 100644
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 Digi International Inc.
+# Copyright (C) 2017-2020 Digi International Inc.
 
 SUMMARY = "Digi APIX library"
 DESCRIPTION = "C library to access and manage your ConnectCore platform interfaces in an easy manner"
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca
 
 DEPENDS = "libsoc libsocketcan libgpiod"
 
-SRCBRANCH ?= "master"
+SRCBRANCH ?= "dey-3.0/maint"
 SRCREV = "${AUTOREV}"
 
 LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh"