summaryrefslogtreecommitdiffstats
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)
downloadpoky-e72e7b2fdc1a628122e7a9ee1e3f2ba4eaf32ba2.tar.gz
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 ee7a1a3b59..11a152a69a 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -45,6 +45,7 @@ fakeroot rootfs_deb_do_rootfs () {
45 45
46 cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \ 46 cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
47 | sed -e 's#Architecture ".*";#Architecture "${DPKG_ARCH}";#' \ 47 | sed -e 's#Architecture ".*";#Architecture "${DPKG_ARCH}";#' \
48 | sed -e 's:#ROOTFS#:${IMAGE_ROOTFS}:g' \
48 > "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf" 49 > "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf"
49 50
50 export APT_CONFIG="${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf" 51 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 2f04b72cab..83c87c6717 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 @@
1require apt-native.inc 1require apt-native.inc
2 2
3PR = "r3" 3PR = "r4"
4 4
5SRC_URI += "file://nodoc.patch \ 5SRC_URI += "file://nodoc.patch \
6 file://noconfigure.patch \ 6 file://noconfigure.patch \
diff --git a/meta/recipes-devtools/apt/files/apt.conf b/meta/recipes-devtools/apt/files/apt.conf
index 2bd9ddbfaf..5732137ccb 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}/"
3 State "var/lib/apt/" 3 State "var/lib/apt/"
4 { 4 {
5 Lists "lists/"; 5 Lists "lists/";
6 status "${IMAGE_ROOTFS}/var/dpkg/status"; 6 status "#ROOTFS#/var/dpkg/status";
7 }; 7 };
8 Cache "var/cache/apt/" 8 Cache "var/cache/apt/"
9 { 9 {
@@ -39,5 +39,5 @@ APT
39 }; 39 };
40}; 40};
41 41
42DPkg::Options {"--root=${IMAGE_ROOTFS}";"--admindir=${IMAGE_ROOTFS}/var/dpkg";"--force-all";"--no-debsig"}; 42DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/dpkg";"--force-all";"--no-debsig"};
43}; 43};