diff options
-rw-r--r-- | meta/classes/rootfs_deb.bbclass | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/apt-native_0.7.14.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/apt/files/apt.conf | 4 |
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 @@ | |||
1 | require apt-native.inc | 1 | require apt-native.inc |
2 | 2 | ||
3 | PR = "r3" | 3 | PR = "r4" |
4 | 4 | ||
5 | SRC_URI += "file://nodoc.patch \ | 5 | SRC_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 | ||
42 | DPkg::Options {"--root=${IMAGE_ROOTFS}";"--admindir=${IMAGE_ROOTFS}/var/dpkg";"--force-all";"--no-debsig"}; | 42 | DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/dpkg";"--force-all";"--no-debsig"}; |
43 | }; | 43 | }; |