diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-02-24 15:57:07 +1300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-28 11:33:00 +0000 |
| commit | 5cd3be38f28c7e6fd55eb3749c0f18a0eba83ed8 (patch) | |
| tree | 0cf9e41392b9993a28083d227d3b675d4c37b4e1 /scripts | |
| parent | e6f684b10cf50e8f0b2d3f5bd2f1e0c367a3bab2 (diff) | |
| download | openembedded-core-contrib-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.py | 7 |
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 if changed: newvalues['SRC_URI'] = ' '.join(new_src_uri) + newvalues['PR'] = None + if md5 and sha256: newvalues['SRC_URI[md5sum]'] = md5 newvalues['SRC_URI[sha256sum]'] = sha256 - if newvalues: - rd = oe.recipeutils.parse_recipe(fullpath, None, tinfoil.config_data) - oe.recipeutils.patch_recipe(rd, fullpath, newvalues) + rd = oe.recipeutils.parse_recipe(fullpath, None, tinfoil.config_data) + oe.recipeutils.patch_recipe(rd, fullpath, newvalues) return fullpath |