[PATCH 0/1] package_manager.py: fix rootfs failure for package_deb with multilib enabled

[PATCH 0/1] package_manager.py: fix rootfs failure for package_deb with multilib enabled

[Chen Qi]

The following changes since commit 2a775ebbb175dd70fc7228607c306d4ccb9e4ba4:

  net-tools: Fix rerunning of do_patch task (2015-01-23 14:32:40 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib ChenQi/debian-multilib
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/debian-multilib

Chen Qi (1):
  package_manager.py: fix rootfs failure with multilib enabled

 meta/lib/oe/package_manager.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
1.9.1

[PATCH 1/1] package_manager.py: fix rootfs failure with multilib enabled

[Chen Qi]

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.

Signed-off-by: Chen Qi <Qi.Chen@windriver.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 69100f1..6f49c69 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -1723,9 +1723,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)
-- 
1.9.1

Re: [PATCH 1/1] package_manager.py: fix rootfs failure with multilib enabled

[Aníbal Limón]

Hi Chen,

I tested the patch and is ok can contain (when merge),

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>

Also the same issue is presented in dizzy and the patch needs to be 
backported.

Best regards,
     alimon

On 28/01/15 20:22, Chen Qi wrote:
> 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.
>
> Signed-off-by: Chen Qi <Qi.Chen@windriver.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 69100f1..6f49c69 100644
> --- a/meta/lib/oe/package_manager.py
> +++ b/meta/lib/oe/package_manager.py
> @@ -1723,9 +1723,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)