diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-02-26 06:55:05 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-03-15 17:22:49 +0300 |
| commit | d7bf8c17eca8f8c89898a7794462c773c449e983 (patch) | |
| tree | d18618fca85ca5f0c077032cc7b009344b60f663 /import-layers/yocto-poky/scripts/lib/devtool/sdk.py | |
| parent | e2b5abdc9f28cdf8578e5b9be803c8e697443c20 (diff) | |
| download | openbmc-d7bf8c17eca8f8c89898a7794462c773c449e983.tar.xz | |
Yocto 2.4
Move OpenBMC to Yocto 2.4(rocko)
Tested: Built and verified Witherspoon and Palmetto images
Change-Id: I12057b18610d6fb0e6903c60213690301e9b0c67
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'import-layers/yocto-poky/scripts/lib/devtool/sdk.py')
| -rw-r--r-- | import-layers/yocto-poky/scripts/lib/devtool/sdk.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/import-layers/yocto-poky/scripts/lib/devtool/sdk.py b/import-layers/yocto-poky/scripts/lib/devtool/sdk.py index e8bf0ad98..f46577c2a 100644 --- a/import-layers/yocto-poky/scripts/lib/devtool/sdk.py +++ b/import-layers/yocto-poky/scripts/lib/devtool/sdk.py @@ -155,7 +155,7 @@ def sdk_update(args, config, basepath, workspace): if os.path.exists(os.path.join(basepath, 'layers/.git')): out = subprocess.check_output("git status --porcelain", shell=True, cwd=layers_dir) if not out: - ret = subprocess.call("git fetch --all; git reset --hard", shell=True, cwd=layers_dir) + ret = subprocess.call("git fetch --all; git reset --hard @{u}", shell=True, cwd=layers_dir) else: logger.error("Failed to update metadata as there have been changes made to it. Aborting."); logger.error("Changed files:\n%s" % out); |