summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/base.bbclass8
-rw-r--r--meta/classes/package_rpm.bbclass2
-rw-r--r--meta/classes/ptest.bbclass2
-rw-r--r--meta/classes/terminal.bbclass8
4 files changed, 10 insertions, 10 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 9bd5499a10..eb5edef3b3 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -431,14 +431,14 @@ python () {
431 d.setVarFlag('do_configure', 'umask', '022') 431 d.setVarFlag('do_configure', 'umask', '022')
432 d.setVarFlag('do_compile', 'umask', '022') 432 d.setVarFlag('do_compile', 'umask', '022')
433 d.appendVarFlag('do_install', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') 433 d.appendVarFlag('do_install', 'depends', ' virtual/fakeroot-native:do_populate_sysroot')
434 d.setVarFlag('do_install', 'fakeroot', 1) 434 d.setVarFlag('do_install', 'fakeroot', '1')
435 d.setVarFlag('do_install', 'umask', '022') 435 d.setVarFlag('do_install', 'umask', '022')
436 d.appendVarFlag('do_package', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') 436 d.appendVarFlag('do_package', 'depends', ' virtual/fakeroot-native:do_populate_sysroot')
437 d.setVarFlag('do_package', 'fakeroot', 1) 437 d.setVarFlag('do_package', 'fakeroot', '1')
438 d.setVarFlag('do_package', 'umask', '022') 438 d.setVarFlag('do_package', 'umask', '022')
439 d.setVarFlag('do_package_setscene', 'fakeroot', 1) 439 d.setVarFlag('do_package_setscene', 'fakeroot', '1')
440 d.appendVarFlag('do_package_setscene', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') 440 d.appendVarFlag('do_package_setscene', 'depends', ' virtual/fakeroot-native:do_populate_sysroot')
441 d.setVarFlag('do_devshell', 'fakeroot', 1) 441 d.setVarFlag('do_devshell', 'fakeroot', '1')
442 d.appendVarFlag('do_devshell', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') 442 d.appendVarFlag('do_devshell', 'depends', ' virtual/fakeroot-native:do_populate_sysroot')
443 source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', 0) 443 source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', 0)
444 if not source_mirror_fetch: 444 if not source_mirror_fetch:
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 1fa1634d29..7d523a16f8 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -743,7 +743,7 @@ python () {
743 if d.getVar('PACKAGES', True) != '': 743 if d.getVar('PACKAGES', True) != '':
744 deps = ' rpm-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot' 744 deps = ' rpm-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot'
745 d.appendVarFlag('do_package_write_rpm', 'depends', deps) 745 d.appendVarFlag('do_package_write_rpm', 'depends', deps)
746 d.setVarFlag('do_package_write_rpm', 'fakeroot', 1) 746 d.setVarFlag('do_package_write_rpm', 'fakeroot', '1')
747} 747}
748 748
749SSTATETASKS += "do_package_write_rpm" 749SSTATETASKS += "do_package_write_rpm"
diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass
index 4dc5dbe9ef..fa3561e621 100644
--- a/meta/classes/ptest.bbclass
+++ b/meta/classes/ptest.bbclass
@@ -58,7 +58,7 @@ addtask install_ptest_base after do_install before do_package do_populate_sy
58 58
59python () { 59python () {
60 if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): 60 if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d):
61 d.setVarFlag('do_install_ptest_base', 'fakeroot', 1) 61 d.setVarFlag('do_install_ptest_base', 'fakeroot', '1')
62 62
63 # Remove all '*ptest_base' tasks when ptest is not enabled 63 # Remove all '*ptest_base' tasks when ptest is not enabled
64 if not(d.getVar('PTEST_ENABLED', True) == "1"): 64 if not(d.getVar('PTEST_ENABLED', True) == "1"):
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass
index e577c6d594..fd87cfe3d8 100644
--- a/meta/classes/terminal.bbclass
+++ b/meta/classes/terminal.bbclass
@@ -15,7 +15,7 @@ def emit_terminal_func(command, envdata, d):
15 cmd_func = 'do_terminal' 15 cmd_func = 'do_terminal'
16 16
17 envdata.setVar(cmd_func, 'exec ' + command) 17 envdata.setVar(cmd_func, 'exec ' + command)
18 envdata.setVarFlag(cmd_func, 'func', 1) 18 envdata.setVarFlag(cmd_func, 'func', '1')
19 19
20 runfmt = d.getVar('BB_RUNFMT', True) or "run.{func}.{pid}" 20 runfmt = d.getVar('BB_RUNFMT', True) or "run.{func}.{pid}"
21 runfile = runfmt.format(func=cmd_func, task=cmd_func, taskfunc=cmd_func, pid=os.getpid()) 21 runfile = runfmt.format(func=cmd_func, task=cmd_func, taskfunc=cmd_func, pid=os.getpid())
@@ -39,14 +39,14 @@ def oe_terminal(command, title, d):
39 39
40 for v in os.environ: 40 for v in os.environ:
41 envdata.setVar(v, os.environ[v]) 41 envdata.setVar(v, os.environ[v])
42 envdata.setVarFlag(v, 'export', 1) 42 envdata.setVarFlag(v, 'export', '1')
43 43
44 for export in oe.data.typed_value('OE_TERMINAL_EXPORTS', d): 44 for export in oe.data.typed_value('OE_TERMINAL_EXPORTS', d):
45 value = d.getVar(export, True) 45 value = d.getVar(export, True)
46 if value is not None: 46 if value is not None:
47 os.environ[export] = str(value) 47 os.environ[export] = str(value)
48 envdata.setVar(export, str(value)) 48 envdata.setVar(export, str(value))
49 envdata.setVarFlag(export, 'export', 1) 49 envdata.setVarFlag(export, 'export', '1')
50 if export == "PSEUDO_DISABLED": 50 if export == "PSEUDO_DISABLED":
51 if "PSEUDO_UNLOAD" in os.environ: 51 if "PSEUDO_UNLOAD" in os.environ:
52 del os.environ["PSEUDO_UNLOAD"] 52 del os.environ["PSEUDO_UNLOAD"]
@@ -62,7 +62,7 @@ def oe_terminal(command, title, d):
62 if value is not None: 62 if value is not None:
63 os.environ[key] = str(value) 63 os.environ[key] = str(value)
64 envdata.setVar(key, str(value)) 64 envdata.setVar(key, str(value))
65 envdata.setVarFlag(key, 'export', 1) 65 envdata.setVarFlag(key, 'export', '1')
66 66
67 # A complex PS1 might need more escaping of chars. 67 # A complex PS1 might need more escaping of chars.
68 # Lets not export PS1 instead. 68 # Lets not export PS1 instead.