[oe-commits] Chen Qi : package_manager.py: fix rootfs failure with multilib enabled
git at git.openembedded.org
git at git.openembedded.org
Fri Apr 17 21:41:53 UTC 2015
Module: openembedded-core.git
Branch: dizzy
Commit: c4306385f6f2139474a4389a465c1650e10b2444
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c4306385f6f2139474a4389a465c1650e10b2444
Author: Chen Qi <Qi.Chen at windriver.com>
Date: Tue Feb 3 14:53:39 2015 -0600
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 at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
Signed-off-by: Aníbal Limón <anibal.limon at linux.intel.com>
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
meta/lib/oe/package_manager.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 411b9d6..5055095 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)
More information about the Openembedded-commits
mailing list