CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-04 16:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

python-smartpm: multilib fixes

Browse Source 
To fix some multilib issues, change the way the RPM backend decides
if two packages can coexist: if they have a different architecture,
automatically assume that they can coexist (which is fundamental for
multilib).

[YOCTO #3681]

(From OE-Core rev: 05fd850f09c58dba8f64f3fe1de28ed9f21890a2)

(From OE-Core rev: 03c892a02568fa8a5765d9fb569a55f17ea05f96)

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Bogdan Marinescu 2013-01-29 11:05:02 +02:00 committed by Richard Purdie
parent bbc374a69b
commit 9a9848d215
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta/recipes-devtools/python/python-smartpm/smart-multilib-fixes.patch Normal file
View File

@ -0,0 +1,22 @@
To fix some multilib issues, change the way the RPM backend decides
if two packages can coexist: if they have a different architecture,
automatically assume that they can coexist (which is fundamental for
multilib).
Upstream-Status: Pending
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
diff --git a/smart/backends/rpm/base.py b/smart/backends/rpm/base.py
index 6e83d40..7140c1b 100644
--- a/smart/backends/rpm/base.py
+++ b/smart/backends/rpm/base.py
@@ -228,6 +228,8 @@ class RPMPackage(Package):
return False
selfver, selfarch = splitarch(self.version)
otherver, otherarch = splitarch(other.version)
+ if selfarch != otherarch:
+ return True
selfcolor = getArchColor(selfarch)
othercolor = getArchColor(otherarch)
if (selfcolor and othercolor and selfcolor != othercolor and

3
meta/recipes-devtools/python/python-smartpm_1.4.1.bb
View File

@ -11,7 +11,7 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833"
DEPENDS = "python rpm"
PR = "r7"
PR = "r8"
SRCNAME = "smart"
SRC_URI = "\
@ -25,6 +25,7 @@ SRC_URI = "\
file://smart-tmpdir.patch \
file://smart-metadata-match.patch \
file://smart-improve-error-reporting.patch \
file://smart-multilib-fixes.patch \
"
SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6"