diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-11-10 14:45:17 +1300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-23 11:02:27 +0000 |
| commit | e47d21624dfec6f71742b837e91da553f18a28c5 (patch) | |
| tree | 4d5296657218b97ee68070f5f04087bdf74a20ab /meta/lib/oe | |
| parent | d9971f5dc8eb7de551fd6f5e058fd24770ef5d78 (diff) | |
| download | openembedded-core-contrib-e47d21624dfec6f71742b837e91da553f18a28c5.tar.gz | |
devtool: update-recipe: fix handling of compressed local patches
It is possible to use gzip or bzip2 to compress patches and still refer
to them in compressed form in the SRC_URI value within a recipe. If you
run "devtool modify" on such a recipe, make changes to the commit for
the patch and then run devtool update-recipe, we need to correctly
associate the commit back to the compressed patch file and re-compress
the patch, neither of which we were doing previously.
Additionally, add an oe-selftest test to ensure this doesn't regress in
future.
Fixes [YOCTO #8278].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/lib/oe')
| -rw-r--r-- | meta/lib/oe/recipeutils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 6caae5f7d4..ab4177aa81 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -397,7 +397,7 @@ def get_recipe_local_files(d, patches=False): for uri in uris: if fetch.ud[uri].type == 'file': if (not patches and - bb.utils.exec_flat_python_func('patch_path', uri, fetch, '')): + bb.utils.exec_flat_python_func('patch_path', uri, fetch, '', expand=False)): continue # Skip files that are referenced by absolute path fname = fetch.ud[uri].basepath @@ -418,7 +418,7 @@ def get_recipe_patches(d): patchfiles = [] # Execute src_patches() defined in patch.bbclass - this works since that class # is inherited globally - patches = bb.utils.exec_flat_python_func('src_patches', d) + patches = bb.utils.exec_flat_python_func('src_patches', d, expand=False) for patch in patches: _, _, local, _, _, parm = bb.fetch.decodeurl(patch) patchfiles.append(local) @@ -437,7 +437,7 @@ def get_recipe_patched_files(d): import oe.patch # Execute src_patches() defined in patch.bbclass - this works since that class # is inherited globally - patches = bb.utils.exec_flat_python_func('src_patches', d) + patches = bb.utils.exec_flat_python_func('src_patches', d, expand=False) patchedfiles = {} for patch in patches: _, _, patchfile, _, _, parm = bb.fetch.decodeurl(patch) |