summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-02-24 15:57:07 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:33:00 +0000
commit5cd3be38f28c7e6fd55eb3749c0f18a0eba83ed8 (patch)
tree0cf9e41392b9993a28083d227d3b675d4c37b4e1 /scripts
parente6f684b10cf50e8f0b2d3f5bd2f1e0c367a3bab2 (diff)
downloadpoky-5cd3be38f28c7e6fd55eb3749c0f18a0eba83ed8.tar.gz
devtool: upgrade: drop PR on upgrade
The PR value should be reset to the default when upgrading, so we need to drop it from the newly created file. (From OE-Core rev: 4acf8a6912106dd3da5ceee9e30ccce86211d04b) 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.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index 50c670eeb3..14dc14c067 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -286,13 +286,14 @@ def _create_new_recipe(newpv, md5, sha256, srcrev, srcbranch, workspace, tinfoil
286 if changed: 286 if changed:
287 newvalues['SRC_URI'] = ' '.join(new_src_uri) 287 newvalues['SRC_URI'] = ' '.join(new_src_uri)
288 288
289 newvalues['PR'] = None
290
289 if md5 and sha256: 291 if md5 and sha256:
290 newvalues['SRC_URI[md5sum]'] = md5 292 newvalues['SRC_URI[md5sum]'] = md5
291 newvalues['SRC_URI[sha256sum]'] = sha256 293 newvalues['SRC_URI[sha256sum]'] = sha256
292 294
293 if newvalues: 295 rd = oe.recipeutils.parse_recipe(fullpath, None, tinfoil.config_data)
294 rd = oe.recipeutils.parse_recipe(fullpath, None, tinfoil.config_data) 296 oe.recipeutils.patch_recipe(rd, fullpath, newvalues)
295 oe.recipeutils.patch_recipe(rd, fullpath, newvalues)
296 297
297 return fullpath 298 return fullpath
298 299