[oe-commits] Graham Gower : rootfs_ipk.bbclass: remove host's lists in /var/lib/opkg/*

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: a6888e89305fb9624dbb179e8f2f058890f0db38
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a6888e89305fb9624dbb179e8f2f058890f0db38

Author: Graham Gower <graham.gower at gmail.com>
Date:   Mon Aug 16 14:17:55 2010 +0000

rootfs_ipk.bbclass: remove host's lists in /var/lib/opkg/*

Signed-off-by: Graham Gower <graham.gower at gmail.com>
Acked-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 classes/rootfs_ipk.bbclass |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index db04fb6..915e3d7 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -98,15 +98,19 @@ fakeroot rootfs_ipk_do_rootfs () {
 		else
 			rm -f ${IMAGE_ROOTFS}${libdir}/opkg/lists/*
 		fi
-	
+
+		# Remove lists, but leave SHR's tmp dir if it exists.
+		rm -f ${IMAGE_ROOTFS}/var/lib/opkg/* || true
+
 		# Keep these lines until package manager selection is implemented
 		ln -s opkg ${IMAGE_ROOTFS}${sysconfdir}/ipkg
 		ln -s opkg ${IMAGE_ROOTFS}${libdir}/ipkg
 	else
 		rm -rf ${IMAGE_ROOTFS}${libdir}/opkg
 		rm -rf ${IMAGE_ROOTFS}/usr/lib/opkg
+		rm -rf ${IMAGE_ROOTFS}/var/lib/opkg
 	fi
-	
+
 	log_check rootfs 	
 	rm -rf ${IPKG_TMP_DIR}
 }