diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2012-05-23 13:55:39 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-14 11:23:47 +0100 |
commit | 59ac33c77f16b4053ae139101ee43dfb1b09506f (patch) | |
tree | 14059e43fd6f98e37e748fefd01c27db267cddff /meta/recipes-devtools/rpm/rpm_5.4.0.bb | |
parent | 3cb36a5ed9c645bdff083f88baff0225536e0472 (diff) | |
download | poky-59ac33c77f16b4053ae139101ee43dfb1b09506f.tar.gz |
rpm 5.4.0: respect to the arch when choose the alternatives
There is a bug if we:
1) bitbake diffutils with MACHINE=crownbay
2) bitbake diffutils with MACHINE=qemux86
3) bitbake core-image-sato with MACHINE=crownbay
Then the diffutils.i586 would be installed to the crownbay's image, this
is because diffutils.i586 is newer than diffutils.core2, and rpm doesn't
respect to the arch priorities:
We have put the archs in order in _solve_dbpath:
crownbay/solvedb:core2/solvedb:i586/solvedb:all/solvedb
Fix rpm to respect to the order, for example, if it finds a pkg in both
core2/ and i586/, and the core2/ comes first, it should not use the one
in i586/ even if it's build time is newer.
Note: Don't worry about the _free(*ptr), it can check whether ptr is
NULL or not.
This is for the denzil branch, and the master branch also needs it.
[YOCTO #2360]
(From OE-Core rev: 2199e6b9c82bb2b6738e87903f30329586db20e2)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm_5.4.0.bb')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_5.4.0.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb index 5ee6b47e34..d79d199970 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb | |||
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" | |||
45 | DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" | 45 | DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}" |
46 | extrarpmdeps = "python perl file" | 46 | extrarpmdeps = "python perl file" |
47 | extrarpmdeps_virtclass-native = "python-native file-native" | 47 | extrarpmdeps_virtclass-native = "python-native file-native" |
48 | PR = "r36" | 48 | PR = "r37" |
49 | 49 | ||
50 | # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed | 50 | # rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed |
51 | # in order to extract the distribution SRPM into a format we can extract... | 51 | # in order to extract the distribution SRPM into a format we can extract... |
@@ -70,6 +70,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex | |||
70 | file://pythondeps.sh \ | 70 | file://pythondeps.sh \ |
71 | file://rpmdeps-oecore.patch \ | 71 | file://rpmdeps-oecore.patch \ |
72 | file://rpm-resolvedep.patch \ | 72 | file://rpm-resolvedep.patch \ |
73 | file://rpm-respect-arch.patch \ | ||
73 | " | 74 | " |
74 | 75 | ||
75 | # file://rpm-autoconf.patch \ | 76 | # file://rpm-autoconf.patch \ |