diff options
| -rw-r--r-- | meta/classes/package_deb.bbclass | 12 | ||||
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 11 |
2 files changed, 2 insertions, 21 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 8f5fedada..28e67fcc9 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 790bba0fd..b4308d55a 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) } |