[meta-lsi] [PATCH 36/41] linux-yocto: lsi-public: Update branch names for 3.4 and 3.10

Daniel Dragomir daniel.dragomir at windriver.com
Thu Jan 28 04:29:39 PST 2016


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.

Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
---
 recipes-kernel/linux/lsi-public-rt_3.10.inc | 4 ++--
 recipes-kernel/linux/lsi-public-rt_3.4.inc  | 2 +-
 recipes-kernel/linux/lsi-public_3.10.inc    | 4 ++--
 recipes-kernel/linux/lsi-public_3.4.inc     | 2 +-
 4 files changed, 6 insertions(+), 6 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..730e65e 100644
--- a/recipes-kernel/linux/lsi-public-rt_3.10.inc
+++ b/recipes-kernel/linux/lsi-public-rt_3.10.inc
@@ -4,10 +4,10 @@ require dt-${KARCH}.inc
 
 LSI_KERNEL_TAG = "8.8.1.53"
 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}"
 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-rt_3.4.inc b/recipes-kernel/linux/lsi-public-rt_3.4.inc
index 7c8c3dc..5de657e 100644
--- a/recipes-kernel/linux/lsi-public-rt_3.4.inc
+++ b/recipes-kernel/linux/lsi-public-rt_3.4.inc
@@ -7,7 +7,7 @@ LINUX_VERSION = "3.4.91-${LSI_KERNEL_TAG}"
 KBRANCH = "standard/preempt-rt/axxia-dev/base"
 KMETA = ""
 KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto_public.git;protocol=ssh"
-SRCREV_machine = "bcaca399a46cd52817c2af787656fe57ca5ef989"
+SRCREV_machine ="${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..825ed2a 100644
--- a/recipes-kernel/linux/lsi-public_3.10.inc
+++ b/recipes-kernel/linux/lsi-public_3.10.inc
@@ -4,10 +4,10 @@ require dt-${KARCH}.inc
 
 LSI_KERNEL_TAG = "8.8.1.53"
 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}"
 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.4.inc b/recipes-kernel/linux/lsi-public_3.4.inc
index 3e2de3f..666f265 100644
--- a/recipes-kernel/linux/lsi-public_3.4.inc
+++ b/recipes-kernel/linux/lsi-public_3.4.inc
@@ -7,7 +7,7 @@ LINUX_VERSION = "3.4.91-${LSI_KERNEL_TAG}"
 KBRANCH = "standard/axxia-dev/base"
 KMETA = ""
 KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto_public.git;protocol=ssh"
-SRCREV_machine = "7528fb8d42f3776e901f1a45caa9f1ac188bf37b"
+SRCREV_machine ="${AUTOREV}"
 SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH};name=machine"
 SRC_URI += "file://fit"
 SRC_URI += "file://defconfig"
-- 
1.9.1



More information about the meta-lsi mailing list