Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

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