summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/package_deb.bbclass1
-rw-r--r--meta/recipes-devtools/apt/files/apt.conf2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 765e894526..6a8e080138 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -100,6 +100,7 @@ package_install_internal_deb () {
100 cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \ 100 cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
101 | sed -e "s#Architecture \".*\";#Architecture \"${dpkg_arch}\";#" \ 101 | sed -e "s#Architecture \".*\";#Architecture \"${dpkg_arch}\";#" \
102 | sed -e "s:#ROOTFS#:${target_rootfs}:g" \ 102 | sed -e "s:#ROOTFS#:${target_rootfs}:g" \
103 | sed -e "s:#APTCONF#:${APTCONF_TARGET}/apt:g" \
103 > "${APTCONF_TARGET}/apt/apt.conf" 104 > "${APTCONF_TARGET}/apt/apt.conf"
104 105
105 export APT_CONFIG="${APTCONF_TARGET}/apt/apt.conf" 106 export APT_CONFIG="${APTCONF_TARGET}/apt/apt.conf"
diff --git a/meta/recipes-devtools/apt/files/apt.conf b/meta/recipes-devtools/apt/files/apt.conf
index 5c20ea43e6..50586501b0 100644
--- a/meta/recipes-devtools/apt/files/apt.conf
+++ b/meta/recipes-devtools/apt/files/apt.conf
@@ -21,7 +21,7 @@ Dir "${STAGING_DIR_NATIVE}/"
21 apt-get "apt-get"; 21 apt-get "apt-get";
22 apt-cache "apt-cache"; 22 apt-cache "apt-cache";
23 }; 23 };
24 Etc "etc/apt/" 24 Etc "#APTCONF#"
25 { 25 {
26 Preferences "preferences"; 26 Preferences "preferences";
27 }; 27 };