package_deb, apt.conf: fix apt failure in do_rootfs()
The changes in this commit, dc5f6c3898
,
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:
parent
729033237b
commit
cbc12aac86
|
@ -100,6 +100,7 @@ package_install_internal_deb () {
|
||||||
cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
|
cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \
|
||||||
| sed -e "s#Architecture \".*\";#Architecture \"${dpkg_arch}\";#" \
|
| sed -e "s#Architecture \".*\";#Architecture \"${dpkg_arch}\";#" \
|
||||||
| sed -e "s:#ROOTFS#:${target_rootfs}:g" \
|
| sed -e "s:#ROOTFS#:${target_rootfs}:g" \
|
||||||
|
| sed -e "s:#APTCONF#:${APTCONF_TARGET}/apt:g" \
|
||||||
> "${APTCONF_TARGET}/apt/apt.conf"
|
> "${APTCONF_TARGET}/apt/apt.conf"
|
||||||
|
|
||||||
export APT_CONFIG="${APTCONF_TARGET}/apt/apt.conf"
|
export APT_CONFIG="${APTCONF_TARGET}/apt/apt.conf"
|
||||||
|
|
|
@ -21,7 +21,7 @@ Dir "${STAGING_DIR_NATIVE}/"
|
||||||
apt-get "apt-get";
|
apt-get "apt-get";
|
||||||
apt-cache "apt-cache";
|
apt-cache "apt-cache";
|
||||||
};
|
};
|
||||||
Etc "etc/apt/"
|
Etc "#APTCONF#"
|
||||||
{
|
{
|
||||||
Preferences "preferences";
|
Preferences "preferences";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue