summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-09-23 09:31:45 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-24 17:24:14 +0100
commitcbc12aac86b882b4cdbb9d291d3c525f1d6e76d3 (patch)
tree6ad1e51ba491a0042fd5d6bca46d63da4f39c3b6
parent729033237b0a2e08c9b886490f2f3cdf24bada9e (diff)
downloadpoky-cbc12aac86b882b4cdbb9d291d3c525f1d6e76d3.tar.gz
package_deb, apt.conf: fix apt failure in do_rootfs()
The changes in this commit, dc5f6c3898555b59f16bf809ae4c5418656e6ac9, moved apt config directory from native SYSROOT to WORKDIR. Unfortunately, Dir::Etc in apt.conf was not changed accordingly and sources.list file could not be found during do_rootfs(). This commit fixes this issue. [YOCTO #5241] (From OE-Core rev: 65a2a1e1d0b0e3dcc34d47f46185f24d753b53dd) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 };