rootfs_deb: Fix problem with pseduo and rootfs location

This address [BUGID #401] to complete dpkg rootfs support

Signed-off-by: Saul Wold <Saul.Wold@intel.com>

diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index ee7a1a3b59a7f497ee7c9c823a35b36ae77027c7..11a152a69ae86722fd19d21e429e97790fceb6cf 100644 (file)
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -45,6 +45,7 @@ fakeroot rootfs_deb_do_rootfs () {
 
        cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
                | sed -e 's#Architecture ".*";#Architecture "${DPKG_ARCH}";#' \
+               | sed -e 's:#ROOTFS#:${IMAGE_ROOTFS}:g' \
                > "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"
 
        export APT_CONFIG="${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"

diff --git a/meta/recipes-devtools/apt/apt-native_0.7.14.bb b/meta/recipes-devtools/apt/apt-native_0.7.14.bb
index 2f04b72cabcba0c12aacd062b0b69439289a324e..83c87c67171d55d5701792b3621d0594d3f5cc01 100644 (file)
--- a/meta/recipes-devtools/apt/apt-native_0.7.14.bb
+++ b/meta/recipes-devtools/apt/apt-native_0.7.14.bb
@@ -1,6 +1,6 @@
 require apt-native.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://nodoc.patch \
             file://noconfigure.patch \

diff --git a/meta/recipes-devtools/apt/files/apt.conf b/meta/recipes-devtools/apt/files/apt.conf
index 2bd9ddbfaf96eae397361985e324777f4ad41404..5732137ccb15e419f89bfe0ca169cdb7ed2c2ffd 100644 (file)
--- a/meta/recipes-devtools/apt/files/apt.conf
+++ b/meta/recipes-devtools/apt/files/apt.conf
@@ -3,7 +3,7 @@ Dir "${STAGING_DIR_NATIVE}/"
    State "var/lib/apt/"
    {
       Lists "lists/";
-      status "${IMAGE_ROOTFS}/var/dpkg/status";
+      status "#ROOTFS#/var/dpkg/status";
    };
    Cache "var/cache/apt/"
    {
@@ -39,5 +39,5 @@ APT
   };
 };
 
-DPkg::Options {"--root=${IMAGE_ROOTFS}";"--admindir=${IMAGE_ROOTFS}/var/dpkg";"--force-all";"--no-debsig"};
+DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/dpkg";"--force-all";"--no-debsig"};
 };