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
This commit is contained in:
Richard Purdie 2008-08-18 07:58:39 +00:00
parent 5ca566349c
commit c87b3a87aa
2 changed files with 2 additions and 21 deletions

View File

@ -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)
}

View File

@ -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)
}