diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-11-23 10:07:57 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-12 08:42:30 +0000 |
commit | 49858bdc02b8bada1943acd9c77318f71917a6c2 (patch) | |
tree | 73d43d8fa73f5844d0fb14cb32a662a8af93fce1 /scripts/lib | |
parent | d2134528a6c6db6395e2ca5bcf859b36cf255435 (diff) | |
download | poky-49858bdc02b8bada1943acd9c77318f71917a6c2.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)
(From OE-Core rev: 2c8afd6aae775ab10dd30eb890fc410739048d79)
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/lib')
-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 | |||
199 | if srcrev: | 199 | if srcrev: |
200 | rev = srcrev | 200 | rev = srcrev |
201 | if uri.startswith('git://'): | 201 | if uri.startswith('git://'): |
202 | __run('git fetch') | ||
202 | __run('git checkout %s' % rev) | 203 | __run('git checkout %s' % rev) |
203 | __run('git tag -f devtool-base-new') | 204 | __run('git tag -f devtool-base-new') |
204 | md5 = None | 205 | md5 = None |