mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-13 18:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

devtool: upgrade: drop PR on upgrade

Browse Source 
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>
This commit is contained in:
Paul Eggleton
2016-02-24 15:57:07 +13:00
committed by Richard Purdie
parent e6f684b10c
commit 5cd3be38f2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/lib/devtool/upgrade.py
View File

@@ -286,13 +286,14 @@ def _create_new_recipe(newpv, md5, sha256, srcrev, srcbranch, workspace, tinfoil
if changed: if changed:
newvalues['SRC_URI'] = ' '.join(new_src_uri) newvalues['SRC_URI'] = ' '.join(new_src_uri)
newvalues['PR'] = None
if md5 and sha256: if md5 and sha256:
newvalues['SRC_URI[md5sum]'] = md5 newvalues['SRC_URI[md5sum]'] = md5
newvalues['SRC_URI[sha256sum]'] = sha256 newvalues['SRC_URI[sha256sum]'] = sha256
if newvalues: rd = oe.recipeutils.parse_recipe(fullpath, None, tinfoil.config_data)
rd = oe.recipeutils.parse_recipe(fullpath, None, tinfoil.config_data) oe.recipeutils.patch_recipe(rd, fullpath, newvalues)
oe.recipeutils.patch_recipe(rd, fullpath, newvalues)
return fullpath return fullpath