[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5705/8267] package_manager.py: Reverse rpm arch order



commit adea8003abe383b9bc532ac5477bc274e270c19a
Author: Jussi Kukkonen <jussi kukkonen intel com>
Date:   Wed Apr 19 16:25:57 2017 +0300

    package_manager.py: Reverse rpm arch order
    
    The architecture list used by dnf/libsolv was in the wrong order.
    As a result, the images were built with wrong and unpredictable
    packages.
    
    $ MACHINE=intel-corei7-64 bitbake core-image-sato
    $ MACHINE=qemux86-64 bitbake core-image-sato
    $ MACHINE=intel-corei7-64 bitbake -ccleansstate core-image-sato
    $ MACHINE=intel-corei7-64 bitbake core-image-sato
    
    The first image had 0 core2_64 packages in it, but the last one had
    583 core2_64 packages (which were built for the qemu image in
    between).
    
    Reverse the arch order in etc/dnf/vars/arch.
    
    Fixes [YOCTO #11384].
    
    (From OE-Core rev: 4a82433de42943f8219beca3286f40b67157172f)
    
    Signed-off-by: Jussi Kukkonen <jussi kukkonen intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oe/package_manager.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index f7190cf..f1b65bd 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -489,7 +489,7 @@ class RpmPM(PackageManager):
 
     def _configure_dnf(self):
         # libsolv handles 'noarch' internally, we don't need to specify it explicitly
-        archs = [i for i in self.archs.split() if i not in ["any", "all", "noarch"]]
+        archs = [i for i in reversed(self.archs.split()) if i not in ["any", "all", "noarch"]]
         # This prevents accidental matching against libsolv's built-in policies
         if len(archs) <= 1:
             archs = archs + ["bogusarch"]


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]