diff options
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/classextend.py | 4 | ||||
-rw-r--r-- | meta/lib/oe/recipeutils.py | 16 | ||||
-rw-r--r-- | meta/lib/oe/sstatesig.py | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py index d3d8fbe724..e08d788b75 100644 --- a/meta/lib/oe/classextend.py +++ b/meta/lib/oe/classextend.py | |||
@@ -87,7 +87,7 @@ class ClassExtender(object): | |||
87 | def map_depends_variable(self, varname, suffix = ""): | 87 | def map_depends_variable(self, varname, suffix = ""): |
88 | # We need to preserve EXTENDPKGV so it can be expanded correctly later | 88 | # We need to preserve EXTENDPKGV so it can be expanded correctly later |
89 | if suffix: | 89 | if suffix: |
90 | varname = varname + "_" + suffix | 90 | varname = varname + ":" + suffix |
91 | orig = self.d.getVar("EXTENDPKGV", False) | 91 | orig = self.d.getVar("EXTENDPKGV", False) |
92 | self.d.setVar("EXTENDPKGV", "EXTENDPKGV") | 92 | self.d.setVar("EXTENDPKGV", "EXTENDPKGV") |
93 | deps = self.d.getVar(varname) | 93 | deps = self.d.getVar(varname) |
@@ -142,7 +142,7 @@ class ClassExtender(object): | |||
142 | if pkg_mapping[0].startswith("${") and pkg_mapping[0].endswith("}"): | 142 | if pkg_mapping[0].startswith("${") and pkg_mapping[0].endswith("}"): |
143 | continue | 143 | continue |
144 | for subs in variables: | 144 | for subs in variables: |
145 | self.d.renameVar("%s_%s" % (subs, pkg_mapping[0]), "%s_%s" % (subs, pkg_mapping[1])) | 145 | self.d.renameVar("%s:%s" % (subs, pkg_mapping[0]), "%s:%s" % (subs, pkg_mapping[1])) |
146 | 146 | ||
147 | class NativesdkClassExtender(ClassExtender): | 147 | class NativesdkClassExtender(ClassExtender): |
148 | def map_depends(self, dep): | 148 | def map_depends(self, dep): |
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index a66bb92823..a0c6974f04 100644 --- a/meta/lib/oe/recipeutils.py +++ b/meta/lib/oe/recipeutils.py | |||
@@ -47,7 +47,7 @@ def simplify_history(history, d): | |||
47 | continue | 47 | continue |
48 | has_set = True | 48 | has_set = True |
49 | elif event['op'] in ('append', 'prepend', 'postdot', 'predot'): | 49 | elif event['op'] in ('append', 'prepend', 'postdot', 'predot'): |
50 | # Reminder: "append" and "prepend" mean += and =+ respectively, NOT _append / _prepend | 50 | # Reminder: "append" and "prepend" mean += and =+ respectively, NOT :append / :prepend |
51 | if has_set: | 51 | if has_set: |
52 | continue | 52 | continue |
53 | ret_history.insert(0, event) | 53 | ret_history.insert(0, event) |
@@ -342,7 +342,7 @@ def patch_recipe(d, fn, varvalues, patch=False, relpath='', redirect_output=None | |||
342 | def override_applicable(hevent): | 342 | def override_applicable(hevent): |
343 | op = hevent['op'] | 343 | op = hevent['op'] |
344 | if '[' in op: | 344 | if '[' in op: |
345 | opoverrides = op.split('[')[1].split(']')[0].split('_') | 345 | opoverrides = op.split('[')[1].split(']')[0].split(':') |
346 | for opoverride in opoverrides: | 346 | for opoverride in opoverrides: |
347 | if not opoverride in overrides: | 347 | if not opoverride in overrides: |
348 | return False | 348 | return False |
@@ -368,13 +368,13 @@ def patch_recipe(d, fn, varvalues, patch=False, relpath='', redirect_output=None | |||
368 | recipe_set = True | 368 | recipe_set = True |
369 | if not recipe_set: | 369 | if not recipe_set: |
370 | for event in history: | 370 | for event in history: |
371 | if event['op'].startswith('_remove'): | 371 | if event['op'].startswith(':remove'): |
372 | continue | 372 | continue |
373 | if not override_applicable(event): | 373 | if not override_applicable(event): |
374 | continue | 374 | continue |
375 | newvalue = value.replace(event['detail'], '') | 375 | newvalue = value.replace(event['detail'], '') |
376 | if newvalue == value and os.path.abspath(event['file']) == fn and event['op'].startswith('_'): | 376 | if newvalue == value and os.path.abspath(event['file']) == fn and event['op'].startswith(':'): |
377 | op = event['op'].replace('[', '_').replace(']', '') | 377 | op = event['op'].replace('[', ':').replace(']', '') |
378 | extravals[var + op] = None | 378 | extravals[var + op] = None |
379 | value = newvalue | 379 | value = newvalue |
380 | vals[var] = ('+=', value) | 380 | vals[var] = ('+=', value) |
@@ -758,7 +758,7 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, wildcardver=False, | |||
758 | appendoverride = '' | 758 | appendoverride = '' |
759 | if machine: | 759 | if machine: |
760 | bbappendlines.append(('PACKAGE_ARCH', '=', '${MACHINE_ARCH}')) | 760 | bbappendlines.append(('PACKAGE_ARCH', '=', '${MACHINE_ARCH}')) |
761 | appendoverride = '_%s' % machine | 761 | appendoverride = ':%s' % machine |
762 | copyfiles = {} | 762 | copyfiles = {} |
763 | if srcfiles: | 763 | if srcfiles: |
764 | instfunclines = [] | 764 | instfunclines = [] |
@@ -853,11 +853,11 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, wildcardver=False, | |||
853 | newvalue = splitval | 853 | newvalue = splitval |
854 | if len(newvalue) == 1: | 854 | if len(newvalue) == 1: |
855 | # Ensure it's written out as one line | 855 | # Ensure it's written out as one line |
856 | if '_append' in varname: | 856 | if ':append' in varname: |
857 | newvalue = ' ' + newvalue[0] | 857 | newvalue = ' ' + newvalue[0] |
858 | else: | 858 | else: |
859 | newvalue = newvalue[0] | 859 | newvalue = newvalue[0] |
860 | if not newvalue and (op in ['+=', '.='] or '_append' in varname): | 860 | if not newvalue and (op in ['+=', '.='] or ':append' in varname): |
861 | # There's no point appending nothing | 861 | # There's no point appending nothing |
862 | newvalue = None | 862 | newvalue = None |
863 | if varname.endswith('()'): | 863 | if varname.endswith('()'): |
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index f460c50c10..78cdf878f1 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py | |||
@@ -246,7 +246,7 @@ class SignatureGeneratorOEBasicHashMixIn(object): | |||
246 | continue | 246 | continue |
247 | f.write(" " + self.lockedpnmap[fn] + ":" + task + ":" + self.get_unihash(tid) + " \\\n") | 247 | f.write(" " + self.lockedpnmap[fn] + ":" + task + ":" + self.get_unihash(tid) + " \\\n") |
248 | f.write(' "\n') | 248 | f.write(' "\n') |
249 | f.write('SIGGEN_LOCKEDSIGS_TYPES_%s = "%s"' % (self.machine, " ".join(l))) | 249 | f.write('SIGGEN_LOCKEDSIGS_TYPES:%s = "%s"' % (self.machine, " ".join(l))) |
250 | 250 | ||
251 | def dump_siglist(self, sigfile, path_prefix_strip=None): | 251 | def dump_siglist(self, sigfile, path_prefix_strip=None): |
252 | def strip_fn(fn): | 252 | def strip_fn(fn): |