From feaf9a98dffa73ed5b87453a9449fb9ef30efbea Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 3 Feb 2015 14:53:39 -0600 Subject: package_manager.py: fix rootfs failure with multilib enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) (From OE-Core rev: c4306385f6f2139474a4389a465c1650e10b2444) Signed-off-by: Chen Qi Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Aníbal Limón Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 411b9d6309..505509543d 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -1725,9 +1725,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) -- cgit v1.2.3-54-g00ecf