summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-04-19 16:25:57 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-20 07:55:25 +0100
commitadea8003abe383b9bc532ac5477bc274e270c19a (patch)
treeab7db0030513628970be4e2cf89db549af111c6f /meta
parentb73ceb2594e0ed56763ff54bfefd152e6a4ba998 (diff)
downloadpoky-adea8003abe383b9bc532ac5477bc274e270c19a.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/package_manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index f7190cf0b9..f1b65bdbbc 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -489,7 +489,7 @@ class RpmPM(PackageManager):
489 489
490 def _configure_dnf(self): 490 def _configure_dnf(self):
491 # libsolv handles 'noarch' internally, we don't need to specify it explicitly 491 # libsolv handles 'noarch' internally, we don't need to specify it explicitly
492 archs = [i for i in self.archs.split() if i not in ["any", "all", "noarch"]] 492 archs = [i for i in reversed(self.archs.split()) if i not in ["any", "all", "noarch"]]
493 # This prevents accidental matching against libsolv's built-in policies 493 # This prevents accidental matching against libsolv's built-in policies
494 if len(archs) <= 1: 494 if len(archs) <= 1:
495 archs = archs + ["bogusarch"] 495 archs = archs + ["bogusarch"]