[oe-commits] Richard Purdie : package.bbclass: Fix various problems
git at git.openembedded.org
git at git.openembedded.org
Tue Nov 1 17:50:40 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 6021e309e69d823e1467648aee12a32182945569
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6021e309e69d823e1467648aee12a32182945569
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Tue Nov 1 14:21:11 2011 +0000
package.bbclass: Fix various problems
Before this change:
a) Ownership and permissions of files copied from packages to
package-split could get lost during the copy process. This change
ensures they are preserved.
b) Ownership and permissions of directories could also get lost.
Most of the complexity in this patch is addressing this problem
ensuring newly created directories match the source ones being
copied.
c) There was no warning about directories being created but not
shipped by any package.
This patch fixes all of the above issues.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/package.bbclass | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index a9c510d..0e1d8db 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -916,16 +916,37 @@ python populate_packages () {
if file in seen:
continue
seen.append(file)
+
+ def mkdir(src, dest, p):
+ src = os.path.join(src, p)
+ dest = os.path.join(dest, p)
+ bb.mkdirhier(dest)
+ fstat = os.stat(src)
+ os.chmod(dest, fstat.st_mode)
+ os.chown(dest, fstat.st_uid, fstat.st_gid)
+ if p not in seen:
+ seen.append(p)
+
+ def mkdir_recurse(src, dest, paths):
+ while paths.startswith("./"):
+ paths = paths[2:]
+ p = "."
+ for c in paths.split("/"):
+ p = os.path.join(p, c)
+ if not os.path.exists(os.path.join(dest, p)):
+ mkdir(src, dest, p)
+
if os.path.isdir(file) and not os.path.islink(file):
- bb.mkdirhier(os.path.join(root,file))
- os.chmod(os.path.join(root,file), os.stat(file).st_mode)
+ mkdir_recurse(dvar, root, file)
continue
+ mkdir_recurse(dvar, root, os.path.dirname(file))
fpath = os.path.join(root,file)
- dpath = os.path.dirname(fpath)
- bb.mkdirhier(dpath)
if not os.path.islink(file):
os.link(file, fpath)
+ fstat = os.stat(file)
+ os.chmod(fpath, fstat.st_mode)
+ os.chown(fpath, fstat.st_uid, fstat.st_gid)
continue
ret = bb.copyfile(file, fpath)
if ret is False or ret == 0:
@@ -939,13 +960,13 @@ python populate_packages () {
dir = root[len(dvar):]
if not dir:
dir = os.sep
- for f in files:
+ for f in (files + dirs):
path = os.path.join(dir, f)
if ('.' + path) not in seen:
unshipped.append(path)
if unshipped != []:
- bb.warn("For recipe %s, the following files were installed but not shipped in any package:" % pn)
+ bb.warn("For recipe %s, the following files/directories were installed but not shipped in any package:" % pn)
for f in unshipped:
bb.warn(" " + f)
More information about the Openembedded-commits
mailing list