From: Laurentiu Palcu <laurentiu.palcu@intel.com>
Date: Mon, 23 Sep 2013 09:31:45 +0000 (+0000)
Subject: package_deb, apt.conf: fix apt failure in do_rootfs()
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~35918
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65a2a1e1d0b0e3dcc34d47f46185f24d753b53dd;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 765e8945265..6a8e080138b 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 5c20ea43e62..50586501b06 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";
    };