summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_rpm.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-07 11:23:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-02 08:24:00 +0100
commit297438e965053b2eb56cc8ef3e59465642f10a24 (patch)
tree74bd5fc54674b8cce870b35bd9e22d93eb00dcb6 /meta/classes/package_rpm.bbclass
parentc77e7b86aa732e9acfa6409108756be38a3ca3ae (diff)
downloadpoky-297438e965053b2eb56cc8ef3e59465642f10a24.tar.gz
classes/lib: Convert to use python3 octal syntax
The syntax for octal values changed in python3, adapt to it. (From OE-Core rev: 737a095fcde773a36e0fee1f27b74aaa88062386) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r--meta/classes/package_rpm.bbclass6
1 files changed, 3 insertions, 3 deletions
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):
63 dump_filerdeps('RDEPENDS', dependsfile, d) 63 dump_filerdeps('RDEPENDS', dependsfile, d)
64 64
65 dependsfile.close() 65 dependsfile.close()
66 os.chmod(outdepends, 0755) 66 os.chmod(outdepends, 0o755)
67 67
68 # OE-core / RPM Provides 68 # OE-core / RPM Provides
69 outprovides = workdir + "/" + srcname + ".provides" 69 outprovides = workdir + "/" + srcname + ".provides"
@@ -76,7 +76,7 @@ def write_rpm_perfiledata(srcname, d):
76 dump_filerdeps('RPROVIDES', providesfile, d) 76 dump_filerdeps('RPROVIDES', providesfile, d)
77 77
78 providesfile.close() 78 providesfile.close()
79 os.chmod(outprovides, 0755) 79 os.chmod(outprovides, 0o755)
80 80
81 return (outdepends, outprovides) 81 return (outdepends, outprovides)
82 82
@@ -702,7 +702,7 @@ python do_package_rpm () {
702 pkgarch = d.expand('${PACKAGE_ARCH_EXTEND}${HOST_VENDOR}-${HOST_OS}') 702 pkgarch = d.expand('${PACKAGE_ARCH_EXTEND}${HOST_VENDOR}-${HOST_OS}')
703 magicfile = d.expand('${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc') 703 magicfile = d.expand('${STAGING_DIR_NATIVE}${datadir_native}/misc/magic.mgc')
704 bb.utils.mkdirhier(pkgwritedir) 704 bb.utils.mkdirhier(pkgwritedir)
705 os.chmod(pkgwritedir, 0755) 705 os.chmod(pkgwritedir, 0o755)
706 706
707 cmd = rpmbuild 707 cmd = rpmbuild
708 cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd 708 cmd = cmd + " --nodeps --short-circuit --target " + pkgarch + " --buildroot " + pkgd