classes: Ensure pass setVar/setVarFlag strings, not integers
PATCH 1/1 classes: Ensure pass setVar/setVarFlag strings, not integers
This doesn't cause any issues right now but it make sense to standardise on consistently using strings in the data store.
Signed-off-by Richard Purdie <[email protected]>
--- meta/classes/base.bbclass | 8 ++++---- meta/classes/package_rpm.bbclass | 2 +- meta/classes/ptest.bbclass | 2 +- meta/classes/terminal.bbclass | 8 ++++---- meta/lib/oe/image.py | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-)
meta/classes/base.bbclass +4 -4
@@ -431,14 +431,14 @@ python () { d.setVarFlag('do_configure', 'umask', '022') d.setVarFlag('do_compile', 'umask', '022') d.appendVarFlag('do_install', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') - d.setVarFlag('do_install', 'fakeroot', 1) + d.setVarFlag('do_install', 'fakeroot', '1') d.setVarFlag('do_install', 'umask', '022') d.appendVarFlag('do_package', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') - d.setVarFlag('do_package', 'fakeroot', 1) + d.setVarFlag('do_package', 'fakeroot', '1') d.setVarFlag('do_package', 'umask', '022') - d.setVarFlag('do_package_setscene', 'fakeroot', 1) + d.setVarFlag('do_package_setscene', 'fakeroot', '1') d.appendVarFlag('do_package_setscene', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') - d.setVarFlag('do_devshell', 'fakeroot', 1) + d.setVarFlag('do_devshell', 'fakeroot', '1') d.appendVarFlag('do_devshell', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') source_mirror_fetch = d.getVar('SOURCE_MIRROR_FETCH', 0) if not source_mirror_fetch:
meta/classes/package_rpm.bbclass +1 -1
@@ -743,7 +743,7 @@ python () { if d.getVar('PACKAGES', True) != '': deps = ' rpm-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot' d.appendVarFlag('do_package_write_rpm', 'depends', deps) - d.setVarFlag('do_package_write_rpm', 'fakeroot', 1) + d.setVarFlag('do_package_write_rpm', 'fakeroot', '1') } SSTATETASKS += "do_package_write_rpm"
meta/classes/ptest.bbclass +1 -1
@@ -58,7 +58,7 @@ addtask install_ptest_base after do_install before do_package do_populate_sy python () { if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): - d.setVarFlag('do_install_ptest_base', 'fakeroot', 1) + d.setVarFlag('do_install_ptest_base', 'fakeroot', '1') # Remove all '*ptest_base' tasks when ptest is not enabled if not(d.getVar('PTEST_ENABLED', True) == "1"):
meta/classes/terminal.bbclass +4 -4
@@ -15,7 +15,7 @@ def emit_terminal_func(command, envdata, d): cmd_func = 'do_terminal' envdata.setVar(cmd_func, 'exec ' + command) - envdata.setVarFlag(cmd_func, 'func', 1) + envdata.setVarFlag(cmd_func, 'func', '1') runfmt = d.getVar('BB_RUNFMT', True) or "run.{func}.{pid}" 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): for v in os.environ: envdata.setVar(v, os.environ[v]) - envdata.setVarFlag(v, 'export', 1) + envdata.setVarFlag(v, 'export', '1') for export in oe.data.typed_value('OE_TERMINAL_EXPORTS', d): value = d.getVar(export, True) if value is not None: os.environ[export] = str(value) envdata.setVar(export, str(value)) - envdata.setVarFlag(export, 'export', 1) + envdata.setVarFlag(export, 'export', '1') if export == "PSEUDO_DISABLED": if "PSEUDO_UNLOAD" in os.environ: del os.environ["PSEUDO_UNLOAD"]
@@ -62,7 +62,7 @@ def oe_terminal(command, title, d): if value is not None: os.environ[key] = str(value) envdata.setVar(key, str(value)) - envdata.setVarFlag(key, 'export', 1) + envdata.setVarFlag(key, 'export', '1') # A complex PS1 might need more escaping of chars. # Lets not export PS1 instead.
meta/lib/oe/image.py +2 -2
@@ -272,8 +272,8 @@ class Image(ImageDepGraph): rootfs_size = self._get_rootfs_size() self.d.setVar('img_creation_func', '\n'.join(cmds)) - self.d.setVarFlag('img_creation_func', 'func', 1) - self.d.setVarFlag('img_creation_func', 'fakeroot', 1) + self.d.setVarFlag('img_creation_func', 'func', '1') + self.d.setVarFlag('img_creation_func', 'fakeroot', '1') self.d.setVar('ROOTFS_SIZE', str(rootfs_size)) with open(script_name, "w+") as script: