summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-02-19 16:39:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-23 17:35:29 +0000
commit6015deb9f37d1e15bee0594252bfc474cca66902 (patch)
treeb53c45fe60fa6e7fb45eb74f34a7eb2aa580ac18 /meta
parente5bf4ed333cf11f2835a44df36719dddbb171a3a (diff)
downloadpoky-6015deb9f37d1e15bee0594252bfc474cca66902.tar.gz
lib/oe/recipeutils: minor improvements to patch_recipe()
* Ensure it knows where to put SRCREV and S * Handle prepend/append and functions in general (From OE-Core rev: a770c3764efa857a8b1f0ce4b398277cd483a6af) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/recipeutils.py4
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
18 18
19 19
20# Help us to find places to insert values 20# Help us to find places to insert values
21recipe_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'] 21recipe_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']
22# Variables that sometimes are a bit long but shouldn't be wrapped 22# Variables that sometimes are a bit long but shouldn't be wrapped
23nowrap_vars = ['SUMMARY', 'HOMEPAGE', 'BUGTRACKER'] 23nowrap_vars = ['SUMMARY', 'HOMEPAGE', 'BUGTRACKER']
24list_vars = ['SRC_URI', 'LIC_FILES_CHKSUM'] 24list_vars = ['SRC_URI', 'LIC_FILES_CHKSUM']
@@ -113,7 +113,7 @@ def patch_recipe_file(fn, values, patch=False, relpath=''):
113 insert = False 113 insert = False
114 for k in remainingnames.keys(): 114 for k in remainingnames.keys():
115 for p in recipe_progression: 115 for p in recipe_progression:
116 if re.match('^%s[ ?:=]' % p, line): 116 if re.match('^%s(_prepend|_append)*[ ?:=(]' % p, line):
117 if remainingnames[k] > -1 and recipe_progression.index(p) > remainingnames[k] and runthrough > 1 and not k in existingnames: 117 if remainingnames[k] > -1 and recipe_progression.index(p) > remainingnames[k] and runthrough > 1 and not k in existingnames:
118 outputvalue(k) 118 outputvalue(k)
119 del remainingnames[k] 119 del remainingnames[k]