diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-11-23 10:07:57 +1300 |
---|---|---|
committer | Robert Yang <liezhi.yang@windriver.com> | 2015-12-27 23:03:15 -0800 |
commit | 2c8afd6aae775ab10dd30eb890fc410739048d79 (patch) | |
tree | 70e67f2b776f343ab481b9de520ad21d09a1412a /scripts | |
parent | 9816c0a2ad2c1011e298d734576b531de9947740 (diff) | |
download | openembedded-core-contrib-2c8afd6aae775ab10dd30eb890fc410739048d79.tar.gz |
devtool: upgrade: fetch remote repository before checking out new revision
If we're upgrading a recipe that fetches from git, and we've simply
fetched a tarball of the repo instead of directly from the upstream repo
(this can happen if you have PREMIRRORS set up as in poky with a core recipe,
e.g. kernelshark) then we won't have any new revisions, and the checkout
will fail with "fatal: reference is not a tree: <hash>". To avoid this,
do a "git fetch" before checking out the new revision.
(From OE-Core master rev: c4daebf3fe797a8063dcbc2ab229be2fbedc8134)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/devtool/upgrade.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index f033fc8010..6bac44bb5c 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -199,6 +199,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, branch, keep_temp, tin if srcrev: rev = srcrev if uri.startswith('git://'): + __run('git fetch') __run('git checkout %s' % rev) __run('git tag -f devtool-base-new') md5 = None |