diff options
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/package_manager.py | 5 |
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) |