aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-26 11:41:31 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-26 12:15:12 +0000
commitdc4abfc8f99c08e0c1ac9d098ce17838d0eda028 (patch)
treef90e0f739b81ea1d3ab16bd363c542a18da0817d
parenta3965b76ed4361455c89c982761263be03e1a8e5 (diff)
downloadopenembedded-core-contrib-dc4abfc8f99c08e0c1ac9d098ce17838d0eda028.tar.gz
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>
-rw-r--r--meta/lib/oe/package_manager.py2
-rw-r--r--meta/recipes-devtools/apt/files/apt.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 824af00f54..764ab72d2c 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 50586501b0..03351356bc 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/"