summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2009-03-04 14:12:23 +0100
committerMarcin Juszkiewicz <hrw@openembedded.org>2009-03-04 14:12:59 +0100
commit5bfe29a25496da5ea5ebc9b0314f4d38a53e6691 (patch)
tree2c16b4f967b218bc572dd94df8c926c2a4837878
parent85d81cd7213618916df6c442c555db1ce23537aa (diff)
package_ipk.bbclass: use bb.utils.prunedir to remove CONTROL directory
It was removing file by file before and did not removed conffiles file. As a result package_rpm was not able to create package.
-rw-r--r--classes/package_ipk.bbclass11
1 files changed, 1 insertions, 10 deletions
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 89d5071c09..d4cb3b62e2 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -297,16 +297,7 @@ python do_package_ipk () {
bb.utils.unlockfile(lf)
raise bb.build.FuncFailed("ipkg-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)
}