From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 26 Mar 2014 11:41:31 +0000 (+0000)
Subject: apt/package_mamager: Ensure WORKDIR is used for lists directory
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~34070
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc4abfc8f99c08e0c1ac9d098ce17838d0eda028;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

apt/package_mamager: Ensure WORKDIR is used for lists directory

The native sysroot should not be used as a store for the lists files since
multiple images running at once would conflict over this. Instead redirect
this to WORKDIR. This means some extra directories need to be created.

Also create apt.conf.d to silence some warnings.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 824af00f545..764ab72d2c5 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -1624,6 +1624,8 @@ class DpkgPM(PackageManager):
             bb.utils.remove(self.apt_conf_dir, True)
 
         bb.utils.mkdirhier(self.apt_conf_dir)
+        bb.utils.mkdirhier(self.apt_conf_dir + "/lists/partial/")
+        bb.utils.mkdirhier(self.apt_conf_dir + "/apt.conf.d/")
 
         arch_list = []
         for arch in archs.split():
diff --git a/meta/recipes-devtools/apt/files/apt.conf b/meta/recipes-devtools/apt/files/apt.conf
index 50586501b06..03351356bc0 100644
--- a/meta/recipes-devtools/apt/files/apt.conf
+++ b/meta/recipes-devtools/apt/files/apt.conf
@@ -2,7 +2,7 @@ Dir "${STAGING_DIR_NATIVE}/"
 {
    State "var/lib/apt/"
    {
-      Lists "lists/";
+      Lists "#APTCONF#/lists/";
       status "#ROOTFS#/var/lib/dpkg/status";
    };
    Cache "var/cache/apt/"