summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2014-02-13 13:55:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-13 12:06:01 +0000
commitee151ed6bc16312733c67b91bbf65959309b640d (patch)
treee708391bf53114728da8d970dcb15ed1207f6e49 /meta
parentabf22bed20870e6283853674a51a39f44af93936 (diff)
downloadpoky-ee151ed6bc16312733c67b91bbf65959309b640d.tar.gz
lib/oe/rootfs.py: fix RPM multilib issue
For some odd reason (at least I couldn't find an explanation to this, yet), if a multilib version of a package is installed after the main one (that is: in a different smart session), the main package binaries are not overwritten. This commit restores the functionality to the original one, before migrating to python: feed all the packages to smart, apart from attempt only ones which are installed separately. (From OE-Core rev: 1fa94697163f16cdbb1499b57f1bc018546974ee) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/rootfs.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 4fd17de58e..6114f5652a 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -317,10 +317,17 @@ class RpmRootfs(Rootfs):
317 317
318 self.pm.update() 318 self.pm.update()
319 319
320 for pkg_type in self.install_order: 320 pkgs = []
321 if pkg_type in pkgs_to_install: 321 pkgs_attempt = []
322 self.pm.install(pkgs_to_install[pkg_type], 322 for pkg_type in pkgs_to_install:
323 [False, True][pkg_type == "aop"]) 323 if pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY:
324 pkgs_attempt += pkgs_to_install[pkg_type]
325 else:
326 pkgs += pkgs_to_install[pkg_type]
327
328 self.pm.install(pkgs)
329
330 self.pm.install(pkgs_attempt, True)
324 331
325 self.pm.install_complementary() 332 self.pm.install_complementary()
326 333