diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-01-07 00:15:46 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-15 15:51:41 +0000 |
commit | 3f691055c5ae74f7a690401d737167cb94af5532 (patch) | |
tree | 67a0cdedbea16a289106ab4c99808f0ee40b964c /scripts/lib | |
parent | 5ba94af1e6193569700ba1d357c177209ab1633c (diff) | |
download | poky-3f691055c5ae74f7a690401d737167cb94af5532.tar.gz |
devtool: sdk-update: fix metadata update step
* Clone the correct path - we need .git on the end
* Pull from the specified path instead of expecting a remote to be set
* up in the repo already (it isn't by default)
(From OE-Core master rev: 1a60ee8bd21e156022c928f12bb296ab5caaa766)
(From OE-Core rev: a0e1ff92b189681df5cf106dc924e76bb05caf31)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/devtool/sdk.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py index ef1d0a723e..331c236bd1 100644 --- a/scripts/lib/devtool/sdk.py +++ b/scripts/lib/devtool/sdk.py | |||
@@ -160,11 +160,11 @@ def sdk_update(args, config, basepath, workspace): | |||
160 | logger.debug("Updating meta data via git ...") | 160 | logger.debug("Updating meta data via git ...") |
161 | # Try using 'git pull', if failed, use 'git clone' | 161 | # Try using 'git pull', if failed, use 'git clone' |
162 | if os.path.exists(os.path.join(basepath, 'layers/.git')): | 162 | if os.path.exists(os.path.join(basepath, 'layers/.git')): |
163 | ret = subprocess.call("cd layers && git pull", shell=True) | 163 | ret = subprocess.call("cd layers && git pull %s/layers/.git" % updateserver, shell=True) |
164 | else: | 164 | else: |
165 | ret = -1 | 165 | ret = -1 |
166 | if ret != 0: | 166 | if ret != 0: |
167 | ret = subprocess.call("rm -rf layers && git clone %s/layers" % updateserver, shell=True) | 167 | ret = subprocess.call("rm -rf layers && git clone %s/layers/.git" % updateserver, shell=True) |
168 | if ret != 0: | 168 | if ret != 0: |
169 | logger.error("Updating meta data via git failed") | 169 | logger.error("Updating meta data via git failed") |
170 | return ret | 170 | return ret |