diff options
| author |   Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-09-23 09:31:45 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-24 11:55:56 +0100 |
| commit | 65a2a1e1d0b0e3dcc34d47f46185f24d753b53dd (patch) | |
| tree | 33cf67939495fe055713e673f857eb24a2200ed2 | |
| parent | daa56093de3a518b79480c90ec5124a79189bf7b (diff) | |
| download | openembedded-core-65a2a1e1d0b0e3dcc34d47f46185f24d753b53dd.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]
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.bbclass | 1 | ||||
| -rw-r--r-- | 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 765e894526..6a8e080138 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 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}/" apt-get "apt-get"; apt-cache "apt-cache"; }; - Etc "etc/apt/" + Etc "#APTCONF#" { Preferences "preferences"; }; |