diff options
| author | JungYong Kim <jyong2.kim@samsung.com> | 2019-09-26 08:53:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2019-09-26 08:53:33 +0000 |
| commit | 02f3ef30da7bf5c0bfa030629dca595884de9e4f (patch) | |
| tree | 0e99b7220e39c39509797697387d0aa8070c819d | |
| parent | 3cb07924380885e7824f6485287954d1b0e5cf66 (diff) | |
| parent | 8ddbd48cbc44e8394bf8597aaf19099b03941e95 (diff) | |
| download | edge-orchestration-02f3ef30da7bf5c0bfa030629dca595884de9e4f.tar.gz edge-orchestration-02f3ef30da7bf5c0bfa030629dca595884de9e4f.tar.bz2 edge-orchestration-02f3ef30da7bf5c0bfa030629dca595884de9e4f.zip | |
Merge "apply submodule as Baobab branch" into tizensubmit/tizen/20190926.090600accepted/tizen/unified/20190927.064456
| -rw-r--r-- | .gitmodules | 1 | ||||
| -rw-r--r-- | CMain/lib/liborchestration.a | bin | 18421144 -> 18429264 bytes | |||
| -rwxr-xr-x | build.sh | 2 | ||||
| m--------- | edge-home-orchestration-go | 0 | ||||
| -rw-r--r-- | packaging/edge-orchestration.spec | 2 |
5 files changed, 3 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules index f26d41a..de90f78 100644 --- 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 Binary files differindex 8257abf..6c96835 100644 --- a/CMain/lib/liborchestration.a +++ b/CMain/lib/liborchestration.a @@ -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 -Subproject a7243de06d809dd7377d4bde7b4d7786f215099 +Subproject 258d34f118ea058d8680321364d65dd207f743e diff --git a/packaging/edge-orchestration.spec b/packaging/edge-orchestration.spec index 3c57fdd..2b169c1 100644 --- 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 |