From bda68e63e2b002069200b8c810225bcba109dce3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 7 May 2013 11:23:40 +0100 Subject: meta: Convert to use python3 octal syntax (From OE-Core rev: 2502a4c65b45d02b606cb790d48b7bcf2e066366) Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 10 +++++----- meta/classes/package_rpm.bbclass | 6 +++--- meta/classes/sanity.bbclass | 4 ++-- meta/classes/sstate.bbclass | 6 +++--- meta/classes/terminal.bbclass | 2 +- meta/lib/oe/patch.py | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index a7ca3a6676..e5c58b1e20 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -453,15 +453,15 @@ python () { # If we're building a target package we need to use fakeroot (pseudo) # in order to capture permissions, owners, groups and special files if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): - d.setVarFlag('do_unpack', 'umask', '022') - d.setVarFlag('do_configure', 'umask', '022') - d.setVarFlag('do_compile', 'umask', '022') + d.setVarFlag('do_unpack', 'umask', '0o022') + d.setVarFlag('do_configure', 'umask', '0o022') + d.setVarFlag('do_compile', 'umask', '0o022') d.appendVarFlag('do_install', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') d.setVarFlag('do_install', 'fakeroot', '1') - d.setVarFlag('do_install', 'umask', '022') + d.setVarFlag('do_install', 'umask', '0o022') d.appendVarFlag('do_package', 'depends', ' virtual/fakeroot-native:do_populate_sysroot') d.setVarFlag('do_package', 'fakeroot', '1') - d.setVarFlag('do_package', 'umask', '022') + d.setVarFlag('do_package', 'umask', '0o022') 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') diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 7d523a16f8..f9398a9522 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -63,7 +63,7 @@ def write_rpm_perfiledata(srcname, d): dump_filerdeps('RDEPENDS', dependsfile, d) dependsfile.close() - os.chmod(outdepends, 0755) + os.chmod(outdepends, 0o755) # OE-core / RPM Provides outprovides = workdir + "/" + srcname + ".provides" @@ -76,7 +76,7 @@ def write_rpm_perfiledata(srcname, d): dump_filerdeps('RPROVIDES', providesfile, d) providesfile.close() - os.chmod(outprovides, 0755) + os.chmod(outprovides, 0o755) return (outdepends, outprovides) @@ -702,7 +702,7 @@ python do_package_rpm () { pkgarch = d.expand('${PACKAGE_ARCH_EXTEND}${HOST_VENDOR}-${HOST_OS}') magicfile = d.expand('${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc') bb.utils.mkdirhier(pkgwritedir) - os.chmod(pkgwritedir, 0755) + os.chmod(pkgwritedir, 0o755) cmd = rpmbuild cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 77813e41bc..27e061d794 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -829,8 +829,8 @@ def check_sanity_everybuild(status, d): check_supported_distro(d) - omask = os.umask(022) - if omask & 0755: + omask = os.umask(0o022) + if omask & 0o755: status.addresult("Please use a umask which allows a+rx and u+rwx\n") os.umask(omask) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 8c623271ad..ab8ca6e215 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -661,9 +661,9 @@ python sstate_task_postfunc () { sstate_install(shared_state, d) for intercept in shared_state['interceptfuncs']: bb.build.exec_func(intercept, d, (d.getVar("WORKDIR", True),)) - omask = os.umask(002) - if omask != 002: - bb.note("Using umask 002 (not %0o) for sstate packaging" % omask) + omask = os.umask(0o002) + if omask != 0o002: + bb.note("Using umask 0o002 (not %0o) for sstate packaging" % omask) sstate_package(shared_state, d) os.umask(omask) } diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass index 9f4c24e906..a94f755a40 100644 --- a/meta/classes/terminal.bbclass +++ b/meta/classes/terminal.bbclass @@ -29,7 +29,7 @@ def emit_terminal_func(command, envdata, d): bb.data.emit_func(cmd_func, script, envdata) script.write(cmd_func) script.write("\n") - os.chmod(runfile, 0755) + os.chmod(runfile, 0o755) return runfile diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 9d36172909..add41045f3 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -672,7 +672,7 @@ class UserResolver(Resolver): f.write("echo 'Run \"quilt refresh\" when patch is corrected, press CTRL+D to exit.'\n") f.write("echo ''\n") f.write(" ".join(patchcmd) + "\n") - os.chmod(rcfile, 0775) + os.chmod(rcfile, 00775) self.terminal("bash --rcfile " + rcfile, 'Patch Rejects: Please fix patch rejects manually', self.patchset.d) -- cgit v1.2.3-54-g00ecf