Patchwork package.bbclass: Clear umask when using os.mkdir

login
register
mail settings
Submitter Richard Purdie
Date Sept. 25, 2013, 12:36 p.m.
Message ID <1380112606.18603.332.camel@ted>
Download mbox | patch
Permalink /patch/58975/
State Accepted
Commit 2f8ce2c784ddf3f74e8ae68e594f750a47ccc3a9
Headers show

Comments

Richard Purdie - Sept. 25, 2013, 12:36 p.m.
We switched to using os.mkdir with the file creation mode specified as the
second parameter. Python masks this with umask behind the scenes which isn't
what we want, we really want the permissions we specify.

To avoid this we zero the umask beforehand and restore afterwards. Other
solutions are possible but would not perform as well which is why
we're using os.mkdir in the first place.

Martin Jansa deserves the credit for debugging where the problem was.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index fbb6839..c98c6ec 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -953,6 +953,9 @@  python populate_packages () {
 
     seen = []
 
+    # os.mkdir masks the permissions with umask so we have to unset it first
+    oldumask = os.umask(0)
+
     for pkg in package_list:
         root = os.path.join(pkgdest, pkg)
         bb.utils.mkdirhier(root)
@@ -1025,6 +1028,7 @@  python populate_packages () {
             if ret is False or ret == 0:
                 raise bb.build.FuncFailed("File population failed")
 
+    os.umask(oldumask)
     os.chdir(workdir)
 
     unshipped = []