summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaul Wold <Saul.Wold@intel.com>2010-10-08 11:46:10 -0700
committerSaul Wold <Saul.Wold@intel.com>2010-10-08 13:51:44 -0700
commite72e7b2fdc1a628122e7a9ee1e3f2ba4eaf32ba2 (patch)
tree78ece1d25dcb0bac1affca32e426ee6a5bea2e4b
parent0ae7e9e2cbfbc9e1c59e9fcc39f2f1feafc11bcc (diff)
downloadopenembedded-core-e72e7b2fdc1a628122e7a9ee1e3f2ba4eaf32ba2.tar.gz
openembedded-core-e72e7b2fdc1a628122e7a9ee1e3f2ba4eaf32ba2.tar.bz2
openembedded-core-e72e7b2fdc1a628122e7a9ee1e3f2ba4eaf32ba2.tar.xz
openembedded-core-e72e7b2fdc1a628122e7a9ee1e3f2ba4eaf32ba2.zip
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>
-rw-r--r--meta/classes/rootfs_deb.bbclass1
-rw-r--r--meta/recipes-devtools/apt/apt-native_0.7.14.bb2
-rw-r--r--meta/recipes-devtools/apt/files/apt.conf4
3 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index ee7a1a3b5..11a152a69 100644
--- 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 2f04b72ca..83c87c671 100644
--- 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 2bd9ddbfa..5732137cc 100644
--- 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"};
};