summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorLynn Lin <Lin_Lynn@emc.com>2009-06-21 18:15:06 +0800
committerTom Rini <trini@embeddedalley.com>2009-06-21 14:55:19 -0400
commitb9ec2bc1ec50b54fc993bbb9da81c71683f1041d (patch)
treed1610a4912dc6cc7b429566f3bb83063326fe306 /classes
parent3248071e9bd204789ccb374bf6db877ebb2f2b24 (diff)
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@embeddedaley.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/rootfs_deb.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass
index 82220661f3..dc2b2cb02c 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"