[oe-commits] Richard Purdie : package.bbclass: Simplify empty directory removal
git at git.openembedded.org
git at git.openembedded.org
Mon Feb 4 11:38:22 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 625020da3d68407a9ad2b9436377c6b060cb5585
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=625020da3d68407a9ad2b9436377c6b060cb5585
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Sun Feb 3 17:29:04 2013 +0000
package.bbclass: Simplify empty directory removal
Rather than an exec() per directory, we might as well exec one command and
be done with it.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/package.bbclass | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 6ca2aa3..80f25fd 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -298,11 +298,7 @@ def copydebugsources(debugsrcdir, d):
subprocess.call(processdebugsrc % (sourcefile, workbasedir, workparentdir, dvar, debugsrcdir), shell=True)
# The copy by cpio may have resulted in some empty directories! Remove these
- for root, dirs, files in os.walk("%s%s" % (dvar, debugsrcdir)):
- for d in dirs:
- dir = os.path.join(root, d)
- #bb.note("rmdir -p %s" % dir)
- subprocess.call("rmdir -p %s 2>/dev/null" % dir, shell=True)
+ subprocess.call("find %s%s -empty -type d -delete" % (dvar, debugsrcdir), shell=True)
# Also remove debugsrcdir if its empty
for p in nosuchdir[::-1]:
More information about the Openembedded-commits
mailing list