summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdan Marinescu <bogdan.a.marinescu@intel.com>2013-01-29 11:05:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-01 15:54:03 +0000
commit9a9848d2156783ce65ad734e86fe0c212c26a6c8 (patch)
treeec416b86c61e12b74536fe8729db5e6be77ef0c9
parentbbc374a69bf5bfc56091859e143d03541d3d8661 (diff)
downloadpoky-9a9848d2156783ce65ad734e86fe0c212c26a6c8.tar.gz
python-smartpm: multilib fixes
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>
-rw-r--r--meta/recipes-devtools/python/python-smartpm/smart-multilib-fixes.patch22
-rw-r--r--meta/recipes-devtools/python/python-smartpm_1.4.1.bb3
2 files changed, 24 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-multilib-fixes.patch b/meta/recipes-devtools/python/python-smartpm/smart-multilib-fixes.patch
new file mode 100644
index 0000000000..56fef79a5f
--- /dev/null
+++ b/meta/recipes-devtools/python/python-smartpm/smart-multilib-fixes.patch
@@ -0,0 +1,22 @@
1To fix some multilib issues, change the way the RPM backend decides
2if two packages can coexist: if they have a different architecture,
3automatically assume that they can coexist (which is fundamental for
4multilib).
5
6Upstream-Status: Pending
7
8Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
9
10diff --git a/smart/backends/rpm/base.py b/smart/backends/rpm/base.py
11index 6e83d40..7140c1b 100644
12--- a/smart/backends/rpm/base.py
13+++ b/smart/backends/rpm/base.py
14@@ -228,6 +228,8 @@ class RPMPackage(Package):
15 return False
16 selfver, selfarch = splitarch(self.version)
17 otherver, otherarch = splitarch(other.version)
18+ if selfarch != otherarch:
19+ return True
20 selfcolor = getArchColor(selfarch)
21 othercolor = getArchColor(otherarch)
22 if (selfcolor and othercolor and selfcolor != othercolor and
diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
index 4d0f96b769..06641adc4c 100644
--- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
+++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
@@ -11,7 +11,7 @@ LICENSE = "GPLv2"
11LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" 11LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833"
12 12
13DEPENDS = "python rpm" 13DEPENDS = "python rpm"
14PR = "r7" 14PR = "r8"
15SRCNAME = "smart" 15SRCNAME = "smart"
16 16
17SRC_URI = "\ 17SRC_URI = "\
@@ -25,6 +25,7 @@ SRC_URI = "\
25 file://smart-tmpdir.patch \ 25 file://smart-tmpdir.patch \
26 file://smart-metadata-match.patch \ 26 file://smart-metadata-match.patch \
27 file://smart-improve-error-reporting.patch \ 27 file://smart-improve-error-reporting.patch \
28 file://smart-multilib-fixes.patch \
28 " 29 "
29 30
30SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6" 31SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6"