[oe-commits] Laurentiu Palcu : package_deb, apt.conf: fix apt failure in do_rootfs()

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 65a2a1e1d0b0e3dcc34d47f46185f24d753b53dd
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=65a2a1e1d0b0e3dcc34d47f46185f24d753b53dd

Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date:   Mon Sep 23 09:31:45 2013 +0000

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]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/package_deb.bbclass         |    1 +
 meta/recipes-devtools/apt/files/apt.conf |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 765e894..6a8e080 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -100,6 +100,7 @@ package_install_internal_deb () {
 	cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
 		| sed -e "s#Architecture \".*\";#Architecture \"${dpkg_arch}\";#" \
 		| sed -e "s:#ROOTFS#:${target_rootfs}:g" \
+		| sed -e "s:#APTCONF#:${APTCONF_TARGET}/apt:g" \
 		> "${APTCONF_TARGET}/apt/apt.conf"
 
 	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 5c20ea4..5058650 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}/"
       apt-get "apt-get";
       apt-cache "apt-cache";
    };
-   Etc "etc/apt/"
+   Etc "#APTCONF#"
    {
       Preferences "preferences";
    };