yum: do not hardcode arm architecture - rootfs_rpm provide arch info

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5392 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/yum/files/hacks.patch b/meta/packages/yum/files/hacks.patch
index d0232ec9be37b15664247275be72785a0b04bb07..ac8445f7ac612fb616bd87574913c426915e6734 100644 (file)
--- a/meta/packages/yum/files/hacks.patch
+++ b/meta/packages/yum/files/hacks.patch
@@ -5,27 +5,6 @@
  yum/depsolve.py         |    2 ++
  4 files changed, 7 insertions(+), 1 deletion(-)
 
-Index: yum-3.2.18/rpmUtils/arch.py
-===================================================================
---- yum-3.2.18.orig/rpmUtils/arch.py   2008-06-17 14:05:42.000000000 +0100
-+++ yum-3.2.18/rpmUtils/arch.py        2008-09-01 15:47:11.000000000 +0100
-@@ -275,6 +275,7 @@
-     return arch
-         
- def getCanonArch(skipRpmPlatform = 0):
-+    return "arm"
-     if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
-         try:
-             f = open("/etc/rpm/platform", "r")
-@@ -331,6 +332,8 @@
-        base arch is the arch before noarch in the arches dict if myarch is not
-        a key in the multilibArches."""
- 
-+    return "arm"
-+
-     if not myarch:
-         myarch = canonArch
- 
 Index: yum-3.2.18/rpmUtils/transaction.py
 ===================================================================
 --- yum-3.2.18.orig/rpmUtils/transaction.py    2008-06-17 14:05:42.000000000 +0100

diff --git a/meta/packages/yum/yum-native_3.2.18.bb b/meta/packages/yum/yum-native_3.2.18.bb
index 60dafe3265859d667d0aa216903582d26ae36904..679f8e95b46198f86ebfa35d35500c2e6282a051 100644 (file)
--- a/meta/packages/yum/yum-native_3.2.18.bb
+++ b/meta/packages/yum/yum-native_3.2.18.bb
@@ -5,7 +5,7 @@ SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
            file://paths.patch;patch=1 \
           file://yum-install-recommends.py \
           file://extract-postinst.awk"
-PR = "r5"
+PR = "r6"
 
 DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native"
 

diff --git a/meta/packages/yum/yum_3.2.18.bb b/meta/packages/yum/yum_3.2.18.bb
index 67e9ad7b2c01eba1e24c99fcf1f1d8f0626edf98..7d340970bc755cc4f6cb8e99abc52ea8ee017973 100644 (file)
--- a/meta/packages/yum/yum_3.2.18.bb
+++ b/meta/packages/yum/yum_3.2.18.bb
@@ -1,4 +1,5 @@
 HOMEPAGE = "http://linux.duke.edu/projects/yum/"
+PR = "r1"
 
 SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
            file://hacks.patch;patch=1 \