helium-3rd-party/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky synced 2026-08-13 02:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

package_deb, apt.conf: fix apt failure in do_rootfs()

Browse Source 
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>
This commit is contained in:
Laurentiu Palcu 2013-09-23 09:31:45 +00:00 committed by Richard Purdie
parent 729033237b
commit cbc12aac86
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta/classes/package_deb.bbclass
View File

@ -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"

2
meta/recipes-devtools/apt/files/apt.conf
View File

@ -21,7 +21,7 @@ Dir "${STAGING_DIR_NATIVE}/"
apt-get "apt-get";
apt-cache "apt-cache";
};
Etc "etc/apt/"
Etc "#APTCONF#"
{
Preferences "preferences";
};