diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-02-23 12:01:44 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-28 11:32:36 +0000 |
| commit | a4f3e6d5f4c549e36cce1e18801a565a3a3c9b0a (patch) | |
| tree | 747a7a4a6f1b1c99f55c6e673d3c388e5f09ba68 | |
| parent | e144db3650b4a7c0a59066621905f34a5400303e (diff) | |
| download | openembedded-core-a4f3e6d5f4c549e36cce1e18801a565a3a3c9b0a.tar.gz openembedded-core-a4f3e6d5f4c549e36cce1e18801a565a3a3c9b0a.tar.bz2 openembedded-core-a4f3e6d5f4c549e36cce1e18801a565a3a3c9b0a.zip | |
devtool: upgrade: fix constructing new branch from tarball releases
When we do an upgrade from one tarball version to another we want to:
1) Check out the old version as a new branch
2) Record the changes between the old and new versions as a commit
3) Check out the old version with patches applied
4) Rebase that onto the new branch
Where we went wrong was step #1 where instead we checked out the old
version with patches applied as the new branch, which meant the rebase
didn't do anything and any changes made by the patches to files still in
the new version were wiped out.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | scripts/lib/devtool/upgrade.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 9a308b1218..fab7b15e3f 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -179,7 +179,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, branch, keep_temp, tin md5 = None sha256 = None else: - __run('git checkout -b devtool-%s' % newpv) + __run('git checkout devtool-base -b devtool-%s' % newpv) tmpdir = tempfile.mkdtemp(prefix='devtool') try: |