summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/insane.bbclass2
-rw-r--r--meta/classes/kernel-grub.bbclass8
-rw-r--r--meta/classes/native.bbclass2
-rw-r--r--meta/classes/package.bbclass2
-rw-r--r--meta/classes/populate_sdk_ext.bbclass2
-rw-r--r--meta/classes/qemuboot.bbclass2
-rw-r--r--meta/classes/sanity.bbclass2
-rw-r--r--meta/classes/systemd.bbclass2
-rw-r--r--meta/classes/useradd.bbclass2
-rw-r--r--meta/lib/oe/classextend.py4
-rw-r--r--meta/lib/oe/recipeutils.py16
-rw-r--r--meta/lib/oe/sstatesig.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/efibootpartition.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/incompatible_lic.py6
-rw-r--r--meta/lib/oeqa/selftest/cases/recipetool.py4
-rw-r--r--meta/lib/oeqa/selftest/cases/wic.py4
-rw-r--r--meta/recipes-core/volatile-binds/volatile-binds.bb2
-rw-r--r--meta/recipes-devtools/gdb/gdb.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc4
-rwxr-xr-xscripts/devtool2
-rw-r--r--scripts/lib/devtool/standard.py8
21 files changed, 41 insertions, 39 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index f9a35f2..ee858f8 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -1306,7 +1306,7 @@ python () {
1306 # Checking ${FILESEXTRAPATHS} 1306 # Checking ${FILESEXTRAPATHS}
1307 extrapaths = (d.getVar("FILESEXTRAPATHS") or "") 1307 extrapaths = (d.getVar("FILESEXTRAPATHS") or "")
1308 if '__default' not in extrapaths.split(":"): 1308 if '__default' not in extrapaths.split(":"):
1309 msg = "FILESEXTRAPATHS-variable, must always use _prepend (or _append)\n" 1309 msg = "FILESEXTRAPATHS-variable, must always use :prepend (or :append)\n"
1310 msg += "type of assignment, and don't forget the colon.\n" 1310 msg += "type of assignment, and don't forget the colon.\n"
1311 msg += "Please assign it with the format of:\n" 1311 msg += "Please assign it with the format of:\n"
1312 msg += " FILESEXTRAPATHS:append := \":${THISDIR}/Your_Files_Path\" or\n" 1312 msg += " FILESEXTRAPATHS:append := \":${THISDIR}/Your_Files_Path\" or\n"
diff --git a/meta/classes/kernel-grub.bbclass b/meta/classes/kernel-grub.bbclass
index 0bf8fda..44b2015 100644
--- a/meta/classes/kernel-grub.bbclass
+++ b/meta/classes/kernel-grub.bbclass
@@ -97,9 +97,9 @@ python __anonymous () {
97 97
98 for type in imagetypes.split(): 98 for type in imagetypes.split():
99 typelower = type.lower() 99 typelower = type.lower()
100 preinst:append = preinst.replace('KERNEL_IMAGETYPE', type) 100 preinst_append = preinst.replace('KERNEL_IMAGETYPE', type)
101 postinst:prepend = postinst.replace('KERNEL_IMAGETYPE', type) 101 postinst_prepend = postinst.replace('KERNEL_IMAGETYPE', type)
102 d.setVar('pkg_preinst:kernel-image-' + typelower + '_append', preinst:append) 102 d.setVar('pkg_preinst:kernel-image-' + typelower + ':append', preinst_append)
103 d.setVar('pkg_postinst:kernel-image-' + typelower + '_prepend', postinst:prepend) 103 d.setVar('pkg_postinst:kernel-image-' + typelower + ':prepend', postinst_prepend)
104} 104}
105 105
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 61becfb..76a599b 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -133,7 +133,7 @@ python native_virtclass_handler () {
133 133
134 def map_dependencies(varname, d, suffix = "", selfref=True): 134 def map_dependencies(varname, d, suffix = "", selfref=True):
135 if suffix: 135 if suffix:
136 varname = varname + "_" + suffix 136 varname = varname + ":" + suffix
137 deps = d.getVar(varname) 137 deps = d.getVar(varname)
138 if not deps: 138 if not deps:
139 return 139 return
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index fb8e951..a659a1e 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1583,7 +1583,7 @@ fi
1583 scriptlet = scriptlet_split[0] + "\nset -e\n" + "\n".join(scriptlet_split[1:]) 1583 scriptlet = scriptlet_split[0] + "\nset -e\n" + "\n".join(scriptlet_split[1:])
1584 else: 1584 else:
1585 scriptlet = "set -e\n" + "\n".join(scriptlet_split[0:]) 1585 scriptlet = "set -e\n" + "\n".join(scriptlet_split[0:])
1586 d.setVar('%s_%s' % (scriptlet_name, pkg), scriptlet) 1586 d.setVar('%s:%s' % (scriptlet_name, pkg), scriptlet)
1587 1587
1588 def write_if_exists(f, pkg, var): 1588 def write_if_exists(f, pkg, var):
1589 def encode(str): 1589 def encode(str):
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index f678497..10f3265 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -147,7 +147,7 @@ def create_filtered_tasklist(d, sdkbasepath, tasklistfile, conf_initpath):
147 try: 147 try:
148 with open(sdkbasepath + '/conf/local.conf', 'a') as f: 148 with open(sdkbasepath + '/conf/local.conf', 'a') as f:
149 # Force the use of sstate from the build system 149 # Force the use of sstate from the build system
150 f.write('\nSSTATE_DIR_forcevariable = "%s"\n' % d.getVar('SSTATE_DIR')) 150 f.write('\nSSTATE_DIR:forcevariable = "%s"\n' % d.getVar('SSTATE_DIR'))
151 f.write('SSTATE_MIRRORS:forcevariable = "file://universal/(.*) file://universal-4.9/\\1 file://universal-4.9/(.*) file://universal-4.8/\\1"\n') 151 f.write('SSTATE_MIRRORS:forcevariable = "file://universal/(.*) file://universal-4.9/\\1 file://universal-4.9/(.*) file://universal-4.8/\\1"\n')
152 # Ensure TMPDIR is the default so that clean_esdk_builddir() can delete it 152 # Ensure TMPDIR is the default so that clean_esdk_builddir() can delete it
153 f.write('TMPDIR:forcevariable = "${TOPDIR}/tmp"\n') 153 f.write('TMPDIR:forcevariable = "${TOPDIR}/tmp"\n')
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
index aaf821d..bf529e9 100644
--- a/meta/classes/qemuboot.bbclass
+++ b/meta/classes/qemuboot.bbclass
@@ -122,6 +122,8 @@ python do_write_qemuboot_conf() {
122 cf = configparser.ConfigParser() 122 cf = configparser.ConfigParser()
123 cf.add_section('config_bsp') 123 cf.add_section('config_bsp')
124 for k in sorted(qemuboot_vars(d)): 124 for k in sorted(qemuboot_vars(d)):
125 if ":" in k:
126 continue
125 # qemu-helper-native sysroot is not removed by rm_work and 127 # qemu-helper-native sysroot is not removed by rm_work and
126 # contains all tools required by runqemu 128 # contains all tools required by runqemu
127 if k == 'STAGING_BINDIR_NATIVE': 129 if k == 'STAGING_BINDIR_NATIVE':
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 29cc42e..ddba1e6 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -199,7 +199,7 @@ def check_toolchain_tune_args(data, tune, multilib, errs):
199 199
200def check_toolchain_args_present(data, tune, multilib, tune_errors, which): 200def check_toolchain_args_present(data, tune, multilib, tune_errors, which):
201 args_set = (data.getVar("TUNE_%s" % which) or "").split() 201 args_set = (data.getVar("TUNE_%s" % which) or "").split()
202 args_wanted = (data.getVar("TUNEABI_REQUIRED_%s_tune-%s" % (which, tune)) or "").split() 202 args_wanted = (data.getVar("TUNEABI_REQUIRED_%s:tune-%s" % (which, tune)) or "").split()
203 args_missing = [] 203 args_missing = []
204 204
205 # If no args are listed/required, we are done. 205 # If no args are listed/required, we are done.
diff --git a/meta/classes/systemd.bbclass b/meta/classes/systemd.bbclass
index 2a272a2..09ec527 100644
--- a/meta/classes/systemd.bbclass
+++ b/meta/classes/systemd.bbclass
@@ -70,7 +70,7 @@ python systemd_populate_packages() {
70 return 70 return
71 71
72 def get_package_var(d, var, pkg): 72 def get_package_var(d, var, pkg):
73 val = (d.getVar('%s_%s' % (var, pkg)) or "").strip() 73 val = (d.getVar('%s:%s' % (var, pkg)) or "").strip()
74 if val == "": 74 if val == "":
75 val = (d.getVar(var) or "").strip() 75 val = (d.getVar(var) or "").strip()
76 return val 76 return val
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index fdec5cc..287ef84 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -199,7 +199,7 @@ python __anonymous() {
199def get_all_cmd_params(d, cmd_type): 199def get_all_cmd_params(d, cmd_type):
200 import string 200 import string
201 201
202 param_type = cmd_type.upper() + "_PARAM_%s" 202 param_type = cmd_type.upper() + "_PARAM:%s"
203 params = [] 203 params = []
204 204
205 useradd_packages = d.getVar('USERADD_PACKAGES') or "" 205 useradd_packages = d.getVar('USERADD_PACKAGES') or ""
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py
index d3d8fbe..e08d788 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
147class NativesdkClassExtender(ClassExtender): 147class 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 a66bb92..a0c6974 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 f460c50..78cdf87 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):
diff --git a/meta/lib/oeqa/selftest/cases/efibootpartition.py b/meta/lib/oeqa/selftest/cases/efibootpartition.py
index 3203a7b..26de3a0 100644
--- a/meta/lib/oeqa/selftest/cases/efibootpartition.py
+++ b/meta/lib/oeqa/selftest/cases/efibootpartition.py
@@ -26,7 +26,7 @@ class GenericEFITest(OESelftestTestCase):
26 self.write_config(self, 26 self.write_config(self,
27""" 27"""
28EFI_PROVIDER = "%s" 28EFI_PROVIDER = "%s"
29IMAGE_FSTYPES:pn-%s_append = " wic" 29IMAGE_FSTYPES:pn-%s:append = " wic"
30MACHINE = "%s" 30MACHINE = "%s"
31MACHINE_FEATURES:append = " efi" 31MACHINE_FEATURES:append = " efi"
32WKS_FILE = "efi-bootdisk.wks.in" 32WKS_FILE = "efi-bootdisk.wks.in"
diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
index 93be434..aa8e085 100644
--- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py
+++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
@@ -98,7 +98,7 @@ INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0 LGPL-3.0"
98 raise AssertionError(result.output) 98 raise AssertionError(result.output)
99 99
100 def test_bash_and_license(self): 100 def test_bash_and_license(self):
101 self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = " & SomeLicense"') 101 self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " & SomeLicense"')
102 error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash cannot be installed into the image because it has incompatible license(s): GPL-3.0-or-later" 102 error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash cannot be installed into the image because it has incompatible license(s): GPL-3.0-or-later"
103 103
104 result = bitbake('core-image-minimal', ignore_status=True) 104 result = bitbake('core-image-minimal', ignore_status=True)
@@ -106,12 +106,12 @@ INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0 LGPL-3.0"
106 raise AssertionError(result.output) 106 raise AssertionError(result.output)
107 107
108 def test_bash_or_license(self): 108 def test_bash_or_license(self):
109 self.write_config(self.default_config() + '\nLICENSE_append_pn-bash = " | SomeLicense"') 109 self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " | SomeLicense"')
110 110
111 bitbake('core-image-minimal') 111 bitbake('core-image-minimal')
112 112
113 def test_bash_whitelist(self): 113 def test_bash_whitelist(self):
114 self.write_config(self.default_config() + '\nWHITELIST_GPL-3.0_pn-core-image-minimal = "bash"') 114 self.write_config(self.default_config() + '\nWHITELIST_GPL-3.0:pn-core-image-minimal = "bash"')
115 115
116 bitbake('core-image-minimal') 116 bitbake('core-image-minimal')
117 117
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py
index 3b99417..6f531df 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -183,9 +183,9 @@ class RecipetoolTests(RecipetoolBase):
183 '\n', 183 '\n',
184 'PACKAGE_ARCH = "${MACHINE_ARCH}"\n', 184 'PACKAGE_ARCH = "${MACHINE_ARCH}"\n',
185 '\n', 185 '\n',
186 'SRC_URI:append_mymachine = " file://testfile"\n', 186 'SRC_URI:append:mymachine = " file://testfile"\n',
187 '\n', 187 '\n',
188 'do_install:append_mymachine() {\n', 188 'do_install:append:mymachine() {\n',
189 ' install -d ${D}${datadir}\n', 189 ' install -d ${D}${datadir}\n',
190 ' install -m 0644 ${WORKDIR}/testfile ${D}${datadir}/something\n', 190 ' install -m 0644 ${WORKDIR}/testfile ${D}${datadir}/something\n',
191 '}\n'] 191 '}\n']
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index 32044e7..2efbe51 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -1035,7 +1035,7 @@ class Wic2(WicTestCase):
1035 @only_for_arch(['i586', 'i686', 'x86_64']) 1035 @only_for_arch(['i586', 'i686', 'x86_64'])
1036 def test_biosplusefi_plugin_qemu(self): 1036 def test_biosplusefi_plugin_qemu(self):
1037 """Test biosplusefi plugin in qemu""" 1037 """Test biosplusefi plugin in qemu"""
1038 config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES_append = " efi"\n' 1038 config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES:append = " efi"\n'
1039 self.append_config(config) 1039 self.append_config(config)
1040 self.assertEqual(0, bitbake('core-image-minimal').status) 1040 self.assertEqual(0, bitbake('core-image-minimal').status)
1041 self.remove_config(config) 1041 self.remove_config(config)
@@ -1072,7 +1072,7 @@ class Wic2(WicTestCase):
1072 # If an image hasn't been built yet, directory ${STAGING_DATADIR}/syslinux won't exists and _get_bootimg_dir() 1072 # If an image hasn't been built yet, directory ${STAGING_DATADIR}/syslinux won't exists and _get_bootimg_dir()
1073 # will raise with "Couldn't find correct bootimg_dir" 1073 # will raise with "Couldn't find correct bootimg_dir"
1074 # The easiest way to work-around this issue is to make sure we already built an image here, hence the bitbake call 1074 # The easiest way to work-around this issue is to make sure we already built an image here, hence the bitbake call
1075 config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES_append = " efi"\n' 1075 config = 'IMAGE_FSTYPES = "wic"\nWKS_FILE = "test_biosplusefi_plugin.wks"\nMACHINE_FEATURES:append = " efi"\n'
1076 self.append_config(config) 1076 self.append_config(config)
1077 self.assertEqual(0, bitbake('core-image-minimal').status) 1077 self.assertEqual(0, bitbake('core-image-minimal').status)
1078 self.remove_config(config) 1078 self.remove_config(config)
diff --git a/meta/recipes-core/volatile-binds/volatile-binds.bb b/meta/recipes-core/volatile-binds/volatile-binds.bb
index 5eeb651..b693c24 100644
--- a/meta/recipes-core/volatile-binds/volatile-binds.bb
+++ b/meta/recipes-core/volatile-binds/volatile-binds.bb
@@ -68,7 +68,7 @@ do_install () {
68 install -m 0755 mount-copybind ${D}${base_sbindir}/ 68 install -m 0755 mount-copybind ${D}${base_sbindir}/
69 69
70 install -d ${D}${systemd_unitdir}/system 70 install -d ${D}${systemd_unitdir}/system
71 for service in ${SYSTEMD_SERVICE_${PN}}; do 71 for service in ${SYSTEMD_SERVICE:${PN}}; do
72 install -m 0644 $service ${D}${systemd_unitdir}/system/ 72 install -m 0644 $service ${D}${systemd_unitdir}/system/
73 done 73 done
74 74
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index f4cd0a5..2b0ae16 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -2,7 +2,7 @@ require gdb-common.inc
2 2
3inherit gettext 3inherit gettext
4 4
5#LDFLAGS_append = " -s" 5#LDFLAGS:append = " -s"
6#export CFLAGS:append=" -L${STAGING_LIBDIR}" 6#export CFLAGS:append=" -L${STAGING_LIBDIR}"
7 7
8# cross-canadian must not see this 8# cross-canadian must not see this
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index c636313..4f446da 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -231,7 +231,7 @@ python __anonymous() {
231 mlprefix = d.getVar("MLPREFIX") 231 mlprefix = d.getVar("MLPREFIX")
232 fullp = mlprefix + p[1] + "-mesa" + suffix 232 fullp = mlprefix + p[1] + "-mesa" + suffix
233 mlprefix = d.getVar("MLPREFIX") 233 mlprefix = d.getVar("MLPREFIX")
234 pkgs = " ".join(mlprefix + x + suffix for x in p[1:]) 234 pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:])
235 d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") 235 d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1")
236 d.appendVar("RREPLACES:" + fullp, pkgs) 236 d.appendVar("RREPLACES:" + fullp, pkgs)
237 d.appendVar("RPROVIDES:" + fullp, pkgs) 237 d.appendVar("RPROVIDES:" + fullp, pkgs)
@@ -241,7 +241,7 @@ python __anonymous() {
241 241
242 # For -dev, the first element is both the Debian and original name 242 # For -dev, the first element is both the Debian and original name
243 fullp = mlprefix + p[1] + "-mesa-dev" + suffix 243 fullp = mlprefix + p[1] + "-mesa-dev" + suffix
244 pkgs = mlprefix + p[1] + "-dev" + suffix 244 pkgs = " " + mlprefix + p[1] + "-dev" + suffix
245 d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") 245 d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1")
246 d.appendVar("RREPLACES:" + fullp, pkgs) 246 d.appendVar("RREPLACES:" + fullp, pkgs)
247 d.appendVar("RPROVIDES:" + fullp, pkgs) 247 d.appendVar("RPROVIDES:" + fullp, pkgs)
diff --git a/scripts/devtool b/scripts/devtool
index 8a4f41b..af4811b 100755
--- a/scripts/devtool
+++ b/scripts/devtool
@@ -100,7 +100,7 @@ def read_workspace():
100 _enable_workspace_layer(config.workspace_path, config, basepath) 100 _enable_workspace_layer(config.workspace_path, config, basepath)
101 101
102 logger.debug('Reading workspace in %s' % config.workspace_path) 102 logger.debug('Reading workspace in %s' % config.workspace_path)
103 externalsrc_re = re.compile(r'^EXTERNALSRC(_pn-([^ =]+))? *= *"([^"]*)"$') 103 externalsrc_re = re.compile(r'^EXTERNALSRC(:pn-([^ =]+))? *= *"([^"]*)"$')
104 for fn in glob.glob(os.path.join(config.workspace_path, 'appends', '*.bbappend')): 104 for fn in glob.glob(os.path.join(config.workspace_path, 'appends', '*.bbappend')):
105 with open(fn, 'r') as f: 105 with open(fn, 'r') as f:
106 pnvalues = {} 106 pnvalues = {}
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 61f40da..b74a60d 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -523,7 +523,7 @@ def _extract_source(srctree, keep_temp, devbranch, sync, config, basepath, works
523 history = d.varhistory.variable('SRC_URI') 523 history = d.varhistory.variable('SRC_URI')
524 for event in history: 524 for event in history:
525 if not 'flag' in event: 525 if not 'flag' in event:
526 if event['op'].startswith(('_append[', '_prepend[')): 526 if event['op'].startswith((':append[', ':prepend[')):
527 extra_overrides.append(event['op'].split('[')[1].split(']')[0]) 527 extra_overrides.append(event['op'].split('[')[1].split(']')[0])
528 # We want to remove duplicate overrides. If a recipe had multiple 528 # We want to remove duplicate overrides. If a recipe had multiple
529 # SRC_URI_override += values it would cause mulitple instances of 529 # SRC_URI_override += values it would cause mulitple instances of
@@ -955,17 +955,17 @@ def modify(args, config, basepath, workspace):
955 f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout ' 955 f.write('SRCTREECOVEREDTASKS = "do_validate_branches do_kernel_checkout '
956 'do_fetch do_unpack do_kernel_configcheck"\n') 956 'do_fetch do_unpack do_kernel_configcheck"\n')
957 f.write('\ndo_patch[noexec] = "1"\n') 957 f.write('\ndo_patch[noexec] = "1"\n')
958 f.write('\ndo_configure_append() {\n' 958 f.write('\ndo_configure:append() {\n'
959 ' cp ${B}/.config ${S}/.config.baseline\n' 959 ' cp ${B}/.config ${S}/.config.baseline\n'
960 ' ln -sfT ${B}/.config ${S}/.config.new\n' 960 ' ln -sfT ${B}/.config ${S}/.config.new\n'
961 '}\n') 961 '}\n')
962 f.write('\ndo_kernel_configme_prepend() {\n' 962 f.write('\ndo_kernel_configme:prepend() {\n'
963 ' if [ -e ${S}/.config ]; then\n' 963 ' if [ -e ${S}/.config ]; then\n'
964 ' mv ${S}/.config ${S}/.config.old\n' 964 ' mv ${S}/.config ${S}/.config.old\n'
965 ' fi\n' 965 ' fi\n'
966 '}\n') 966 '}\n')
967 if rd.getVarFlag('do_menuconfig','task'): 967 if rd.getVarFlag('do_menuconfig','task'):
968 f.write('\ndo_configure_append() {\n' 968 f.write('\ndo_configure:append() {\n'
969 ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n' 969 ' if [ ! ${DEVTOOL_DISABLE_MENUCONFIG} ]; then\n'
970 ' cp ${B}/.config ${S}/.config.baseline\n' 970 ' cp ${B}/.config ${S}/.config.baseline\n'
971 ' ln -sfT ${B}/.config ${S}/.config.new\n' 971 ' ln -sfT ${B}/.config ${S}/.config.new\n'