fix package archs ordering for RPM

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Laurentiu Palcu
Sent: Monday, March 03, 2014 1:44 AM
To: [email protected]
Subject: [OE-core] [PATCH 1/2] Revert "lib/oe/package_manager.py:
RpmPM: fix issue with multilib builds"

Converting a list to a set does not keep the order of the items, as they were added, which might result in the wrong packages being installed in the final image...

This reverts commit 12f47c23df8c109676f66d580d666a3147f3b046.

[YOCTO #5890]

Signed-off-by Laurentiu Palcu <[email protected]>

---
 meta/lib/oe/package_manager.py |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(quoted diff) +0 -0

b/meta/lib/oe/package_manager.py index ff4f1de..6c133c3 100644

meta/lib/oe/package_manager.py +7 -7

@@ -368,18 +368,19 @@ class RpmPM(PackageManager):
                                 self.ml_os_list['default'])
 
         # List must be prefered to least preferred order
-        default_platform_extra = set()
-        platform_extra = set()
+        default_platform_extra = list()
+        platform_extra = list()
         bbextendvariant = self.d.getVar('BBEXTENDVARIANT', True) or ""
         for mlib in self.ml_os_list:
             for arch in self.ml_prefix_list[mlib]:
                 plt = arch.replace('-', '_') + '-.*-' + self.ml_os_list[mlib]
                 if mlib == bbextendvariant:
-                        default_platform_extra.add(plt)
+                    if plt not in default_platform_extra:
+                        default_platform_extra.append(plt)
                 else:
-                        platform_extra.add(plt)
-
-        platform_extra = platform_extra.union(default_platform_extra)
+                    if plt not in platform_extra:
+                        platform_extra.append(plt)
+        platform_extra = default_platform_extra + platform_extra
 
         self._create_configs(platform, platform_extra)
 
--

1.7.9.5

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Make sure the channel was not already added, before attempting to add.

[YOCTO #5890]

Signed-off-by Laurentiu Palcu <[email protected]>

---
  meta/lib/oe/package_manager.py |    6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)

meta/lib/oe/package_manager.py +4 -2

index 6c133c3..ee42952 100644
@@ -604,11 +604,11 @@ class RpmPM(PackageManager):
          # self._invoke_smart('config --set rpm-log-level=debug')
          # cmd = 'config --set rpm-log-file=/tmp/smart-debug-logfile'
          # self._invoke_smart(cmd)
-
+        ch_already_added = []
          for canonical_arch in platform_extra:
              arch = canonical_arch.split('-')[0]
              arch_channel = os.path.join(self.deploy_dir, arch)
-            if os.path.exists(arch_channel):
+            if os.path.exists(arch_channel) and not arch in ch_already_added:
                  bb.note('Note: adding Smart channel %s (%s)' %
                          (arch, channel_priority))
                  self._invoke_smart('channel --add %s type=rpm-md baseurl=%s -y'

@@ -617,6 +617,8 @@ class RpmPM(PackageManager):
                                     (arch, channel_priority))
                  channel_priority -= 5
 
+                ch_already_added.append(arch)
+
          bb.note('adding Smart RPM DB channel')
          self._invoke_smart('channel --add rpmsys type=rpm-sys -y')
 

Quoted 3 lines · Laurentiu Palcu

Make sure the channel was not already added, before attempting to add.

[YOCTO #5890]

When generating the rootfs/etc/rpm/platform file, the order should be in the order of highest to lowest priority as well.

Smart uses this order (via an RPM API) to help determine scores when two packages from repositories at the same priority (with different architectures) are selected.

--Mark

Quoted 25 lines

Signed-off-by Laurentiu Palcu <[email protected]>

---
 meta/lib/oe/package_manager.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

meta/lib/oe/package_manager.py +2 -2

index 6c133c3..ee42952 100644
@@ -604,11 +604,11 @@ class RpmPM(PackageManager):
         # self._invoke_smart('config --set rpm-log-level=debug')
         # cmd = 'config --set rpm-log-file=/tmp/smart-debug-logfile'
         # self._invoke_smart(cmd)
-
+        ch_already_added = []
         for canonical_arch in platform_extra:
             arch = canonical_arch.split('-')[0]
             arch_channel = os.path.join(self.deploy_dir, arch)
-            if os.path.exists(arch_channel):
+            if os.path.exists(arch_channel) and not arch in ch_already_added:
                 bb.note('Note: adding Smart channel %s (%s)' %
                         (arch, channel_priority))
                 self._invoke_smart('channel --add %s type=rpm-md baseurl=%s -y'

meta/lib/oe/package_manager.py class RpmPM(PackageManager): · line 624

Quoted 8 lines

meta/lib/oe/package_manager.py +2 -0

@@ -617,6 +617,8 @@ class RpmPM(PackageManager):
                                    (arch, channel_priority))
                 channel_priority -= 5
 
+                ch_already_added.append(arch)
+
         bb.note('adding Smart RPM DB channel')
         self._invoke_smart('channel --add rpmsys type=rpm-sys -y')
 

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core