Patchwork apt/package_mamager: Ensure WORKDIR is used for lists directory

login
register
mail settings
Submitter Richard Purdie
Date March 26, 2014, 11:41 a.m.
Message ID <1395834091.24890.88.camel@ted>
Download mbox | patch
Permalink /patch/69261/
State Accepted
Commit 68f3a571f422170ef0fcef0243cdb6fadc11fade
Headers show

Comments

Richard Purdie - March 26, 2014, 11:41 a.m.
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>
---

Patch

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 824af00..764ab72 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 5058650..0335135 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/"