1 files changed, 11 insertions, 0 deletions

diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index edd84fb40d..3b4b4da43d 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -82,6 +82,17 @@ fakeroot rootfs_ipk_do_rootfs () {
         
         rm -f ${IMAGE_ROOTFS}${opkglibdir}/lists/*
 
+        if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then
+                if [ $runtime_script_required -eq 0 ]; then
+                        # All packages were successfully configured.
+                        # update-rc.d, base-passwd are no further use, remove them now
+                        opkg-cl ${IPKG_ARGS} --force-depends remove update-rc.d base-passwd || true
+
+                        # Also delete the status files
+                        rm -rf ${IMAGE_ROOTFS}${opkglibdir}
+                fi
+        fi
+
         log_check rootfs        
 }