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:41:32 +0000 |
| commit | a0e1ff92b189681df5cf106dc924e76bb05caf31 (patch) | |
| tree | 2f0c35ba65bd0d12d35ea1efb2a6d483c221f033 /scripts | |
| parent | 3940fe87f944bd2067a96b1b6a8c1dc646569690 (diff) | |
| download | openembedded-core-contrib-a0e1ff92b189681df5cf106dc924e76bb05caf31.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)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -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): logger.debug("Updating meta data via git ...") # Try using 'git pull', if failed, use 'git clone' if os.path.exists(os.path.join(basepath, 'layers/.git')): - ret = subprocess.call("cd layers && git pull", shell=True) + ret = subprocess.call("cd layers && git pull %s/layers/.git" % updateserver, shell=True) else: ret = -1 if ret != 0: - ret = subprocess.call("rm -rf layers && git clone %s/layers" % updateserver, shell=True) + ret = subprocess.call("rm -rf layers && git clone %s/layers/.git" % updateserver, shell=True) if ret != 0: logger.error("Updating meta data via git failed") return ret |