lib/oe/rootfs.py: fix RPM multilib issue
v2 cover lib/oe/rootfs.py: fix RPM multilib issue
v2:
* address RP's comments;
laurentiu
The following changes since commit b70a10ca3ee4a0add90d387e2c8288e531aaa47c:
systemd-serialgetty: Update to match version in recent systemd (2014-02-11 22:59:38 +0000)
are available in the git repository at:
git://mirror.rb.intel.com/git.yoctoproject.org/poky-contrib lpalcu/rootfs_refactoring_rpm_multilib_fix
for you to fetch changes up to 453395e793d0d5c30d4e8092ee6faf80484ad447:
lib/oe/rootfs.py: fix RPM multilib issue (2014-02-13 13:52:38 +0200)
----------------------------------------------------------------
Laurentiu Palcu (1):
lib/oe/rootfs.py: fix RPM multilib issue
meta/lib/oe/rootfs.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
Laurentiu Palcu (1):
lib/oe/rootfs.py: fix RPM multilib issue
meta/lib/oe/rootfs.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.9.5
PATCH v2 1/1 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.
--- meta/lib/oe/rootfs.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
meta/lib/oe/rootfs.py +11 -4
@@ -317,10 +317,17 @@ class RpmRootfs(Rootfs): self.pm.update() - for pkg_type in self.install_order: - if pkg_type in pkgs_to_install: - self.pm.install(pkgs_to_install[pkg_type], - [False, True][pkg_type == "aop"]) + pkgs = [] + pkgs_attempt = [] + for pkg_type in pkgs_to_install: + if pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY: + pkgs_attempt += pkgs_to_install[pkg_type] + else: + pkgs += pkgs_to_install[pkg_type] + + self.pm.install(pkgs) + + self.pm.install(pkgs_attempt, True) self.pm.install_complementary()
Signature · 1 line
1.7.9.5