summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-08-18 07:58:39 +0000
committerRichard Purdie <richard@openedhand.com>2008-08-18 07:58:39 +0000
commitc87b3a87aa143eb2166da910b8553742617339a9 (patch)
treef0ff04c929c884f43583ebe42ee7a8c0870793be /meta/classes
parent5ca566349c46362be64fc6a88ed88ad3ad601069 (diff)
downloadpoky-c87b3a87aa143eb2166da910b8553742617339a9.tar.gz
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
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package_deb.bbclass12
-rw-r--r--meta/classes/package_ipk.bbclass11
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 () {
247 bb.utils.unlockfile(lf) 247 bb.utils.unlockfile(lf)
248 raise bb.build.FuncFailed("dpkg-deb execution failed") 248 raise bb.build.FuncFailed("dpkg-deb execution failed")
249 249
250 for script in ["preinst", "postinst", "prerm", "postrm", "control" ]: 250 bb.utils.prunedir(controldir)
251 scriptfile = os.path.join(controldir, script)
252 try:
253 os.remove(scriptfile)
254 except OSError:
255 pass
256 try:
257 os.rmdir(controldir)
258 except OSError:
259 pass
260
261 bb.utils.unlockfile(lf) 251 bb.utils.unlockfile(lf)
262} 252}
263 253
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 () {
285 bb.utils.unlockfile(lf) 285 bb.utils.unlockfile(lf)
286 raise bb.build.FuncFailed("opkg-build execution failed") 286 raise bb.build.FuncFailed("opkg-build execution failed")
287 287
288 for script in ["preinst", "postinst", "prerm", "postrm", "control" ]: 288 bb.utils.prunedir(controldir)
289 scriptfile = os.path.join(controldir, script)
290 try:
291 os.remove(scriptfile)
292 except OSError:
293 pass
294 try:
295 os.rmdir(controldir)
296 except OSError:
297 pass
298 bb.utils.unlockfile(lf) 289 bb.utils.unlockfile(lf)
299} 290}
300 291