Sync up.. all the deb/dpkg changes which I have locally are now in svn.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@728 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 4 insertions, 3 deletions

diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 8f9fddde14..e494666068 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -36,7 +36,7 @@ real_do_rootfs () {
         fi
         mkdir -p ${T}
         echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
-        ipkgarchs="${IPKG_ARCHS}"
+        ipkgarchs="${PACKAGE_ARCHS}"
         priority=1
         for arch in $ipkgarchs; do
                 echo "arch $arch $priority" >> ${T}/ipkg.conf
@@ -49,11 +49,12 @@ real_do_rootfs () {
                         ipkg-cl ${IPKG_ARGS} install $i
                 done
         fi
-        if [ ! -z "${IPKG_INSTALL}" ]; then
-                ipkg-cl ${IPKG_ARGS} install ${IPKG_INSTALL}
+        if [ ! -z "${PACKAGE_INSTALL}" ]; then
+                ipkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL}
         fi
 
         export D=${IMAGE_ROOTFS}
+        export OFFLINE_ROOT=${IMAGE_ROOTFS}
         export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
         mkdir -p ${IMAGE_ROOTFS}/etc/ipkg/
         grep "^arch" ${T}/ipkg.conf >${IMAGE_ROOTFS}/etc/ipkg/arch.conf