summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-02-03 14:53:39 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-17 22:39:29 +0100
commitfeaf9a98dffa73ed5b87453a9449fb9ef30efbea (patch)
tree0648c21817f90071e0f35cb759c3784bbcad6860
parent9bdf737982cba6c16615d4cdbe9ee1f27e8e5bab (diff)
downloadpoky-feaf9a98dffa73ed5b87453a9449fb9ef30efbea.tar.gz
poky-feaf9a98dffa73ed5b87453a9449fb9ef30efbea.tar.bz2
poky-feaf9a98dffa73ed5b87453a9449fb9ef30efbea.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. (From OE-Core rev: d140d556ae30b6dbd0ffce8882c3e22b17050820) (From OE-Core rev: c4306385f6f2139474a4389a465c1650e10b2444) 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> Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 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)