[oe-commits] Lynn Lin : rootfs_deb: Update IMAGE_ROOTFS variable usage to be consistent

[git version control]

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

Author: Lynn Lin <Lin_Lynn at emc.com>
Date:   Sun Jun 21 18:15:06 2009 +0800

rootfs_deb: Update IMAGE_ROOTFS variable usage to be consistent

update IMAGE_ROOTFS variable to fix inconsistent use of IMAGE_ROOTFS variable
content in by apt-native after the changes introducd in
2343808f7386cbd4c7b43f1b24e65e173f5ddf15.  This commit changed IMAGE_ROOTFS
from "${TMPDIR}/rootfs" to "${TMPDIR}/rootfs/${PN}" and that caused
IMAGE_ROOTFS to expand to ${TMPDIR}/rootfs/apt-native in apt.conf.sample,
however rootfs_deb.class uses apt.conf.sample to generate apt-rootfs.conf and
here here IMAGE_ROOTFS is different from that in apt-native package.

Acked-by: Tom Rini <trini at embeddedaley.com>

---

 classes/rootfs_deb.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 8222066..dc2b2cb 100644
--- a/classes/rootfs_deb.bbclass
+++ b/classes/rootfs_deb.bbclass
@@ -44,6 +44,8 @@ fakeroot rootfs_deb_do_rootfs () {
 
 	cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
 		| sed -e 's#Architecture ".*";#Architecture "${DPKG_ARCH}";#' \
+	        | sed -e 's#status ".*";#status "${IMAGE_ROOTFS}/var/dpkg/status";#' \ 
+		| sed -e 's#DPkg::Options {".*"};#DPkg::Options {"--root=${IMAGE_ROOTFS}";"--admindir=${IMAGE_ROOTFS}/var/dpkg";"--force-all";"--no-debsig"};#' \
 		> "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"
 
 	export APT_CONFIG="${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"