summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-01-29 10:22:14 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-03 14:53:42 +0000
commitd140d556ae30b6dbd0ffce8882c3e22b17050820 (patch)
treeeef2b22027eaac305b8aa7388f0fce1edd6b84ab
parent046dd5567d9de0596023846e7f0c6df7f01a9f5b (diff)
downloadopenembedded-core-contrib-d140d556ae30b6dbd0ffce8882c3e22b17050820.tar.gz
openembedded-core-contrib-d140d556ae30b6dbd0ffce8882c3e22b17050820.tar.bz2
openembedded-core-contrib-d140d556ae30b6dbd0ffce8882c3e22b17050820.zip
package_manager.py: fix rootfs failure with multilib enabled
With the current code, if we use debian package backend and enable multilib support, the do_rootfs process would always fail with error messages like below. E: Unable to locate package packagegroup-core-boot This patch fixes the above problem. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/lib/oe/package_manager.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 69100f16c1..6f49c69110 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -1723,9 +1723,12 @@ class DpkgPM(PackageManager):
with open(self.d.expand("${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample")) as apt_conf_sample:
for line in apt_conf_sample.read().split("\n"):
match_arch = re.match(" Architecture \".*\";$", line)
+ architectures = ""
if match_arch:
for base_arch in base_arch_list:
- apt_conf.write(" Architecture \"%s\";\n" % base_arch)
+ architectures += "\"%s\";" % base_arch
+ apt_conf.write(" Architectures {%s};\n" % architectures);
+ apt_conf.write(" Architecture \"%s\";\n" % base_archs)
else:
line = re.sub("#ROOTFS#", self.target_rootfs, line)
line = re.sub("#APTCONF#", self.apt_conf_dir, line)