summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/lib
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/package_manager/__init__.py2
-rw-r--r--meta/lib/oe/package_manager/deb/__init__.py2
-rw-r--r--meta/lib/oe/packagedata.py2
-rw-r--r--meta/lib/oe/recipeutils.py16
-rw-r--r--meta/lib/oe/sstatesig.py2
-rw-r--r--meta/lib/oeqa/files/testresults/testresults.json2
-rw-r--r--meta/lib/oeqa/manual/build-appliance.json2
-rw-r--r--meta/lib/oeqa/manual/sdk.json2
-rw-r--r--meta/lib/oeqa/manual/toaster-managed-mode.json6
-rw-r--r--meta/lib/oeqa/runtime/cases/ksample.py2
-rw-r--r--meta/lib/oeqa/runtime/cases/skeletoninit.py2
-rw-r--r--meta/lib/oeqa/sdkext/testsdk.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/bbtests.py8
-rw-r--r--meta/lib/oeqa/selftest/cases/buildoptions.py10
-rw-r--r--meta/lib/oeqa/selftest/cases/containerimage.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/devtool.py4
-rw-r--r--meta/lib/oeqa/selftest/cases/distrodata.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/efibootpartition.py6
-rw-r--r--meta/lib/oeqa/selftest/cases/fetch.py10
-rw-r--r--meta/lib/oeqa/selftest/cases/glibc.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/imagefeatures.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/incompatible_lic.py14
-rw-r--r--meta/lib/oeqa/selftest/cases/kerneldevelopment.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/layerappend.py10
-rw-r--r--meta/lib/oeqa/selftest/cases/lic_checksum.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/multiconfig.py6
-rw-r--r--meta/lib/oeqa/selftest/cases/package.py8
-rw-r--r--meta/lib/oeqa/selftest/cases/prservice.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/recipetool.py62
-rw-r--r--meta/lib/oeqa/selftest/cases/recipeutils.py6
-rw-r--r--meta/lib/oeqa/selftest/cases/reproducible.py2
-rw-r--r--meta/lib/oeqa/selftest/cases/runtime_test.py28
-rw-r--r--meta/lib/oeqa/selftest/cases/signing.py4
-rw-r--r--meta/lib/oeqa/selftest/cases/sstatetests.py14
-rw-r--r--meta/lib/oeqa/selftest/cases/sysroot.py8
-rw-r--r--meta/lib/oeqa/selftest/cases/tinfoil.py4
-rw-r--r--meta/lib/oeqa/selftest/cases/wic.py14
37 files changed, 137 insertions, 137 deletions
diff --git a/meta/lib/oe/package_manager/__init__.py b/meta/lib/oe/package_manager/__init__.py
index de5916d7d8..8f7b60e077 100644
--- a/meta/lib/oe/package_manager/__init__.py
+++ b/meta/lib/oe/package_manager/__init__.py
@@ -90,7 +90,7 @@ def opkg_query(cmd_output):
90 90
91def failed_postinsts_abort(pkgs, log_path): 91def failed_postinsts_abort(pkgs, log_path):
92 bb.fatal("""Postinstall scriptlets of %s have failed. If the intention is to defer them to first boot, 92 bb.fatal("""Postinstall scriptlets of %s have failed. If the intention is to defer them to first boot,
93then please place them into pkg_postinst_ontarget_${PN} (). 93then please place them into pkg_postinst_ontarget:${PN} ().
94Deferring to first boot via 'exit 1' is no longer supported. 94Deferring to first boot via 'exit 1' is no longer supported.
95Details of the failure are in %s.""" %(pkgs, log_path)) 95Details of the failure are in %s.""" %(pkgs, log_path))
96 96
diff --git a/meta/lib/oe/package_manager/deb/__init__.py b/meta/lib/oe/package_manager/deb/__init__.py
index a4b6b6f647..9f112ae25b 100644
--- a/meta/lib/oe/package_manager/deb/__init__.py
+++ b/meta/lib/oe/package_manager/deb/__init__.py
@@ -422,7 +422,7 @@ class DpkgPM(OpkgDpkgPM):
422 multilib_variants = self.d.getVar("MULTILIB_VARIANTS"); 422 multilib_variants = self.d.getVar("MULTILIB_VARIANTS");
423 for variant in multilib_variants.split(): 423 for variant in multilib_variants.split():
424 localdata = bb.data.createCopy(self.d) 424 localdata = bb.data.createCopy(self.d)
425 variant_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + variant, False) 425 variant_tune = localdata.getVar("DEFAULTTUNE:virtclass-multilib-" + variant, False)
426 orig_arch = localdata.getVar("DPKG_ARCH") 426 orig_arch = localdata.getVar("DPKG_ARCH")
427 localdata.setVar("DEFAULTTUNE", variant_tune) 427 localdata.setVar("DEFAULTTUNE", variant_tune)
428 variant_arch = localdata.getVar("DPKG_ARCH") 428 variant_arch = localdata.getVar("DPKG_ARCH")
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index a82085a792..22261d271e 100644
--- a/meta/lib/oe/packagedata.py
+++ b/meta/lib/oe/packagedata.py
@@ -19,7 +19,7 @@ def read_pkgdatafile(fn):
19 import re 19 import re
20 with open(fn, 'r') as f: 20 with open(fn, 'r') as f:
21 lines = f.readlines() 21 lines = f.readlines()
22 r = re.compile("([^:]+):\s*(.*)") 22 r = re.compile("(^.+?):\s+(.*)")
23 for l in lines: 23 for l in lines:
24 m = r.match(l) 24 m = r.match(l)
25 if m: 25 if m:
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 407d168894..a66bb92823 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -414,7 +414,7 @@ def copy_recipe_files(d, tgt_dir, whole_dir=False, download=True, all_variants=F
414 414
415 fetch_urls(d) 415 fetch_urls(d)
416 if all_variants: 416 if all_variants:
417 # Get files for other variants e.g. in the case of a SRC_URI_append 417 # Get files for other variants e.g. in the case of a SRC_URI:append
418 localdata = bb.data.createCopy(d) 418 localdata = bb.data.createCopy(d)
419 variants = (localdata.getVar('BBCLASSEXTEND') or '').split() 419 variants = (localdata.getVar('BBCLASSEXTEND') or '').split()
420 if variants: 420 if variants:
@@ -753,7 +753,7 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, wildcardver=False,
753 753
754 destsubdir = rd.getVar('PN') 754 destsubdir = rd.getVar('PN')
755 if srcfiles: 755 if srcfiles:
756 bbappendlines.append(('FILESEXTRAPATHS_prepend', ':=', '${THISDIR}/${PN}:')) 756 bbappendlines.append(('FILESEXTRAPATHS:prepend', ':=', '${THISDIR}/${PN}:'))
757 757
758 appendoverride = '' 758 appendoverride = ''
759 if machine: 759 if machine:
@@ -772,7 +772,7 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, wildcardver=False,
772 # FIXME do we care if the entry is added by another bbappend that might go away? 772 # FIXME do we care if the entry is added by another bbappend that might go away?
773 if not srcurientry in rd.getVar('SRC_URI').split(): 773 if not srcurientry in rd.getVar('SRC_URI').split():
774 if machine: 774 if machine:
775 appendline('SRC_URI_append%s' % appendoverride, '=', ' ' + srcurientry) 775 appendline('SRC_URI:append%s' % appendoverride, '=', ' ' + srcurientry)
776 else: 776 else:
777 appendline('SRC_URI', '+=', srcurientry) 777 appendline('SRC_URI', '+=', srcurientry)
778 copyfiles[newfile] = srcfile 778 copyfiles[newfile] = srcfile
@@ -786,7 +786,7 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, wildcardver=False,
786 instfunclines.append(instdirline) 786 instfunclines.append(instdirline)
787 instfunclines.append('install -m %s ${WORKDIR}/%s ${D}%s' % (perms, os.path.basename(srcfile), instdestpath)) 787 instfunclines.append('install -m %s ${WORKDIR}/%s ${D}%s' % (perms, os.path.basename(srcfile), instdestpath))
788 if instfunclines: 788 if instfunclines:
789 bbappendlines.append(('do_install_append%s()' % appendoverride, '', instfunclines)) 789 bbappendlines.append(('do_install:append%s()' % appendoverride, '', instfunclines))
790 790
791 if redirect_output: 791 if redirect_output:
792 bb.note('Writing append file %s (dry-run)' % appendpath) 792 bb.note('Writing append file %s (dry-run)' % appendpath)
@@ -804,15 +804,15 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, wildcardver=False,
804 extvars = {'destsubdir': destsubdir} 804 extvars = {'destsubdir': destsubdir}
805 805
806 def appendfile_varfunc(varname, origvalue, op, newlines): 806 def appendfile_varfunc(varname, origvalue, op, newlines):
807 if varname == 'FILESEXTRAPATHS_prepend': 807 if varname == 'FILESEXTRAPATHS:prepend':
808 if origvalue.startswith('${THISDIR}/'): 808 if origvalue.startswith('${THISDIR}/'):
809 popline('FILESEXTRAPATHS_prepend') 809 popline('FILESEXTRAPATHS:prepend')
810 extvars['destsubdir'] = rd.expand(origvalue.split('${THISDIR}/', 1)[1].rstrip(':')) 810 extvars['destsubdir'] = rd.expand(origvalue.split('${THISDIR}/', 1)[1].rstrip(':'))
811 elif varname == 'PACKAGE_ARCH': 811 elif varname == 'PACKAGE_ARCH':
812 if machine: 812 if machine:
813 popline('PACKAGE_ARCH') 813 popline('PACKAGE_ARCH')
814 return (machine, None, 4, False) 814 return (machine, None, 4, False)
815 elif varname.startswith('do_install_append'): 815 elif varname.startswith('do_install:append'):
816 func = popline(varname) 816 func = popline(varname)
817 if func: 817 if func:
818 instfunclines = [line.strip() for line in origvalue.strip('\n').splitlines()] 818 instfunclines = [line.strip() for line in origvalue.strip('\n').splitlines()]
@@ -824,7 +824,7 @@ def bbappend_recipe(rd, destlayerdir, srcfiles, install=None, wildcardver=False,
824 splitval = split_var_value(origvalue, assignment=False) 824 splitval = split_var_value(origvalue, assignment=False)
825 changed = False 825 changed = False
826 removevar = varname 826 removevar = varname
827 if varname in ['SRC_URI', 'SRC_URI_append%s' % appendoverride]: 827 if varname in ['SRC_URI', 'SRC_URI:append%s' % appendoverride]:
828 removevar = 'SRC_URI' 828 removevar = 'SRC_URI'
829 line = popline(varname) 829 line = popline(varname)
830 if line: 830 if line:
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 47f3ca4efb..f460c50c10 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -59,7 +59,7 @@ def sstate_rundepfilter(siggen, fn, recipename, task, dep, depname, dataCaches):
59 return False 59 return False
60 60
61 # Kernel modules are well namespaced. We don't want to depend on the kernel's checksum 61 # Kernel modules are well namespaced. We don't want to depend on the kernel's checksum
62 # if we're just doing an RRECOMMENDS_xxx = "kernel-module-*", not least because the checksum 62 # if we're just doing an RRECOMMENDS:xxx = "kernel-module-*", not least because the checksum
63 # is machine specific. 63 # is machine specific.
64 # Therefore if we're not a kernel or a module recipe (inheriting the kernel classes) 64 # Therefore if we're not a kernel or a module recipe (inheriting the kernel classes)
65 # and we reccomend a kernel-module, we exclude the dependency. 65 # and we reccomend a kernel-module, we exclude the dependency.
diff --git a/meta/lib/oeqa/files/testresults/testresults.json b/meta/lib/oeqa/files/testresults/testresults.json
index 1a62155618..86e5e412af 100644
--- a/meta/lib/oeqa/files/testresults/testresults.json
+++ b/meta/lib/oeqa/files/testresults/testresults.json
@@ -1,5 +1,5 @@
1{ 1{
2 "runtime_core-image-minimal_qemuarm_20181225195701": { 2 "runtime_core-image-minimal:qemuarm_20181225195701": {
3 "configuration": { 3 "configuration": {
4 "DISTRO": "poky", 4 "DISTRO": "poky",
5 "HOST_DISTRO": "ubuntu-16.04", 5 "HOST_DISTRO": "ubuntu-16.04",
diff --git a/meta/lib/oeqa/manual/build-appliance.json b/meta/lib/oeqa/manual/build-appliance.json
index 70f8c72c9b..82a556e93e 100644
--- a/meta/lib/oeqa/manual/build-appliance.json
+++ b/meta/lib/oeqa/manual/build-appliance.json
@@ -48,7 +48,7 @@
48 "expected_results": "" 48 "expected_results": ""
49 }, 49 },
50 "3": { 50 "3": {
51 "action": "Install a new package to the image, for example, acpid. Set the following line in conf/local.conf: IMAGE_INSTALL_append = \" acpid\"", 51 "action": "Install a new package to the image, for example, acpid. Set the following line in conf/local.conf: IMAGE_INSTALL:append = \" acpid\"",
52 "expected_results": "" 52 "expected_results": ""
53 }, 53 },
54 "4": { 54 "4": {
diff --git a/meta/lib/oeqa/manual/sdk.json b/meta/lib/oeqa/manual/sdk.json
index 434982f7f5..21d892d26d 100644
--- a/meta/lib/oeqa/manual/sdk.json
+++ b/meta/lib/oeqa/manual/sdk.json
@@ -26,7 +26,7 @@
26 "expected_results": "Expect both qemu to boot up successfully." 26 "expected_results": "Expect both qemu to boot up successfully."
27 } 27 }
28 }, 28 },
29 "summary": "test_install_cross_toolchain_can_run_multiple_qemu_for_x86" 29 "summary": "test_install_cross_toolchain_can_run_multiple_qemu_for:x86"
30 } 30 }
31 } 31 }
32] \ No newline at end of file 32] \ No newline at end of file
diff --git a/meta/lib/oeqa/manual/toaster-managed-mode.json b/meta/lib/oeqa/manual/toaster-managed-mode.json
index 40eda6446d..d8bbbece4a 100644
--- a/meta/lib/oeqa/manual/toaster-managed-mode.json
+++ b/meta/lib/oeqa/manual/toaster-managed-mode.json
@@ -186,7 +186,7 @@
186 "expected_results": "" 186 "expected_results": ""
187 }, 187 },
188 "7": { 188 "7": {
189 "action": "IMAGE_INSTALL_append: \n\t- check that the \"change\" icon is present (represented by a pen icon) \n\t- click on the \"change\" icon and check that the variable becomes a text field, populated with the current value of the variable. \n\n\t- check that the save button is disabled when the text field is empty \n\t- insert test in the text field (for example \"package1\") and hit save; be aware that there is no input validation for this variable \n\t- check that a new \"delete\" icon(a trashcan) has appeared next to the pen icon \n\t- check that clicking on the trashcan icon resets the value to \"Not set\" and makes the trashcan icon dissapear \n\n", 189 "action": "IMAGE_INSTALL:append: \n\t- check that the \"change\" icon is present (represented by a pen icon) \n\t- click on the \"change\" icon and check that the variable becomes a text field, populated with the current value of the variable. \n\n\t- check that the save button is disabled when the text field is empty \n\t- insert test in the text field (for example \"package1\") and hit save; be aware that there is no input validation for this variable \n\t- check that a new \"delete\" icon(a trashcan) has appeared next to the pen icon \n\t- check that clicking on the trashcan icon resets the value to \"Not set\" and makes the trashcan icon dissapear \n\n",
190 "expected_results": "" 190 "expected_results": ""
191 }, 191 },
192 "8": { 192 "8": {
@@ -1574,7 +1574,7 @@
1574 "expected_results": "Open bitbake variables page. \n\n\t" 1574 "expected_results": "Open bitbake variables page. \n\n\t"
1575 }, 1575 },
1576 "5": { 1576 "5": {
1577 "action": "Click on change button for IMAGE_INSTALL_append and add a variable (ex: acpid). \n\n", 1577 "action": "Click on change button for IMAGE_INSTALL:append and add a variable (ex: acpid). \n\n",
1578 "expected_results": "Variable added. \n\n\t" 1578 "expected_results": "Variable added. \n\n\t"
1579 }, 1579 },
1580 "6": { 1580 "6": {
@@ -1590,7 +1590,7 @@
1590 "expected_results": "You should get results for ssh packages." 1590 "expected_results": "You should get results for ssh packages."
1591 } 1591 }
1592 }, 1592 },
1593 "summary": "Test_IMAGE_INSTALL_append_variable" 1593 "summary": "Test_IMAGE_INSTALL:append_variable"
1594 } 1594 }
1595 }, 1595 },
1596 { 1596 {
diff --git a/meta/lib/oeqa/runtime/cases/ksample.py b/meta/lib/oeqa/runtime/cases/ksample.py
index a9a1620ebd..4d12d1d07d 100644
--- a/meta/lib/oeqa/runtime/cases/ksample.py
+++ b/meta/lib/oeqa/runtime/cases/ksample.py
@@ -10,7 +10,7 @@ from oeqa.core.decorator.depends import OETestDepends
10from oeqa.core.decorator.data import skipIfNotFeature 10from oeqa.core.decorator.data import skipIfNotFeature
11 11
12# need some kernel fragments 12# need some kernel fragments
13# echo "KERNEL_FEATURES_append += \" features\/kernel\-sample\/kernel\-sample.scc\"" >> local.conf 13# echo "KERNEL_FEATURES:append += \" features\/kernel\-sample\/kernel\-sample.scc\"" >> local.conf
14class KSample(OERuntimeTestCase): 14class KSample(OERuntimeTestCase):
15 def cmd_and_check(self, cmd='', match_string=''): 15 def cmd_and_check(self, cmd='', match_string=''):
16 status, output = self.target.run(cmd) 16 status, output = self.target.run(cmd)
diff --git a/meta/lib/oeqa/runtime/cases/skeletoninit.py b/meta/lib/oeqa/runtime/cases/skeletoninit.py
index 4779cd6bb4..a12f1e9aae 100644
--- a/meta/lib/oeqa/runtime/cases/skeletoninit.py
+++ b/meta/lib/oeqa/runtime/cases/skeletoninit.py
@@ -4,7 +4,7 @@
4 4
5# This test should cover https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=284 5# This test should cover https://bugzilla.yoctoproject.org/tr_show_case.cgi?case_id=284
6# testcase. Image under test must have meta-skeleton layer in bblayers and 6# testcase. Image under test must have meta-skeleton layer in bblayers and
7# IMAGE_INSTALL_append = " service" in local.conf 7# IMAGE_INSTALL:append = " service" in local.conf
8from oeqa.runtime.case import OERuntimeTestCase 8from oeqa.runtime.case import OERuntimeTestCase
9from oeqa.core.decorator.depends import OETestDepends 9from oeqa.core.decorator.depends import OETestDepends
10from oeqa.core.decorator.data import skipIfDataVar 10from oeqa.core.decorator.data import skipIfDataVar
diff --git a/meta/lib/oeqa/sdkext/testsdk.py b/meta/lib/oeqa/sdkext/testsdk.py
index ffd185ec55..6b564fa455 100644
--- a/meta/lib/oeqa/sdkext/testsdk.py
+++ b/meta/lib/oeqa/sdkext/testsdk.py
@@ -70,7 +70,7 @@ class TestSDKExt(TestSDKBase):
70 f.write('SSTATE_MIRRORS += " \\n file://.* file://%s/PATH"\n' % test_data.get('SSTATE_DIR')) 70 f.write('SSTATE_MIRRORS += " \\n file://.* file://%s/PATH"\n' % test_data.get('SSTATE_DIR'))
71 f.write('SOURCE_MIRROR_URL = "file://%s"\n' % test_data.get('DL_DIR')) 71 f.write('SOURCE_MIRROR_URL = "file://%s"\n' % test_data.get('DL_DIR'))
72 f.write('INHERIT += "own-mirrors"\n') 72 f.write('INHERIT += "own-mirrors"\n')
73 f.write('PREMIRRORS_prepend = " git://git.yoctoproject.org/.* git://%s/git2/git.yoctoproject.org.BASENAME \\n "\n' % test_data.get('DL_DIR')) 73 f.write('PREMIRRORS:prepend = " git://git.yoctoproject.org/.* git://%s/git2/git.yoctoproject.org.BASENAME \\n "\n' % test_data.get('DL_DIR'))
74 74
75 # We need to do this in case we have a minimal SDK 75 # We need to do this in case we have a minimal SDK
76 subprocess.check_output(". %s > /dev/null; devtool sdk-install meta-extsdk-toolchain" % \ 76 subprocess.check_output(". %s > /dev/null; devtool sdk-install meta-extsdk-toolchain" % \
diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py
index 79390acc0d..8831de6065 100644
--- a/meta/lib/oeqa/selftest/cases/bbtests.py
+++ b/meta/lib/oeqa/selftest/cases/bbtests.py
@@ -70,8 +70,8 @@ class BitbakeTests(OESelftestTestCase):
70 70
71 def test_invalid_patch(self): 71 def test_invalid_patch(self):
72 # This patch should fail to apply. 72 # This patch should fail to apply.
73 self.write_recipeinc('man-db', 'FILESEXTRAPATHS_prepend := "${THISDIR}/files:"\nSRC_URI += "file://0001-Test-patch-here.patch"') 73 self.write_recipeinc('man-db', 'FILESEXTRAPATHS:prepend := "${THISDIR}/files:"\nSRC_URI += "file://0001-Test-patch-here.patch"')
74 self.write_config("INHERIT_remove = \"report-error\"") 74 self.write_config("INHERIT:remove = \"report-error\"")
75 result = bitbake('man-db -c patch', ignore_status=True) 75 result = bitbake('man-db -c patch', ignore_status=True)
76 self.delete_recipeinc('man-db') 76 self.delete_recipeinc('man-db')
77 bitbake('-cclean man-db') 77 bitbake('-cclean man-db')
@@ -139,7 +139,7 @@ class BitbakeTests(OESelftestTestCase):
139 self.write_recipeinc('man-db', data) 139 self.write_recipeinc('man-db', data)
140 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" 140 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\"
141SSTATE_DIR = \"${TOPDIR}/download-selftest\" 141SSTATE_DIR = \"${TOPDIR}/download-selftest\"
142INHERIT_remove = \"report-error\" 142INHERIT:remove = \"report-error\"
143""") 143""")
144 self.track_for_cleanup(os.path.join(self.builddir, "download-selftest")) 144 self.track_for_cleanup(os.path.join(self.builddir, "download-selftest"))
145 145
@@ -213,7 +213,7 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\"
213 def test_continue(self): 213 def test_continue(self):
214 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\" 214 self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\"
215SSTATE_DIR = \"${TOPDIR}/download-selftest\" 215SSTATE_DIR = \"${TOPDIR}/download-selftest\"
216INHERIT_remove = \"report-error\" 216INHERIT:remove = \"report-error\"
217""") 217""")
218 self.track_for_cleanup(os.path.join(self.builddir, "download-selftest")) 218 self.track_for_cleanup(os.path.join(self.builddir, "download-selftest"))
219 self.write_recipeinc('man-db',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" ) 219 self.write_recipeinc('man-db',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" )
diff --git a/meta/lib/oeqa/selftest/cases/buildoptions.py b/meta/lib/oeqa/selftest/cases/buildoptions.py
index 754b77defd..be49322f9c 100644
--- a/meta/lib/oeqa/selftest/cases/buildoptions.py
+++ b/meta/lib/oeqa/selftest/cases/buildoptions.py
@@ -78,9 +78,9 @@ class SanityOptionsTest(OESelftestTestCase):
78 78
79 def test_options_warnqa_errorqa_switch(self): 79 def test_options_warnqa_errorqa_switch(self):
80 80
81 self.write_config("INHERIT_remove = \"report-error\"") 81 self.write_config("INHERIT:remove = \"report-error\"")
82 if "packages-list" not in get_bb_var("ERROR_QA"): 82 if "packages-list" not in get_bb_var("ERROR_QA"):
83 self.append_config("ERROR_QA_append = \" packages-list\"") 83 self.append_config("ERROR_QA:append = \" packages-list\"")
84 84
85 self.write_recipeinc('xcursor-transparent-theme', 'PACKAGES += \"${PN}-dbg\"') 85 self.write_recipeinc('xcursor-transparent-theme', 'PACKAGES += \"${PN}-dbg\"')
86 self.add_command_to_tearDown('bitbake -c clean xcursor-transparent-theme') 86 self.add_command_to_tearDown('bitbake -c clean xcursor-transparent-theme')
@@ -90,8 +90,8 @@ class SanityOptionsTest(OESelftestTestCase):
90 self.assertTrue(line and line.startswith("ERROR:"), msg=res.output) 90 self.assertTrue(line and line.startswith("ERROR:"), msg=res.output)
91 self.assertEqual(res.status, 1, msg = "bitbake reported exit code %s. It should have been 1. Bitbake output: %s" % (str(res.status), res.output)) 91 self.assertEqual(res.status, 1, msg = "bitbake reported exit code %s. It should have been 1. Bitbake output: %s" % (str(res.status), res.output))
92 self.write_recipeinc('xcursor-transparent-theme', 'PACKAGES += \"${PN}-dbg\"') 92 self.write_recipeinc('xcursor-transparent-theme', 'PACKAGES += \"${PN}-dbg\"')
93 self.append_config('ERROR_QA_remove = "packages-list"') 93 self.append_config('ERROR_QA:remove = "packages-list"')
94 self.append_config('WARN_QA_append = " packages-list"') 94 self.append_config('WARN_QA:append = " packages-list"')
95 res = bitbake("xcursor-transparent-theme -f -c package") 95 res = bitbake("xcursor-transparent-theme -f -c package")
96 self.delete_recipeinc('xcursor-transparent-theme') 96 self.delete_recipeinc('xcursor-transparent-theme')
97 line = self.getline(res, "QA Issue: xcursor-transparent-theme-dbg is listed in PACKAGES multiple times, this leads to packaging errors.") 97 line = self.getline(res, "QA Issue: xcursor-transparent-theme-dbg is listed in PACKAGES multiple times, this leads to packaging errors.")
@@ -168,7 +168,7 @@ class ToolchainOptions(OESelftestTestCase):
168 Test that Fortran works by building a Hello, World binary. 168 Test that Fortran works by building a Hello, World binary.
169 """ 169 """
170 170
171 features = 'FORTRAN_forcevariable = ",fortran"\n' 171 features = 'FORTRAN:forcevariable = ",fortran"\n'
172 self.write_config(features) 172 self.write_config(features)
173 bitbake('fortran-helloworld') 173 bitbake('fortran-helloworld')
174 174
diff --git a/meta/lib/oeqa/selftest/cases/containerimage.py b/meta/lib/oeqa/selftest/cases/containerimage.py
index 79cc8a0f2e..b92e520bc2 100644
--- a/meta/lib/oeqa/selftest/cases/containerimage.py
+++ b/meta/lib/oeqa/selftest/cases/containerimage.py
@@ -43,7 +43,7 @@ PACKAGE_CLASSES = "package_ipk"
43IMAGE_FEATURES = "" 43IMAGE_FEATURES = ""
44IMAGE_BUILDINFO_FILE = "" 44IMAGE_BUILDINFO_FILE = ""
45INIT_MANAGER = "sysvinit" 45INIT_MANAGER = "sysvinit"
46IMAGE_INSTALL_remove = "ssh-pregen-hostkeys" 46IMAGE_INSTALL:remove = "ssh-pregen-hostkeys"
47 47
48""") 48""")
49 49
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 3385546e8e..c6dbf50e68 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -975,7 +975,7 @@ class DevtoolUpdateTests(DevtoolBase):
975 self.assertExists(patchfile, 'Patch file not created') 975 self.assertExists(patchfile, 'Patch file not created')
976 976
977 # Check bbappend contents 977 # Check bbappend contents
978 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 978 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
979 '\n', 979 '\n',
980 'SRC_URI += "file://0001-Add-our-custom-version.patch"\n', 980 'SRC_URI += "file://0001-Add-our-custom-version.patch"\n',
981 '\n'] 981 '\n']
@@ -990,7 +990,7 @@ class DevtoolUpdateTests(DevtoolBase):
990 result = runCmd('git reset HEAD^', cwd=tempsrcdir) 990 result = runCmd('git reset HEAD^', cwd=tempsrcdir)
991 result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir)) 991 result = runCmd('devtool update-recipe %s -a %s' % (testrecipe, templayerdir))
992 self.assertNotExists(patchfile, 'Patch file not deleted') 992 self.assertNotExists(patchfile, 'Patch file not deleted')
993 expectedlines2 = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 993 expectedlines2 = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
994 '\n'] 994 '\n']
995 with open(bbappendfile, 'r') as f: 995 with open(bbappendfile, 'r') as f:
996 self.assertEqual(expectedlines2, f.readlines()) 996 self.assertEqual(expectedlines2, f.readlines())
diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py b/meta/lib/oeqa/selftest/cases/distrodata.py
index 0ad6e1ef91..4a45855d27 100644
--- a/meta/lib/oeqa/selftest/cases/distrodata.py
+++ b/meta/lib/oeqa/selftest/cases/distrodata.py
@@ -110,7 +110,7 @@ The following recipes do not have a DESCRIPTION. Please add an entry for DESCRIP
110 110
111 missing_recipes = [] 111 missing_recipes = []
112 recipes = [] 112 recipes = []
113 prefix = "RECIPE_MAINTAINER_pn-" 113 prefix = "RECIPE_MAINTAINER:pn-"
114 114
115 # We could have used all_recipes() here, but this method will find 115 # We could have used all_recipes() here, but this method will find
116 # every recipe if we ever move to setting RECIPE_MAINTAINER in recipe files 116 # every recipe if we ever move to setting RECIPE_MAINTAINER in recipe files
diff --git a/meta/lib/oeqa/selftest/cases/efibootpartition.py b/meta/lib/oeqa/selftest/cases/efibootpartition.py
index a61cf9bcb3..3203a7b71d 100644
--- a/meta/lib/oeqa/selftest/cases/efibootpartition.py
+++ b/meta/lib/oeqa/selftest/cases/efibootpartition.py
@@ -26,11 +26,11 @@ 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"
33IMAGE_INSTALL_append = " grub-efi systemd-boot kernel-image-bzimage" 33IMAGE_INSTALL:append = " grub-efi systemd-boot kernel-image-bzimage"
34""" 34"""
35% (self.efi_provider, self.image, self.machine)) 35% (self.efi_provider, self.image, self.machine))
36 if not self.recipes_built: 36 if not self.recipes_built:
diff --git a/meta/lib/oeqa/selftest/cases/fetch.py b/meta/lib/oeqa/selftest/cases/fetch.py
index cd15f65129..9aa91e59c1 100644
--- a/meta/lib/oeqa/selftest/cases/fetch.py
+++ b/meta/lib/oeqa/selftest/cases/fetch.py
@@ -24,8 +24,8 @@ class Fetch(OESelftestTestCase):
24 # No mirrors, should use git to fetch successfully 24 # No mirrors, should use git to fetch successfully
25 features = """ 25 features = """
26DL_DIR = "%s" 26DL_DIR = "%s"
27MIRRORS_forcevariable = "" 27MIRRORS:forcevariable = ""
28PREMIRRORS_forcevariable = "" 28PREMIRRORS:forcevariable = ""
29""" % dldir 29""" % dldir
30 self.write_config(features) 30 self.write_config(features)
31 oe.path.remove(dldir, recurse=True) 31 oe.path.remove(dldir, recurse=True)
@@ -35,8 +35,8 @@ PREMIRRORS_forcevariable = ""
35 features = """ 35 features = """
36DL_DIR = "%s" 36DL_DIR = "%s"
37GIT_PROXY_COMMAND = "false" 37GIT_PROXY_COMMAND = "false"
38MIRRORS_forcevariable = "" 38MIRRORS:forcevariable = ""
39PREMIRRORS_forcevariable = "" 39PREMIRRORS:forcevariable = ""
40""" % dldir 40""" % dldir
41 self.write_config(features) 41 self.write_config(features)
42 oe.path.remove(dldir, recurse=True) 42 oe.path.remove(dldir, recurse=True)
@@ -47,7 +47,7 @@ PREMIRRORS_forcevariable = ""
47 features = """ 47 features = """
48DL_DIR = "%s" 48DL_DIR = "%s"
49GIT_PROXY_COMMAND = "false" 49GIT_PROXY_COMMAND = "false"
50MIRRORS_forcevariable = "git://.*/.* http://downloads.yoctoproject.org/mirror/sources/" 50MIRRORS:forcevariable = "git://.*/.* http://downloads.yoctoproject.org/mirror/sources/"
51""" % dldir 51""" % dldir
52 self.write_config(features) 52 self.write_config(features)
53 oe.path.remove(dldir, recurse=True) 53 oe.path.remove(dldir, recurse=True)
diff --git a/meta/lib/oeqa/selftest/cases/glibc.py b/meta/lib/oeqa/selftest/cases/glibc.py
index c687f6ef93..be9792330a 100644
--- a/meta/lib/oeqa/selftest/cases/glibc.py
+++ b/meta/lib/oeqa/selftest/cases/glibc.py
@@ -24,7 +24,7 @@ class GlibcSelfTestBase(OESelftestTestCase, OEPTestResultTestCase):
24 features.append('TOOLCHAIN_TEST_HOST_USER = "root"') 24 features.append('TOOLCHAIN_TEST_HOST_USER = "root"')
25 features.append('TOOLCHAIN_TEST_HOST_PORT = "22"') 25 features.append('TOOLCHAIN_TEST_HOST_PORT = "22"')
26 # force single threaded test execution 26 # force single threaded test execution
27 features.append('EGLIBCPARALLELISM_task-check_pn-glibc-testsuite = "PARALLELMFLAGS="-j1""') 27 features.append('EGLIBCPARALLELISM_task-check:pn-glibc-testsuite = "PARALLELMFLAGS="-j1""')
28 self.write_config("\n".join(features)) 28 self.write_config("\n".join(features))
29 29
30 bitbake("glibc-testsuite -c check") 30 bitbake("glibc-testsuite -c check")
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py
index 2de22d3404..12902add94 100644
--- a/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -229,7 +229,7 @@ USERADD_GID_TABLES += "files/static-group"
229 def test_no_busybox_base_utils(self): 229 def test_no_busybox_base_utils(self):
230 config = """ 230 config = """
231# Enable wayland 231# Enable wayland
232DISTRO_FEATURES_append += "pam opengl wayland" 232DISTRO_FEATURES:append += "pam opengl wayland"
233 233
234# Switch to systemd 234# Switch to systemd
235DISTRO_FEATURES += "systemd" 235DISTRO_FEATURES += "systemd"
diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
index 152da6332a..93be434650 100644
--- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py
+++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py
@@ -85,8 +85,8 @@ class IncompatibleLicenseTests(OESelftestTestCase):
85class IncompatibleLicensePerImageTests(OESelftestTestCase): 85class IncompatibleLicensePerImageTests(OESelftestTestCase):
86 def default_config(self): 86 def default_config(self):
87 return """ 87 return """
88IMAGE_INSTALL_append = " bash" 88IMAGE_INSTALL:append = " bash"
89INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0" 89INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0 LGPL-3.0"
90""" 90"""
91 91
92 def test_bash_default(self): 92 def test_bash_default(self):
@@ -118,17 +118,17 @@ INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0"
118class NoGPL3InImagesTests(OESelftestTestCase): 118class NoGPL3InImagesTests(OESelftestTestCase):
119 def test_core_image_minimal(self): 119 def test_core_image_minimal(self):
120 self.write_config(""" 120 self.write_config("""
121INCOMPATIBLE_LICENSE_pn-core-image-minimal = "GPL-3.0 LGPL-3.0" 121INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0 LGPL-3.0"
122""") 122""")
123 bitbake('core-image-minimal') 123 bitbake('core-image-minimal')
124 124
125 def test_core_image_full_cmdline(self): 125 def test_core_image_full_cmdline(self):
126 self.write_config(""" 126 self.write_config("""
127INHERIT += "testimage"\n 127INHERIT += "testimage"\n
128INCOMPATIBLE_LICENSE_pn-core-image-full-cmdline = "GPL-3.0 LGPL-3.0"\n 128INCOMPATIBLE_LICENSE:pn-core-image-full-cmdline = "GPL-3.0 LGPL-3.0"\n
129RDEPENDS_packagegroup-core-full-cmdline-utils_remove = "bash bc coreutils cpio ed findutils gawk grep mc mc-fish mc-helpers mc-helpers-perl sed tar time"\n 129RDEPENDS:packagegroup-core-full-cmdline-utils:remove = "bash bc coreutils cpio ed findutils gawk grep mc mc-fish mc-helpers mc-helpers-perl sed tar time"\n
130RDEPENDS_packagegroup-core-full-cmdline-dev-utils_remove = "diffutils m4 make patch"\n 130RDEPENDS:packagegroup-core-full-cmdline-dev-utils:remove = "diffutils m4 make patch"\n
131RDEPENDS_packagegroup-core-full-cmdline-multiuser_remove = "gzip"\n 131RDEPENDS:packagegroup-core-full-cmdline-multiuser:remove = "gzip"\n
132""") 132""")
133 bitbake('core-image-full-cmdline') 133 bitbake('core-image-full-cmdline')
134 bitbake('-c testimage core-image-full-cmdline') 134 bitbake('-c testimage core-image-full-cmdline')
diff --git a/meta/lib/oeqa/selftest/cases/kerneldevelopment.py b/meta/lib/oeqa/selftest/cases/kerneldevelopment.py
index a61876ee61..b1623a1885 100644
--- a/meta/lib/oeqa/selftest/cases/kerneldevelopment.py
+++ b/meta/lib/oeqa/selftest/cases/kerneldevelopment.py
@@ -58,7 +58,7 @@ class KernelDev(OESelftestTestCase):
58 recipe_append = os.path.join(self.recipeskernel_dir, 'linux-yocto_%.bbappend') 58 recipe_append = os.path.join(self.recipeskernel_dir, 'linux-yocto_%.bbappend')
59 with open(recipe_append, 'w+') as fh: 59 with open(recipe_append, 'w+') as fh:
60 fh.write('SRC_URI += "file://%s"\n' % patch_name) 60 fh.write('SRC_URI += "file://%s"\n' % patch_name)
61 fh.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"') 61 fh.write('FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"')
62 62
63 runCmd('bitbake virtual/kernel -c clean') 63 runCmd('bitbake virtual/kernel -c clean')
64 runCmd('bitbake virtual/kernel -c patch') 64 runCmd('bitbake virtual/kernel -c patch')
diff --git a/meta/lib/oeqa/selftest/cases/layerappend.py b/meta/lib/oeqa/selftest/cases/layerappend.py
index 05e9426fc6..dadc7c5d28 100644
--- a/meta/lib/oeqa/selftest/cases/layerappend.py
+++ b/meta/lib/oeqa/selftest/cases/layerappend.py
@@ -30,20 +30,20 @@ python do_build() {
30addtask build 30addtask build
31""" 31"""
32 append = """ 32 append = """
33FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 33FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
34 34
35SRC_URI_append = " file://appendtest.txt" 35SRC_URI:append = " file://appendtest.txt"
36 36
37sysroot_stage_all_append() { 37sysroot_stage_all:append() {
38 install -m 644 ${WORKDIR}/appendtest.txt ${SYSROOT_DESTDIR}/ 38 install -m 644 ${WORKDIR}/appendtest.txt ${SYSROOT_DESTDIR}/
39} 39}
40 40
41""" 41"""
42 42
43 append2 = """ 43 append2 = """
44FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 44FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
45 45
46SRC_URI_append = " file://appendtest.txt" 46SRC_URI:append = " file://appendtest.txt"
47""" 47"""
48 layerappend = '' 48 layerappend = ''
49 49
diff --git a/meta/lib/oeqa/selftest/cases/lic_checksum.py b/meta/lib/oeqa/selftest/cases/lic_checksum.py
index bae935d697..91021ac335 100644
--- a/meta/lib/oeqa/selftest/cases/lic_checksum.py
+++ b/meta/lib/oeqa/selftest/cases/lic_checksum.py
@@ -21,7 +21,7 @@ class LicenseTests(OESelftestTestCase):
21 os.close(lic_file) 21 os.close(lic_file)
22 self.track_for_cleanup(lic_path) 22 self.track_for_cleanup(lic_path)
23 23
24 self.write_config("INHERIT_remove = \"report-error\"") 24 self.write_config("INHERIT:remove = \"report-error\"")
25 25
26 self.write_recipeinc('emptytest', """ 26 self.write_recipeinc('emptytest', """
27INHIBIT_DEFAULT_DEPS = "1" 27INHIBIT_DEFAULT_DEPS = "1"
diff --git a/meta/lib/oeqa/selftest/cases/multiconfig.py b/meta/lib/oeqa/selftest/cases/multiconfig.py
index 39b92f2439..baae9b456f 100644
--- a/meta/lib/oeqa/selftest/cases/multiconfig.py
+++ b/meta/lib/oeqa/selftest/cases/multiconfig.py
@@ -17,7 +17,7 @@ class MultiConfig(OESelftestTestCase):
17 """ 17 """
18 18
19 config = """ 19 config = """
20IMAGE_INSTALL_append_pn-core-image-full-cmdline = " multiconfig-image-packager-tiny multiconfig-image-packager-musl" 20IMAGE_INSTALL:append:pn-core-image-full-cmdline = " multiconfig-image-packager-tiny multiconfig-image-packager-musl"
21BBMULTICONFIG = "tiny musl" 21BBMULTICONFIG = "tiny musl"
22""" 22"""
23 self.write_config(config) 23 self.write_config(config)
@@ -52,7 +52,7 @@ TMPDIR = "${TOPDIR}/tmp-mc-tiny"
52 self.write_config(config) 52 self.write_config(config)
53 53
54 testconfig = textwrap.dedent('''\ 54 testconfig = textwrap.dedent('''\
55 MCTESTVAR_append = "1" 55 MCTESTVAR:append = "1"
56 ''') 56 ''')
57 self.write_config(testconfig, 'test') 57 self.write_config(testconfig, 'test')
58 58
@@ -64,7 +64,7 @@ TMPDIR = "${TOPDIR}/tmp-mc-tiny"
64 self.assertIn('MCTESTVAR=test1', result.output.splitlines()) 64 self.assertIn('MCTESTVAR=test1', result.output.splitlines())
65 65
66 testconfig = textwrap.dedent('''\ 66 testconfig = textwrap.dedent('''\
67 MCTESTVAR_append = "2" 67 MCTESTVAR:append = "2"
68 ''') 68 ''')
69 self.write_config(testconfig, 'test') 69 self.write_config(testconfig, 'test')
70 70
diff --git a/meta/lib/oeqa/selftest/cases/package.py b/meta/lib/oeqa/selftest/cases/package.py
index 7166c3991f..cebbb4f3f4 100644
--- a/meta/lib/oeqa/selftest/cases/package.py
+++ b/meta/lib/oeqa/selftest/cases/package.py
@@ -116,9 +116,9 @@ class PackageTests(OESelftestTestCase):
116 116
117 # Verify gdb to read symbols from separated debug hardlink file correctly 117 # Verify gdb to read symbols from separated debug hardlink file correctly
118 def test_gdb_hardlink_debug(self): 118 def test_gdb_hardlink_debug(self):
119 features = 'IMAGE_INSTALL_append = " selftest-hardlink"\n' 119 features = 'IMAGE_INSTALL:append = " selftest-hardlink"\n'
120 features += 'IMAGE_INSTALL_append = " selftest-hardlink-dbg"\n' 120 features += 'IMAGE_INSTALL:append = " selftest-hardlink-dbg"\n'
121 features += 'IMAGE_INSTALL_append = " selftest-hardlink-gdb"\n' 121 features += 'IMAGE_INSTALL:append = " selftest-hardlink-gdb"\n'
122 self.write_config(features) 122 self.write_config(features)
123 bitbake("core-image-minimal") 123 bitbake("core-image-minimal")
124 124
@@ -151,7 +151,7 @@ class PackageTests(OESelftestTestCase):
151 151
152 def test_preserve_ownership(self): 152 def test_preserve_ownership(self):
153 import os, stat, oe.cachedpath 153 import os, stat, oe.cachedpath
154 features = 'IMAGE_INSTALL_append = " selftest-chown"\n' 154 features = 'IMAGE_INSTALL:append = " selftest-chown"\n'
155 self.write_config(features) 155 self.write_config(features)
156 bitbake("core-image-minimal") 156 bitbake("core-image-minimal")
157 157
diff --git a/meta/lib/oeqa/selftest/cases/prservice.py b/meta/lib/oeqa/selftest/cases/prservice.py
index 578b2b4dd9..10158ca7c2 100644
--- a/meta/lib/oeqa/selftest/cases/prservice.py
+++ b/meta/lib/oeqa/selftest/cases/prservice.py
@@ -40,7 +40,7 @@ class BitbakePrTests(OESelftestTestCase):
40 return str(stamps[0]) 40 return str(stamps[0])
41 41
42 def increment_package_pr(self, package_name): 42 def increment_package_pr(self, package_name):
43 inc_data = "do_package_append() {\n bb.build.exec_func('do_test_prserv', d)\n}\ndo_test_prserv() {\necho \"The current date is: %s\" > ${PKGDESTWORK}/${PN}.datestamp\n}" % datetime.datetime.now() 43 inc_data = "do_package:append() {\n bb.build.exec_func('do_test_prserv', d)\n}\ndo_test_prserv() {\necho \"The current date is: %s\" > ${PKGDESTWORK}/${PN}.datestamp\n}" % datetime.datetime.now()
44 self.write_recipeinc(package_name, inc_data) 44 self.write_recipeinc(package_name, inc_data)
45 res = bitbake(package_name, ignore_status=True) 45 res = bitbake(package_name, ignore_status=True)
46 self.delete_recipeinc(package_name) 46 self.delete_recipeinc(package_name)
diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py b/meta/lib/oeqa/selftest/cases/recipetool.py
index f0685d3718..3b99417e84 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -94,7 +94,7 @@ class RecipetoolTests(RecipetoolBase):
94 94
95 def test_recipetool_appendfile_basic(self): 95 def test_recipetool_appendfile_basic(self):
96 # Basic test 96 # Basic test
97 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 97 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
98 '\n'] 98 '\n']
99 _, output = self._try_recipetool_appendfile('base-files', '/etc/motd', self.testfile, '', expectedlines, ['motd']) 99 _, output = self._try_recipetool_appendfile('base-files', '/etc/motd', self.testfile, '', expectedlines, ['motd'])
100 self.assertNotIn('WARNING: ', output) 100 self.assertNotIn('WARNING: ', output)
@@ -112,11 +112,11 @@ class RecipetoolTests(RecipetoolBase):
112 # Need a test file - should be executable 112 # Need a test file - should be executable
113 testfile2 = os.path.join(self.corebase, 'oe-init-build-env') 113 testfile2 = os.path.join(self.corebase, 'oe-init-build-env')
114 testfile2name = os.path.basename(testfile2) 114 testfile2name = os.path.basename(testfile2)
115 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 115 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
116 '\n', 116 '\n',
117 'SRC_URI += "file://%s"\n' % testfile2name, 117 'SRC_URI += "file://%s"\n' % testfile2name,
118 '\n', 118 '\n',
119 'do_install_append() {\n', 119 'do_install:append() {\n',
120 ' install -d ${D}${base_bindir}\n', 120 ' install -d ${D}${base_bindir}\n',
121 ' install -m 0755 ${WORKDIR}/%s ${D}${base_bindir}/ls\n' % testfile2name, 121 ' install -m 0755 ${WORKDIR}/%s ${D}${base_bindir}/ls\n' % testfile2name,
122 '}\n'] 122 '}\n']
@@ -138,11 +138,11 @@ class RecipetoolTests(RecipetoolBase):
138 138
139 def test_recipetool_appendfile_add(self): 139 def test_recipetool_appendfile_add(self):
140 # Try arbitrary file add to a recipe 140 # Try arbitrary file add to a recipe
141 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 141 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
142 '\n', 142 '\n',
143 'SRC_URI += "file://testfile"\n', 143 'SRC_URI += "file://testfile"\n',
144 '\n', 144 '\n',
145 'do_install_append() {\n', 145 'do_install:append() {\n',
146 ' install -d ${D}${datadir}\n', 146 ' install -d ${D}${datadir}\n',
147 ' install -m 0644 ${WORKDIR}/testfile ${D}${datadir}/something\n', 147 ' install -m 0644 ${WORKDIR}/testfile ${D}${datadir}/something\n',
148 '}\n'] 148 '}\n']
@@ -151,13 +151,13 @@ class RecipetoolTests(RecipetoolBase):
151 # (so we're testing that, plus modifying an existing bbappend) 151 # (so we're testing that, plus modifying an existing bbappend)
152 testfile2 = os.path.join(self.corebase, 'oe-init-build-env') 152 testfile2 = os.path.join(self.corebase, 'oe-init-build-env')
153 testfile2name = os.path.basename(testfile2) 153 testfile2name = os.path.basename(testfile2)
154 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 154 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
155 '\n', 155 '\n',
156 'SRC_URI += "file://testfile \\\n', 156 'SRC_URI += "file://testfile \\\n',
157 ' file://%s \\\n' % testfile2name, 157 ' file://%s \\\n' % testfile2name,
158 ' "\n', 158 ' "\n',
159 '\n', 159 '\n',
160 'do_install_append() {\n', 160 'do_install:append() {\n',
161 ' install -d ${D}${datadir}\n', 161 ' install -d ${D}${datadir}\n',
162 ' install -m 0644 ${WORKDIR}/testfile ${D}${datadir}/something\n', 162 ' install -m 0644 ${WORKDIR}/testfile ${D}${datadir}/something\n',
163 ' install -m 0755 ${WORKDIR}/%s ${D}${datadir}/scriptname\n' % testfile2name, 163 ' install -m 0755 ${WORKDIR}/%s ${D}${datadir}/scriptname\n' % testfile2name,
@@ -166,11 +166,11 @@ class RecipetoolTests(RecipetoolBase):
166 166
167 def test_recipetool_appendfile_add_bindir(self): 167 def test_recipetool_appendfile_add_bindir(self):
168 # Try arbitrary file add to a recipe, this time to a location such that should be installed as executable 168 # Try arbitrary file add to a recipe, this time to a location such that should be installed as executable
169 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 169 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
170 '\n', 170 '\n',
171 'SRC_URI += "file://testfile"\n', 171 'SRC_URI += "file://testfile"\n',
172 '\n', 172 '\n',
173 'do_install_append() {\n', 173 'do_install:append() {\n',
174 ' install -d ${D}${bindir}\n', 174 ' install -d ${D}${bindir}\n',
175 ' install -m 0755 ${WORKDIR}/testfile ${D}${bindir}/selftest-recipetool-testbin\n', 175 ' install -m 0755 ${WORKDIR}/testfile ${D}${bindir}/selftest-recipetool-testbin\n',
176 '}\n'] 176 '}\n']
@@ -179,13 +179,13 @@ class RecipetoolTests(RecipetoolBase):
179 179
180 def test_recipetool_appendfile_add_machine(self): 180 def test_recipetool_appendfile_add_machine(self):
181 # Try arbitrary file add to a recipe, this time to a location such that should be installed as executable 181 # Try arbitrary file add to a recipe, this time to a location such that should be installed as executable
182 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 182 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
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']
@@ -194,32 +194,32 @@ class RecipetoolTests(RecipetoolBase):
194 194
195 def test_recipetool_appendfile_orig(self): 195 def test_recipetool_appendfile_orig(self):
196 # A file that's in SRC_URI and in do_install with the same name 196 # A file that's in SRC_URI and in do_install with the same name
197 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 197 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
198 '\n'] 198 '\n']
199 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-orig', self.testfile, '', expectedlines, ['selftest-replaceme-orig']) 199 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-orig', self.testfile, '', expectedlines, ['selftest-replaceme-orig'])
200 self.assertNotIn('WARNING: ', output) 200 self.assertNotIn('WARNING: ', output)
201 201
202 def test_recipetool_appendfile_todir(self): 202 def test_recipetool_appendfile_todir(self):
203 # A file that's in SRC_URI and in do_install with destination directory rather than file 203 # A file that's in SRC_URI and in do_install with destination directory rather than file
204 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 204 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
205 '\n'] 205 '\n']
206 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-todir', self.testfile, '', expectedlines, ['selftest-replaceme-todir']) 206 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-todir', self.testfile, '', expectedlines, ['selftest-replaceme-todir'])
207 self.assertNotIn('WARNING: ', output) 207 self.assertNotIn('WARNING: ', output)
208 208
209 def test_recipetool_appendfile_renamed(self): 209 def test_recipetool_appendfile_renamed(self):
210 # A file that's in SRC_URI with a different name to the destination file 210 # A file that's in SRC_URI with a different name to the destination file
211 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 211 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
212 '\n'] 212 '\n']
213 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-renamed', self.testfile, '', expectedlines, ['file1']) 213 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-renamed', self.testfile, '', expectedlines, ['file1'])
214 self.assertNotIn('WARNING: ', output) 214 self.assertNotIn('WARNING: ', output)
215 215
216 def test_recipetool_appendfile_subdir(self): 216 def test_recipetool_appendfile_subdir(self):
217 # A file that's in SRC_URI in a subdir 217 # A file that's in SRC_URI in a subdir
218 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 218 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
219 '\n', 219 '\n',
220 'SRC_URI += "file://testfile"\n', 220 'SRC_URI += "file://testfile"\n',
221 '\n', 221 '\n',
222 'do_install_append() {\n', 222 'do_install:append() {\n',
223 ' install -d ${D}${datadir}\n', 223 ' install -d ${D}${datadir}\n',
224 ' install -m 0644 ${WORKDIR}/testfile ${D}${datadir}/selftest-replaceme-subdir\n', 224 ' install -m 0644 ${WORKDIR}/testfile ${D}${datadir}/selftest-replaceme-subdir\n',
225 '}\n'] 225 '}\n']
@@ -228,25 +228,25 @@ class RecipetoolTests(RecipetoolBase):
228 228
229 def test_recipetool_appendfile_inst_glob(self): 229 def test_recipetool_appendfile_inst_glob(self):
230 # A file that's in do_install as a glob 230 # A file that's in do_install as a glob
231 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 231 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
232 '\n'] 232 '\n']
233 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-inst-globfile', self.testfile, '', expectedlines, ['selftest-replaceme-inst-globfile']) 233 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-inst-globfile', self.testfile, '', expectedlines, ['selftest-replaceme-inst-globfile'])
234 self.assertNotIn('WARNING: ', output) 234 self.assertNotIn('WARNING: ', output)
235 235
236 def test_recipetool_appendfile_inst_todir_glob(self): 236 def test_recipetool_appendfile_inst_todir_glob(self):
237 # A file that's in do_install as a glob with destination as a directory 237 # A file that's in do_install as a glob with destination as a directory
238 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 238 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
239 '\n'] 239 '\n']
240 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-inst-todir-globfile', self.testfile, '', expectedlines, ['selftest-replaceme-inst-todir-globfile']) 240 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-inst-todir-globfile', self.testfile, '', expectedlines, ['selftest-replaceme-inst-todir-globfile'])
241 self.assertNotIn('WARNING: ', output) 241 self.assertNotIn('WARNING: ', output)
242 242
243 def test_recipetool_appendfile_patch(self): 243 def test_recipetool_appendfile_patch(self):
244 # A file that's added by a patch in SRC_URI 244 # A file that's added by a patch in SRC_URI
245 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 245 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
246 '\n', 246 '\n',
247 'SRC_URI += "file://testfile"\n', 247 'SRC_URI += "file://testfile"\n',
248 '\n', 248 '\n',
249 'do_install_append() {\n', 249 'do_install:append() {\n',
250 ' install -d ${D}${sysconfdir}\n', 250 ' install -d ${D}${sysconfdir}\n',
251 ' install -m 0644 ${WORKDIR}/testfile ${D}${sysconfdir}/selftest-replaceme-patched\n', 251 ' install -m 0644 ${WORKDIR}/testfile ${D}${sysconfdir}/selftest-replaceme-patched\n',
252 '}\n'] 252 '}\n']
@@ -260,11 +260,11 @@ class RecipetoolTests(RecipetoolBase):
260 260
261 def test_recipetool_appendfile_script(self): 261 def test_recipetool_appendfile_script(self):
262 # Now, a file that's in SRC_URI but installed by a script (so no mention in do_install) 262 # Now, a file that's in SRC_URI but installed by a script (so no mention in do_install)
263 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 263 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
264 '\n', 264 '\n',
265 'SRC_URI += "file://testfile"\n', 265 'SRC_URI += "file://testfile"\n',
266 '\n', 266 '\n',
267 'do_install_append() {\n', 267 'do_install:append() {\n',
268 ' install -d ${D}${datadir}\n', 268 ' install -d ${D}${datadir}\n',
269 ' install -m 0644 ${WORKDIR}/testfile ${D}${datadir}/selftest-replaceme-scripted\n', 269 ' install -m 0644 ${WORKDIR}/testfile ${D}${datadir}/selftest-replaceme-scripted\n',
270 '}\n'] 270 '}\n']
@@ -273,7 +273,7 @@ class RecipetoolTests(RecipetoolBase):
273 273
274 def test_recipetool_appendfile_inst_func(self): 274 def test_recipetool_appendfile_inst_func(self):
275 # A file that's installed from a function called by do_install 275 # A file that's installed from a function called by do_install
276 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 276 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
277 '\n'] 277 '\n']
278 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-inst-func', self.testfile, '', expectedlines, ['selftest-replaceme-inst-func']) 278 _, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-inst-func', self.testfile, '', expectedlines, ['selftest-replaceme-inst-func'])
279 self.assertNotIn('WARNING: ', output) 279 self.assertNotIn('WARNING: ', output)
@@ -283,11 +283,11 @@ class RecipetoolTests(RecipetoolBase):
283 # First try without specifying recipe 283 # First try without specifying recipe
284 self._try_recipetool_appendfile_fail('/usr/share/selftest-replaceme-postinst', self.testfile, ['File /usr/share/selftest-replaceme-postinst may be written out in a pre/postinstall script of the following recipes:', 'selftest-recipetool-appendfile']) 284 self._try_recipetool_appendfile_fail('/usr/share/selftest-replaceme-postinst', self.testfile, ['File /usr/share/selftest-replaceme-postinst may be written out in a pre/postinstall script of the following recipes:', 'selftest-recipetool-appendfile'])
285 # Now specify recipe 285 # Now specify recipe
286 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 286 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
287 '\n', 287 '\n',
288 'SRC_URI += "file://testfile"\n', 288 'SRC_URI += "file://testfile"\n',
289 '\n', 289 '\n',
290 'do_install_append() {\n', 290 'do_install:append() {\n',
291 ' install -d ${D}${datadir}\n', 291 ' install -d ${D}${datadir}\n',
292 ' install -m 0644 ${WORKDIR}/testfile ${D}${datadir}/selftest-replaceme-postinst\n', 292 ' install -m 0644 ${WORKDIR}/testfile ${D}${datadir}/selftest-replaceme-postinst\n',
293 '}\n'] 293 '}\n']
@@ -430,10 +430,10 @@ class RecipetoolTests(RecipetoolBase):
430 urls.append('npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json') 430 urls.append('npmsw://${THISDIR}/${BPN}/npm-shrinkwrap.json')
431 checkvars['SRC_URI'] = set(urls) 431 checkvars['SRC_URI'] = set(urls)
432 checkvars['S'] = '${WORKDIR}/npm' 432 checkvars['S'] = '${WORKDIR}/npm'
433 checkvars['LICENSE_${PN}'] = 'MIT' 433 checkvars['LICENSE:${PN}'] = 'MIT'
434 checkvars['LICENSE_${PN}-base64'] = 'Unknown' 434 checkvars['LICENSE:${PN}-base64'] = 'Unknown'
435 checkvars['LICENSE_${PN}-accepts'] = 'MIT' 435 checkvars['LICENSE:${PN}-accepts'] = 'MIT'
436 checkvars['LICENSE_${PN}-inherits'] = 'ISC' 436 checkvars['LICENSE:${PN}-inherits'] = 'ISC'
437 inherits = ['npm'] 437 inherits = ['npm']
438 self._test_recipe_contents(recipefile, checkvars, inherits) 438 self._test_recipe_contents(recipefile, checkvars, inherits)
439 439
@@ -620,7 +620,7 @@ class RecipetoolAppendsrcBase(RecipetoolBase):
620 else: 620 else:
621 destpath = '.' + os.sep 621 destpath = '.' + os.sep
622 622
623 expectedlines = ['FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n', 623 expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
624 '\n'] 624 '\n']
625 if has_src_uri: 625 if has_src_uri:
626 uri = 'file://%s' % filename 626 uri = 'file://%s' % filename
diff --git a/meta/lib/oeqa/selftest/cases/recipeutils.py b/meta/lib/oeqa/selftest/cases/recipeutils.py
index 747870383b..97edad88b5 100644
--- a/meta/lib/oeqa/selftest/cases/recipeutils.py
+++ b/meta/lib/oeqa/selftest/cases/recipeutils.py
@@ -52,7 +52,7 @@ class RecipeUtilsTests(OESelftestTestCase):
52+SRC_URI[md5sum] = "aaaaaa" 52+SRC_URI[md5sum] = "aaaaaa"
53 SRC_URI[sha256sum] = "ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051" 53 SRC_URI[sha256sum] = "ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051"
54 54
55 RDEPENDS_${PN} += "${PYTHON_PN}-threading" 55 RDEPENDS:${PN} += "${PYTHON_PN}-threading"
56""" 56"""
57 patchlines = [] 57 patchlines = []
58 for f in patches: 58 for f in patches:
@@ -80,7 +80,7 @@ class RecipeUtilsTests(OESelftestTestCase):
80 80
81-SRC_URI += "file://somefile" 81-SRC_URI += "file://somefile"
82- 82-
83 SRC_URI_append = " file://anotherfile" 83 SRC_URI:append = " file://anotherfile"
84""" 84"""
85 patchlines = [] 85 patchlines = []
86 for f in patches: 86 for f in patches:
@@ -105,7 +105,7 @@ class RecipeUtilsTests(OESelftestTestCase):
105 105
106-SRC_URI += "file://somefile" 106-SRC_URI += "file://somefile"
107- 107-
108-SRC_URI_append = " file://anotherfile" 108-SRC_URI:append = " file://anotherfile"
109""" 109"""
110 patchlines = [] 110 patchlines = []
111 for f in patches: 111 for f in patches:
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py
index a62757399b..910ef0d301 100644
--- a/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -220,7 +220,7 @@ class ReproducibleTests(OESelftestTestCase):
220 INHIBIT_PACKAGE_STRIP = "1" 220 INHIBIT_PACKAGE_STRIP = "1"
221 TMPDIR = "{tmpdir}" 221 TMPDIR = "{tmpdir}"
222 LICENSE_FLAGS_WHITELIST = "commercial" 222 LICENSE_FLAGS_WHITELIST = "commercial"
223 DISTRO_FEATURES_append = ' systemd pam' 223 DISTRO_FEATURES:append = ' systemd pam'
224 USERADDEXTENSION = "useradd-staticids" 224 USERADDEXTENSION = "useradd-staticids"
225 USERADD_ERROR_DYNAMIC = "skip" 225 USERADD_ERROR_DYNAMIC = "skip"
226 USERADD_UID_TABLES += "files/static-passwd" 226 USERADD_UID_TABLES += "files/static-passwd"
diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py
index d0c2440722..4cfec94d85 100644
--- a/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -120,7 +120,7 @@ class TestImage(OESelftestTestCase):
120 self.skipTest('core-image-full-cmdline not buildable for poky-tiny') 120 self.skipTest('core-image-full-cmdline not buildable for poky-tiny')
121 121
122 features = 'INHERIT += "testimage"\n' 122 features = 'INHERIT += "testimage"\n'
123 features += 'IMAGE_INSTALL_append = " libssl"\n' 123 features += 'IMAGE_INSTALL:append = " libssl"\n'
124 features += 'TEST_SUITES = "ping ssh selftest"\n' 124 features += 'TEST_SUITES = "ping ssh selftest"\n'
125 self.write_config(features) 125 self.write_config(features)
126 126
@@ -186,14 +186,14 @@ class TestImage(OESelftestTestCase):
186 qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native') 186 qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native')
187 features = 'INHERIT += "testimage"\n' 187 features = 'INHERIT += "testimage"\n'
188 if 'gtk+' not in qemu_packageconfig: 188 if 'gtk+' not in qemu_packageconfig:
189 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " gtk+"\n' 189 features += 'PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"\n'
190 if 'sdl' not in qemu_packageconfig: 190 if 'sdl' not in qemu_packageconfig:
191 features += 'PACKAGECONFIG_append_pn-qemu-system-native = " sdl"\n' 191 features += 'PACKAGECONFIG:append:pn-qemu-system-native = " sdl"\n'
192 if 'opengl' not in qemu_distrofeatures: 192 if 'opengl' not in qemu_distrofeatures:
193 features += 'DISTRO_FEATURES_append = " opengl"\n' 193 features += 'DISTRO_FEATURES:append = " opengl"\n'
194 features += 'TEST_SUITES = "ping ssh virgl"\n' 194 features += 'TEST_SUITES = "ping ssh virgl"\n'
195 features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n' 195 features += 'IMAGE_FEATURES:append = " ssh-server-dropbear"\n'
196 features += 'IMAGE_INSTALL_append = " kmscube"\n' 196 features += 'IMAGE_INSTALL:append = " kmscube"\n'
197 features_gtk = features + 'TEST_RUNQEMUPARAMS = "gtk gl"\n' 197 features_gtk = features + 'TEST_RUNQEMUPARAMS = "gtk gl"\n'
198 self.write_config(features_gtk) 198 self.write_config(features_gtk)
199 bitbake('core-image-minimal') 199 bitbake('core-image-minimal')
@@ -225,10 +225,10 @@ class TestImage(OESelftestTestCase):
225 qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native') 225 qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native')
226 features = 'INHERIT += "testimage"\n' 226 features = 'INHERIT += "testimage"\n'
227 if 'opengl' not in qemu_distrofeatures: 227 if 'opengl' not in qemu_distrofeatures:
228 features += 'DISTRO_FEATURES_append = " opengl"\n' 228 features += 'DISTRO_FEATURES:append = " opengl"\n'
229 features += 'TEST_SUITES = "ping ssh virgl"\n' 229 features += 'TEST_SUITES = "ping ssh virgl"\n'
230 features += 'IMAGE_FEATURES_append = " ssh-server-dropbear"\n' 230 features += 'IMAGE_FEATURES:append = " ssh-server-dropbear"\n'
231 features += 'IMAGE_INSTALL_append = " kmscube"\n' 231 features += 'IMAGE_INSTALL:append = " kmscube"\n'
232 features += 'TEST_RUNQEMUPARAMS = "egl-headless"\n' 232 features += 'TEST_RUNQEMUPARAMS = "egl-headless"\n'
233 self.write_config(features) 233 self.write_config(features)
234 bitbake('core-image-minimal') 234 bitbake('core-image-minimal')
@@ -254,7 +254,7 @@ class Postinst(OESelftestTestCase):
254 features += 'IMAGE_FEATURES += "package-management empty-root-password"\n' 254 features += 'IMAGE_FEATURES += "package-management empty-root-password"\n'
255 features += 'PACKAGE_CLASSES = "%s"\n' % classes 255 features += 'PACKAGE_CLASSES = "%s"\n' % classes
256 if init_manager == "systemd": 256 if init_manager == "systemd":
257 features += 'DISTRO_FEATURES_append = " systemd"\n' 257 features += 'DISTRO_FEATURES:append = " systemd"\n'
258 features += 'VIRTUAL-RUNTIME_init_manager = "systemd"\n' 258 features += 'VIRTUAL-RUNTIME_init_manager = "systemd"\n'
259 features += 'DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"\n' 259 features += 'DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"\n'
260 features += 'VIRTUAL-RUNTIME_initscripts = ""\n' 260 features += 'VIRTUAL-RUNTIME_initscripts = ""\n'
@@ -371,14 +371,14 @@ TEST_SERVER_IP = "192.168.7.1"
371TEST_TARGET_IP = "192.168.7.2" 371TEST_TARGET_IP = "192.168.7.2"
372 372
373EXTRA_IMAGE_FEATURES += "tools-profile dbg-pkgs" 373EXTRA_IMAGE_FEATURES += "tools-profile dbg-pkgs"
374IMAGE_FEATURES_append = " ssh-server-dropbear" 374IMAGE_FEATURES:append = " ssh-server-dropbear"
375 375
376# enables kernel debug symbols 376# enables kernel debug symbols
377KERNEL_EXTRA_FEATURES_append = " features/debug/debug-kernel.scc" 377KERNEL_EXTRA_FEATURES:append = " features/debug/debug-kernel.scc"
378KERNEL_EXTRA_FEATURES_append = " features/systemtap/systemtap.scc" 378KERNEL_EXTRA_FEATURES:append = " features/systemtap/systemtap.scc"
379 379
380# add systemtap run-time into target image if it is not there yet 380# add systemtap run-time into target image if it is not there yet
381IMAGE_INSTALL_append = " systemtap-runtime" 381IMAGE_INSTALL:append = " systemtap-runtime"
382""" 382"""
383 383
384 def test_crosstap_helloworld(self): 384 def test_crosstap_helloworld(self):
diff --git a/meta/lib/oeqa/selftest/cases/signing.py b/meta/lib/oeqa/selftest/cases/signing.py
index a28c7eb19a..af7a0b8b45 100644
--- a/meta/lib/oeqa/selftest/cases/signing.py
+++ b/meta/lib/oeqa/selftest/cases/signing.py
@@ -145,7 +145,7 @@ class Signing(OESelftestTestCase):
145 feature += 'GPG_PATH = "%s"\n' % self.gpg_dir 145 feature += 'GPG_PATH = "%s"\n' % self.gpg_dir
146 feature += 'SSTATE_DIR = "%s"\n' % sstatedir 146 feature += 'SSTATE_DIR = "%s"\n' % sstatedir
147 # Any mirror might have partial sstate without .sig files, triggering failures 147 # Any mirror might have partial sstate without .sig files, triggering failures
148 feature += 'SSTATE_MIRRORS_forcevariable = ""\n' 148 feature += 'SSTATE_MIRRORS:forcevariable = ""\n'
149 149
150 self.write_config(feature) 150 self.write_config(feature)
151 151
@@ -206,7 +206,7 @@ class LockedSignatures(OESelftestTestCase):
206 # Use uuid so hash equivalance server isn't triggered 206 # Use uuid so hash equivalance server isn't triggered
207 recipe_append_file = test_recipe + '_' + get_bb_var('PV', test_recipe) + '.bbappend' 207 recipe_append_file = test_recipe + '_' + get_bb_var('PV', test_recipe) + '.bbappend'
208 recipe_append_path = os.path.join(templayerdir, 'recipes-test', test_recipe, recipe_append_file) 208 recipe_append_path = os.path.join(templayerdir, 'recipes-test', test_recipe, recipe_append_file)
209 feature = 'SUMMARY_${PN} = "test locked signature%s"\n' % uuid.uuid4() 209 feature = 'SUMMARY:${PN} = "test locked signature%s"\n' % uuid.uuid4()
210 210
211 os.mkdir(os.path.join(templayerdir, 'recipes-test')) 211 os.mkdir(os.path.join(templayerdir, 'recipes-test'))
212 os.mkdir(os.path.join(templayerdir, 'recipes-test', test_recipe)) 212 os.mkdir(os.path.join(templayerdir, 'recipes-test', test_recipe))
diff --git a/meta/lib/oeqa/selftest/cases/sstatetests.py b/meta/lib/oeqa/selftest/cases/sstatetests.py
index 9db2a0bb44..17a1545506 100644
--- a/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -174,7 +174,7 @@ class SStateTests(SStateBase):
174 174
175 # If buildhistory is enabled, we need to disable version-going-backwards 175 # If buildhistory is enabled, we need to disable version-going-backwards
176 # QA checks for this test. It may report errors otherwise. 176 # QA checks for this test. It may report errors otherwise.
177 self.append_config('ERROR_QA_remove = "version-going-backwards"') 177 self.append_config('ERROR_QA:remove = "version-going-backwards"')
178 178
179 # For not this only checks if random sstate tasks are handled correctly as a group. 179 # For not this only checks if random sstate tasks are handled correctly as a group.
180 # In the future we should add control over what tasks we check for. 180 # In the future we should add control over what tasks we check for.
@@ -360,7 +360,7 @@ TCLIBCAPPEND = \"\"
360MACHINE = \"qemux86-64\" 360MACHINE = \"qemux86-64\"
361require conf/multilib.conf 361require conf/multilib.conf
362MULTILIBS = \"multilib:lib32\" 362MULTILIBS = \"multilib:lib32\"
363DEFAULTTUNE_virtclass-multilib-lib32 = \"x86\" 363DEFAULTTUNE:virtclass-multilib-lib32 = \"x86\"
364BB_SIGNATURE_HANDLER = "OEBasicHash" 364BB_SIGNATURE_HANDLER = "OEBasicHash"
365""" 365"""
366 configB = """ 366 configB = """
@@ -414,7 +414,7 @@ TCLIBCAPPEND = \"\"
414MACHINE = \"qemux86\" 414MACHINE = \"qemux86\"
415require conf/multilib.conf 415require conf/multilib.conf
416MULTILIBS = "multilib:lib32" 416MULTILIBS = "multilib:lib32"
417DEFAULTTUNE_virtclass-multilib-lib32 = "x86" 417DEFAULTTUNE:virtclass-multilib-lib32 = "x86"
418BB_SIGNATURE_HANDLER = "OEBasicHash" 418BB_SIGNATURE_HANDLER = "OEBasicHash"
419""") 419""")
420 self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") 420 self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash")
@@ -425,7 +425,7 @@ TCLIBCAPPEND = \"\"
425MACHINE = \"qemux86copy\" 425MACHINE = \"qemux86copy\"
426require conf/multilib.conf 426require conf/multilib.conf
427MULTILIBS = "multilib:lib32" 427MULTILIBS = "multilib:lib32"
428DEFAULTTUNE_virtclass-multilib-lib32 = "x86" 428DEFAULTTUNE:virtclass-multilib-lib32 = "x86"
429BB_SIGNATURE_HANDLER = "OEBasicHash" 429BB_SIGNATURE_HANDLER = "OEBasicHash"
430""") 430""")
431 self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2") 431 self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash2")
@@ -462,7 +462,7 @@ TCLIBCAPPEND = \"\"
462MACHINE = \"qemux86\" 462MACHINE = \"qemux86\"
463require conf/multilib.conf 463require conf/multilib.conf
464MULTILIBS = "multilib:lib32" 464MULTILIBS = "multilib:lib32"
465DEFAULTTUNE_virtclass-multilib-lib32 = "x86" 465DEFAULTTUNE:virtclass-multilib-lib32 = "x86"
466BB_SIGNATURE_HANDLER = "OEBasicHash" 466BB_SIGNATURE_HANDLER = "OEBasicHash"
467""") 467""")
468 self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash") 468 self.track_for_cleanup(self.topdir + "/tmp-sstatesamehash")
@@ -503,7 +503,7 @@ PARALLEL_MAKE = "-j 1"
503DL_DIR = "${TOPDIR}/download1" 503DL_DIR = "${TOPDIR}/download1"
504TIME = "111111" 504TIME = "111111"
505DATE = "20161111" 505DATE = "20161111"
506INHERIT_remove = "buildstats-summary buildhistory uninative" 506INHERIT:remove = "buildstats-summary buildhistory uninative"
507http_proxy = "" 507http_proxy = ""
508BB_SIGNATURE_HANDLER = "OEBasicHash" 508BB_SIGNATURE_HANDLER = "OEBasicHash"
509""") 509""")
@@ -519,7 +519,7 @@ DL_DIR = "${TOPDIR}/download2"
519TIME = "222222" 519TIME = "222222"
520DATE = "20161212" 520DATE = "20161212"
521# Always remove uninative as we're changing proxies 521# Always remove uninative as we're changing proxies
522INHERIT_remove = "uninative" 522INHERIT:remove = "uninative"
523INHERIT += "buildstats-summary buildhistory" 523INHERIT += "buildstats-summary buildhistory"
524http_proxy = "http://example.com/" 524http_proxy = "http://example.com/"
525BB_SIGNATURE_HANDLER = "OEBasicHash" 525BB_SIGNATURE_HANDLER = "OEBasicHash"
diff --git a/meta/lib/oeqa/selftest/cases/sysroot.py b/meta/lib/oeqa/selftest/cases/sysroot.py
index 6e34927c90..79ab45235d 100644
--- a/meta/lib/oeqa/selftest/cases/sysroot.py
+++ b/meta/lib/oeqa/selftest/cases/sysroot.py
@@ -24,14 +24,14 @@ class SysrootTests(OESelftestTestCase):
24 self.write_config(""" 24 self.write_config("""
25PREFERRED_PROVIDER_virtual/sysroot-test = "sysroot-test-arch1" 25PREFERRED_PROVIDER_virtual/sysroot-test = "sysroot-test-arch1"
26MACHINE = "qemux86" 26MACHINE = "qemux86"
27TESTSTRING_pn-sysroot-test-arch1 = "%s" 27TESTSTRING:pn-sysroot-test-arch1 = "%s"
28TESTSTRING_pn-sysroot-test-arch2 = "%s" 28TESTSTRING:pn-sysroot-test-arch2 = "%s"
29""" % (uuid1, uuid2)) 29""" % (uuid1, uuid2))
30 bitbake("sysroot-test") 30 bitbake("sysroot-test")
31 self.write_config(""" 31 self.write_config("""
32PREFERRED_PROVIDER_virtual/sysroot-test = "sysroot-test-arch2" 32PREFERRED_PROVIDER_virtual/sysroot-test = "sysroot-test-arch2"
33MACHINE = "qemux86copy" 33MACHINE = "qemux86copy"
34TESTSTRING_pn-sysroot-test-arch1 = "%s" 34TESTSTRING:pn-sysroot-test-arch1 = "%s"
35TESTSTRING_pn-sysroot-test-arch2 = "%s" 35TESTSTRING:pn-sysroot-test-arch2 = "%s"
36""" % (uuid1, uuid2)) 36""" % (uuid1, uuid2))
37 bitbake("sysroot-test") 37 bitbake("sysroot-test")
diff --git a/meta/lib/oeqa/selftest/cases/tinfoil.py b/meta/lib/oeqa/selftest/cases/tinfoil.py
index a51c6048d3..51092805d8 100644
--- a/meta/lib/oeqa/selftest/cases/tinfoil.py
+++ b/meta/lib/oeqa/selftest/cases/tinfoil.py
@@ -173,8 +173,8 @@ class TinfoilTests(OESelftestTestCase):
173 self.assertEqual(value, 'origvalue', 'Variable renamed using config_data.renameVar() does not appear with new name') 173 self.assertEqual(value, 'origvalue', 'Variable renamed using config_data.renameVar() does not appear with new name')
174 # Test overrides 174 # Test overrides
175 tinfoil.config_data.setVar('TESTVAR', 'original') 175 tinfoil.config_data.setVar('TESTVAR', 'original')
176 tinfoil.config_data.setVar('TESTVAR_overrideone', 'one') 176 tinfoil.config_data.setVar('TESTVAR:overrideone', 'one')
177 tinfoil.config_data.setVar('TESTVAR_overridetwo', 'two') 177 tinfoil.config_data.setVar('TESTVAR:overridetwo', 'two')
178 tinfoil.config_data.appendVar('OVERRIDES', ':overrideone') 178 tinfoil.config_data.appendVar('OVERRIDES', ':overrideone')
179 value = tinfoil.config_data.getVar('TESTVAR') 179 value = tinfoil.config_data.getVar('TESTVAR')
180 self.assertEqual(value, 'one', 'Variable overrides not functioning correctly') 180 self.assertEqual(value, 'one', 'Variable overrides not functioning correctly')
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index a11e2d0781..32044e74d0 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -189,8 +189,8 @@ class Wic(WicTestCase):
189 def test_iso_image(self): 189 def test_iso_image(self):
190 """Test creation of hybrid iso image with legacy and EFI boot""" 190 """Test creation of hybrid iso image with legacy and EFI boot"""
191 config = 'INITRAMFS_IMAGE = "core-image-minimal-initramfs"\n'\ 191 config = 'INITRAMFS_IMAGE = "core-image-minimal-initramfs"\n'\
192 'MACHINE_FEATURES_append = " efi"\n'\ 192 'MACHINE_FEATURES:append = " efi"\n'\
193 'DEPENDS_pn-core-image-minimal += "syslinux"\n' 193 'DEPENDS:pn-core-image-minimal += "syslinux"\n'
194 self.append_config(config) 194 self.append_config(config)
195 bitbake('core-image-minimal core-image-minimal-initramfs') 195 bitbake('core-image-minimal core-image-minimal-initramfs')
196 self.remove_config(config) 196 self.remove_config(config)
@@ -216,7 +216,7 @@ class Wic(WicTestCase):
216 @only_for_arch(['i586', 'i686', 'x86_64']) 216 @only_for_arch(['i586', 'i686', 'x86_64'])
217 def test_bootloader_config(self): 217 def test_bootloader_config(self):
218 """Test creation of directdisk-bootloader-config image""" 218 """Test creation of directdisk-bootloader-config image"""
219 config = 'DEPENDS_pn-core-image-minimal += "syslinux"\n' 219 config = 'DEPENDS:pn-core-image-minimal += "syslinux"\n'
220 self.append_config(config) 220 self.append_config(config)
221 bitbake('core-image-minimal') 221 bitbake('core-image-minimal')
222 self.remove_config(config) 222 self.remove_config(config)
@@ -227,7 +227,7 @@ class Wic(WicTestCase):
227 @only_for_arch(['i586', 'i686', 'x86_64']) 227 @only_for_arch(['i586', 'i686', 'x86_64'])
228 def test_systemd_bootdisk(self): 228 def test_systemd_bootdisk(self):
229 """Test creation of systemd-bootdisk image""" 229 """Test creation of systemd-bootdisk image"""
230 config = 'MACHINE_FEATURES_append = " efi"\n' 230 config = 'MACHINE_FEATURES:append = " efi"\n'
231 self.append_config(config) 231 self.append_config(config)
232 bitbake('core-image-minimal') 232 bitbake('core-image-minimal')
233 self.remove_config(config) 233 self.remove_config(config)
@@ -259,7 +259,7 @@ class Wic(WicTestCase):
259 """Test default output location""" 259 """Test default output location"""
260 for fname in glob("directdisk-*.direct"): 260 for fname in glob("directdisk-*.direct"):
261 os.remove(fname) 261 os.remove(fname)
262 config = 'DEPENDS_pn-core-image-minimal += "syslinux"\n' 262 config = 'DEPENDS:pn-core-image-minimal += "syslinux"\n'
263 self.append_config(config) 263 self.append_config(config)
264 bitbake('core-image-minimal') 264 bitbake('core-image-minimal')
265 self.remove_config(config) 265 self.remove_config(config)
@@ -757,7 +757,7 @@ class Wic2(WicTestCase):
757 def test_wic_image_type(self): 757 def test_wic_image_type(self):
758 """Test building wic images by bitbake""" 758 """Test building wic images by bitbake"""
759 config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "wic-image-minimal"\n'\ 759 config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "wic-image-minimal"\n'\
760 'MACHINE_FEATURES_append = " efi"\n' 760 'MACHINE_FEATURES:append = " efi"\n'
761 self.append_config(config) 761 self.append_config(config)
762 self.assertEqual(0, bitbake('wic-image-minimal').status) 762 self.assertEqual(0, bitbake('wic-image-minimal').status)
763 self.remove_config(config) 763 self.remove_config(config)
@@ -777,7 +777,7 @@ class Wic2(WicTestCase):
777 def test_qemu(self): 777 def test_qemu(self):
778 """Test wic-image-minimal under qemu""" 778 """Test wic-image-minimal under qemu"""
779 config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "wic-image-minimal"\n'\ 779 config = 'IMAGE_FSTYPES += "wic"\nWKS_FILE = "wic-image-minimal"\n'\
780 'MACHINE_FEATURES_append = " efi"\n' 780 'MACHINE_FEATURES:append = " efi"\n'
781 self.append_config(config) 781 self.append_config(config)
782 self.assertEqual(0, bitbake('wic-image-minimal').status) 782 self.assertEqual(0, bitbake('wic-image-minimal').status)
783 self.remove_config(config) 783 self.remove_config(config)
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 15:28:17 +0000