[oe-commits] Richard Purdie : apt/package_mamager: Ensure WORKDIR is used for lists directory

git at git.openembedded.org git at git.openembedded.org
Thu Mar 27 09:36:06 UTC 2014


Module: openembedded-core.git
Branch: master
Commit: dc4abfc8f99c08e0c1ac9d098ce17838d0eda028
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=dc4abfc8f99c08e0c1ac9d098ce17838d0eda028

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Wed Mar 26 11:41:31 2014 +0000

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 at linuxfoundation.org>

---

 meta/lib/oe/package_manager.py           | 2 ++
 meta/recipes-devtools/apt/files/apt.conf | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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



More information about the Openembedded-commits mailing list