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-11 15:41:45 +0000 |
commit | c1b7d83d7758d6eaf2814b9629b78661505fec6e (patch) | |
tree | e39f83446917a7f6a2148704f2b44686b52fdd38 /scripts/lib/devtool/sdk.py | |
parent | efead10e6f5cc55adec60cd2a16e6a6db93e99fe (diff) | |
download | poky-c1b7d83d7758d6eaf2814b9629b78661505fec6e.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 rev: 1a60ee8bd21e156022c928f12bb296ab5caaa766)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool/sdk.py')
-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 afe52cf1b6..daa3e4ecae 100644 --- a/scripts/lib/devtool/sdk.py +++ b/scripts/lib/devtool/sdk.py | |||
@@ -156,11 +156,11 @@ def sdk_update(args, config, basepath, workspace): | |||
156 | logger.debug("Updating meta data via git ...") | 156 | logger.debug("Updating meta data via git ...") |
157 | # Try using 'git pull', if failed, use 'git clone' | 157 | # Try using 'git pull', if failed, use 'git clone' |
158 | if os.path.exists(os.path.join(basepath, 'layers/.git')): | 158 | if os.path.exists(os.path.join(basepath, 'layers/.git')): |
159 | ret = subprocess.call("cd layers && git pull", shell=True) | 159 | ret = subprocess.call("cd layers && git pull %s/layers/.git" % updateserver, shell=True) |
160 | else: | 160 | else: |
161 | ret = -1 | 161 | ret = -1 |
162 | if ret != 0: | 162 | if ret != 0: |
163 | ret = subprocess.call("rm -rf layers && git clone %s/layers" % updateserver, shell=True) | 163 | ret = subprocess.call("rm -rf layers && git clone %s/layers/.git" % updateserver, shell=True) |
164 | if ret != 0: | 164 | if ret != 0: |
165 | logger.error("Updating meta data via git failed") | 165 | logger.error("Updating meta data via git failed") |
166 | return ret | 166 | return ret |