diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-02-19 16:39:59 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-23 08:08:19 +0000 |
| commit | a770c3764efa857a8b1f0ce4b398277cd483a6af (patch) | |
| tree | 6cddbd97ce07719d53bbdd9b8af1beb105934841 | |
| parent | 94f517ad8e55edfbe6f06afd963bcfeb849626ff (diff) | |
| download | openembedded-core-a770c3764efa857a8b1f0ce4b398277cd483a6af.tar.gz openembedded-core-a770c3764efa857a8b1f0ce4b398277cd483a6af.tar.bz2 openembedded-core-a770c3764efa857a8b1f0ce4b398277cd483a6af.zip | |
lib/oe/recipeutils: minor improvements to patch_recipe()
* Ensure it knows where to put SRCREV and S
* Handle prepend/append and functions in general
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/recipeutils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index 1758dcecba..159a103719 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py @@ -18,7 +18,7 @@ from collections import OrderedDict, defaultdict # Help us to find places to insert values -recipe_progression = ['SUMMARY', 'DESCRIPTION', 'HOMEPAGE', 'BUGTRACKER', 'SECTION', 'LICENSE', 'LIC_FILES_CHKSUM', 'PROVIDES', 'DEPENDS', 'PR', 'PV', 'SRC_URI', 'do_fetch', 'do_unpack', 'do_patch', 'EXTRA_OECONF', 'do_configure', 'EXTRA_OEMAKE', 'do_compile', 'do_install', 'do_populate_sysroot', 'INITSCRIPT', 'USERADD', 'GROUPADD', 'PACKAGES', 'FILES', 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RPROVIDES', 'RREPLACES', 'RCONFLICTS', 'ALLOW_EMPTY', 'do_package', 'do_deploy'] +recipe_progression = ['SUMMARY', 'DESCRIPTION', 'HOMEPAGE', 'BUGTRACKER', 'SECTION', 'LICENSE', 'LIC_FILES_CHKSUM', 'PROVIDES', 'DEPENDS', 'PR', 'PV', 'SRCREV', 'SRC_URI', 'S', 'do_fetch', 'do_unpack', 'do_patch', 'EXTRA_OECONF', 'do_configure', 'EXTRA_OEMAKE', 'do_compile', 'do_install', 'do_populate_sysroot', 'INITSCRIPT', 'USERADD', 'GROUPADD', 'PACKAGES', 'FILES', 'RDEPENDS', 'RRECOMMENDS', 'RSUGGESTS', 'RPROVIDES', 'RREPLACES', 'RCONFLICTS', 'ALLOW_EMPTY', 'do_package', 'do_deploy'] # Variables that sometimes are a bit long but shouldn't be wrapped nowrap_vars = ['SUMMARY', 'HOMEPAGE', 'BUGTRACKER'] list_vars = ['SRC_URI', 'LIC_FILES_CHKSUM'] @@ -113,7 +113,7 @@ def patch_recipe_file(fn, values, patch=False, relpath=''): insert = False for k in remainingnames.keys(): for p in recipe_progression: - if re.match('^%s[ ?:=]' % p, line): + if re.match('^%s(_prepend|_append)*[ ?:=(]' % p, line): if remainingnames[k] > -1 and recipe_progression.index(p) > remainingnames[k] and runthrough > 1 and not k in existingnames: outputvalue(k) del remainingnames[k] |