[PATCH 0/1] package_deb, apt.conf: fix apt failure in do_rootfs()

[PATCH 0/1] package_deb, apt.conf: fix apt failure in do_rootfs()

[Laurentiu Palcu]

Tested by building and booting a core-image-minimal and a core-image-sato using
deb as package manager.

Thanks,
Laurentiu

The following changes since commit bf6b0d95db3863a2cfbccb154c0c7ad5b3bbf0b0:

  glib-2.0: fix broken python script header on machines using buildtools (2013-09-22 12:23:35 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib lpalcu/b5241_package_deb_fails
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=lpalcu/b5241_package_deb_fails

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

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

-- 
1.7.9.5

[PATCH 1/1] package_deb, apt.conf: fix apt failure in do_rootfs()

[Laurentiu Palcu]

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>
---
 meta/classes/package_deb.bbclass         |    1 +
 meta/recipes-devtools/apt/files/apt.conf |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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";
    };
-- 
1.7.9.5