apply submodule as Baobab branch

-. package versioning as 1.0.0
-. enhance build script for submodule

Change-Id: I54d7002a872a87ed59ae9d8012c3c200ce9961aa
Signed-off-by: wansu.yoo <wansu.yoo@samsung.com>

diff --git a/.gitmodules b/.gitmodules
index f26d41acd3c2eace320e9ee08aab786cb4e954c6..de90f78e914816cb86a4097b613ed7346a55d7e1 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "edge-home-orchestration-go"]
        path = edge-home-orchestration-go
        url = https://github.com/lf-edge/edge-home-orchestration-go.git
+       branch = Baobab

diff --git a/CMain/lib/liborchestration.a b/CMain/lib/liborchestration.a
index 8257abfec9c0e7b7d44e9e2c01cc225ccdb09365..6c9683510adf25438c86297788b5a18544f36fd6 100644 (file)
Binary files a/CMain/lib/liborchestration.a and b/CMain/lib/liborchestration.a differ

diff --git a/build.sh b/build.sh
index 69c780418549c3752c7496f0e9fd84a87b951a72..cfcdc58990e772e50397a9660ac92d6791d6b8d1 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -57,7 +57,7 @@ function submodule_update() {
     echo "---------------------------------------------"
     echo " Submodule update to Latest version"
     echo "---------------------------------------------"
-    git submodule foreach git pull origin master
+    git submodule foreach -q --recursive 'branch="$(git config -f $BASE_DIR/.gitmodules submodule.$name.branch)"; git checkout $branch'
 }
 
 function submodule_build() {

diff --git a/edge-home-orchestration-go b/edge-home-orchestration-go
index a7243de06d809dd7377d4bde7b4d7786f2150998..258d34f118ea058d8680321364d65dd207f743eb 160000 (submodule)
--- a/edge-home-orchestration-go
+++ b/edge-home-orchestration-go
@@ -1 +1 @@
-Subproject commit a7243de06d809dd7377d4bde7b4d7786f2150998
+Subproject commit 258d34f118ea058d8680321364d65dd207f743eb

diff --git a/packaging/edge-orchestration.spec b/packaging/edge-orchestration.spec
index 3c57fdd0b3e0e58b61243e7963dea9cbe1912940..2b169c15d81fe1fcc174cb0045a07e2de03a7c1b 100644 (file)
--- a/packaging/edge-orchestration.spec
+++ b/packaging/edge-orchestration.spec
@@ -1,5 +1,5 @@
 Name:       edge-orchestration
-Version:    0.0.1
+Version:    1.0.0
 Release:    0
 Group:      System/Edge Framework
 License:    Apache-2.0