From: Graham Gower <graham.gower@gmail.com>
Date: Mon, 16 Aug 2010 14:17:55 +0000 (+0000)
Subject: rootfs_ipk.bbclass: remove host's lists in /var/lib/opkg/*
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6888e89305fb9624dbb179e8f2f058890f0db38;p=openembedded.git

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

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

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index db04fb6bfc..915e3d74cf 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}
 }