From 8d49338516b8316d6fbfed7d298423097c667a5d Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Sun, 22 Sep 2013 09:34:18 +0000 Subject: [PATCH] image.bbclass: uninstall package only if it's already installed Remove a package from rootfs only if it's already installed. Also, if a package is uninstalled, remove it from installed_pkgs.txt. [YOCTO #5169] (From OE-Core rev: b86dc63bc87763119fce8286f37f44361da824d0) Signed-off-by: Chen Qi Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 246a4db..7650594 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -513,7 +513,17 @@ rootfs_uninstall_unneeded () { if [ -e ${IMAGE_ROOTFS}${sysconfdir}/init.d/run-postinsts ]; then remove_run_postinsts=true fi - rootfs_uninstall_packages update-rc.d base-passwd ${ROOTFS_BOOTSTRAP_INSTALL} + + # Remove package only if it's installed + pkgs_to_remove="update-rc.d base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}" + for pkg in $pkgs_to_remove; do + # regexp for pkg, to be used in grep and sed + pkg_regexp="^`echo $pkg | sed 's/\./\\\./'` " + if grep -q "$pkg_regexp" ${WORKDIR}/installed_pkgs.txt; then + rootfs_uninstall_packages $pkg + sed -i "/$pkg_regexp/d" ${WORKDIR}/installed_pkgs.txt + fi + done # Need to remove rc.d files for run-postinsts by hand since opkg won't # call postrm scripts in offline root mode. -- 2.7.4