summaryrefslogtreecommitdiffstats
path: root/meta/lib
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:54 +0000
commit4385b3cc9ddb0a2a023dd2f15ef734947566c7f4 (patch)
tree3acfca9ab94b88bfeeec99fb8c21d873d524d374 /meta/lib
parente4dc8fe86c6b503cc3e55a2a466a65a1313501a1 (diff)
downloadpoky-4385b3cc9ddb0a2a023dd2f15ef734947566c7f4.tar.gz
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. (From OE-Core rev: d140d556ae30b6dbd0ffce8882c3e22b17050820) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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):
1723 with open(self.d.expand("${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample")) as apt_conf_sample: 1723 with open(self.d.expand("${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample")) as apt_conf_sample:
1724 for line in apt_conf_sample.read().split("\n"): 1724 for line in apt_conf_sample.read().split("\n"):
1725 match_arch = re.match(" Architecture \".*\";$", line) 1725 match_arch = re.match(" Architecture \".*\";$", line)
1726 architectures = ""
1726 if match_arch: 1727 if match_arch:
1727 for base_arch in base_arch_list: 1728 for base_arch in base_arch_list:
1728 apt_conf.write(" Architecture \"%s\";\n" % base_arch) 1729 architectures += "\"%s\";" % base_arch
1730 apt_conf.write(" Architectures {%s};\n" % architectures);
1731 apt_conf.write(" Architecture \"%s\";\n" % base_archs)
1729 else: 1732 else:
1730 line = re.sub("#ROOTFS#", self.target_rootfs, line) 1733 line = re.sub("#ROOTFS#", self.target_rootfs, line)
1731 line = re.sub("#APTCONF#", self.apt_conf_dir, line) 1734 line = re.sub("#APTCONF#", self.apt_conf_dir, line)