summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-02-23 12:01:44 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:33:00 +0000
commit66a781c7e1dc74f4cfc1e80b4482d4aa1b7776dc (patch)
tree6020b0f06962b552052b50cd64688255428ebb08
parentd30cc760394e77af64cc63add20344477789f97b (diff)
downloadpoky-66a781c7e1dc74f4cfc1e80b4482d4aa1b7776dc.tar.gz
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. (From OE-Core rev: a4f3e6d5f4c549e36cce1e18801a565a3a3c9b0a) 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>
-rw-r--r--scripts/lib/devtool/upgrade.py2
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
179 md5 = None 179 md5 = None
180 sha256 = None 180 sha256 = None
181 else: 181 else:
182 __run('git checkout -b devtool-%s' % newpv) 182 __run('git checkout devtool-base -b devtool-%s' % newpv)
183 183
184 tmpdir = tempfile.mkdtemp(prefix='devtool') 184 tmpdir = tempfile.mkdtemp(prefix='devtool')
185 try: 185 try: