package_ipk/package_deb.bbclass: Make sure control files are properly removed fixing problems with files leaking into packages. Use core bitbake function for directory pruning

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5066 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 2 insertions, 21 deletions

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 8f5fedada7..28e67fcc9b 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -247,17 +247,7 @@ python do_package_deb () {
             bb.utils.unlockfile(lf)
             raise bb.build.FuncFailed("dpkg-deb execution failed")
 
-        for script in ["preinst", "postinst", "prerm", "postrm", "control" ]:
-            scriptfile = os.path.join(controldir, script)
-            try:
-                os.remove(scriptfile)
-            except OSError:
-                pass
-        try:
-            os.rmdir(controldir)
-        except OSError:
-            pass
-
+        bb.utils.prunedir(controldir)
         bb.utils.unlockfile(lf)
 }
 
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 790bba0fd0..b4308d55a6 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -285,16 +285,7 @@ python do_package_ipk () {
                         bb.utils.unlockfile(lf)
                         raise bb.build.FuncFailed("opkg-build execution failed")
 
-                for script in ["preinst", "postinst", "prerm", "postrm", "control" ]:
-                        scriptfile = os.path.join(controldir, script)
-                        try:
-                                os.remove(scriptfile)
-                        except OSError:
-                                pass
-                try:
-                        os.rmdir(controldir)
-                except OSError:
-                        pass
+                bb.utils.prunedir(controldir)
                 bb.utils.unlockfile(lf)
 }