[meta-lsi] [PATCH 18/24] linux-yocto: Update branch names for 3.10 and 3.14

[Daniel Dragomir]

Set standard/axxia-dev/base branch for builds that use kernel
from Github repo.
* standard/axxia-dev/base is development area
for axxia team having latest changes before pushing to Yocto
and is used in private builds.
* standard/axxia/base should match exactly what's in Yocto; only
happens after pushed to customer; used in public builds

So, axxia team will use private builds to have development branch
and customers will build from public branch to have latest commits
before are pushed to Yocto and will use yocto builds to have the
clean kernel repo.

Also, set AUTOREV for public builds also because patches are merged
private to public only after are tested. So it's easier to maintain.

Also set AUTOREV for 3.10 META branch to avoid validation test failure
on do_validate_branches task
If SRCREV_meta is not set, it will have the value from upstream
which is not found in our kernel tree from github.

fatal: git cat-file <SHA declared upstream - in poky>: bad file
ERROR:  <SHA declared upstream - in poky> is not a valid commit ID
ERROR: The kernel source tree may be out of sync

Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
---
 recipes-kernel/linux/lsi-public-rt_3.10.inc | 7 ++++---
 recipes-kernel/linux/lsi-public_3.10.inc    | 7 ++++---
 recipes-kernel/linux/lsi-tip-rt_3.14.inc    | 2 +-
 recipes-kernel/linux/lsi-tip_3.14.inc       | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/recipes-kernel/linux/lsi-public-rt_3.10.inc b/recipes-kernel/linux/lsi-public-rt_3.10.inc
index cd2c5ca..30dba63 100644
--- a/recipes-kernel/linux/lsi-public-rt_3.10.inc
+++ b/recipes-kernel/linux/lsi-public-rt_3.10.inc
@@ -2,12 +2,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${
 
 require dt-${KARCH}.inc
 
-LSI_KERNEL_TAG = "8.8.1.53"
+LSI_KERNEL_TAG = "public"
 LINUX_VERSION = "3.10.38-${LSI_KERNEL_TAG}"
-KBRANCH = "standard/preempt-rt/lsi/base"
+KBRANCH = "standard/preempt-rt/axxia-dev/base"
 KMETA = ""
 KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto_public_3.10.git;protocol=ssh"
-SRCREV_machine = "a90ff87a3a3473aa19ca2ebe22af709cf5540ebd"
+SRCREV_machine ="${AUTOREV}"
+SRCREV_meta ="${AUTOREV}"
 SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH};name=machine"
 SRC_URI += "file://fit"
 SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-public_3.10.inc b/recipes-kernel/linux/lsi-public_3.10.inc
index 78bf88c..809cb7b 100644
--- a/recipes-kernel/linux/lsi-public_3.10.inc
+++ b/recipes-kernel/linux/lsi-public_3.10.inc
@@ -2,12 +2,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${
 
 require dt-${KARCH}.inc
 
-LSI_KERNEL_TAG = "8.8.1.53"
+LSI_KERNEL_TAG = "public"
 LINUX_VERSION = "3.10.38-${LSI_KERNEL_TAG}"
-KBRANCH = "standard/lsi/base"
+KBRANCH = "standard/axxia-dev/base"
 KMETA = ""
 KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto_public_3.10.git;protocol=ssh"
-SRCREV_machine = "c01e54b3ced0224c8b32d3aab4a9b78d76fbac0e"
+SRCREV_machine ="${AUTOREV}"
+SRCREV_meta ="${AUTOREV}"
 SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH};name=machine"
 SRC_URI += "file://fit"
 SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-tip-rt_3.14.inc b/recipes-kernel/linux/lsi-tip-rt_3.14.inc
index bcfa268..fe36132 100644
--- a/recipes-kernel/linux/lsi-tip-rt_3.14.inc
+++ b/recipes-kernel/linux/lsi-tip-rt_3.14.inc
@@ -4,7 +4,7 @@ require dt-${KARCH}.inc
 
 LSI_KERNEL_TAG = "tip"
 LINUX_VERSION = "3.14.39-${LSI_KERNEL_TAG}"
-KBRANCH = "standard/preempt-rt/axxia/base"
+KBRANCH = "standard/preempt-rt/axxia-dev/base"
 KMETA = ""
 KREPO_KERNEL = "git://git@github.com/lsigithub/axxia_yocto_linux_3.14_private.git;protocol=ssh"
 SRCREV_machine ="${AUTOREV}"
diff --git a/recipes-kernel/linux/lsi-tip_3.14.inc b/recipes-kernel/linux/lsi-tip_3.14.inc
index 0dc4c06..1da127e 100644
--- a/recipes-kernel/linux/lsi-tip_3.14.inc
+++ b/recipes-kernel/linux/lsi-tip_3.14.inc
@@ -4,7 +4,7 @@ require dt-${KARCH}.inc
 
 LSI_KERNEL_TAG = "tip"
 LINUX_VERSION = "3.14.39-${LSI_KERNEL_TAG}"
-KBRANCH = "standard/axxia/base"
+KBRANCH = "standard/axxia-dev/base"
 KMETA = ""
 KREPO_KERNEL = "git://git@github.com/lsigithub/axxia_yocto_linux_3.14_private.git;protocol=ssh"
 SRCREV_machine ="${AUTOREV}"
-- 
1.9.1