From 8a49dd28cc68e419990395c7d4f5846617e91356 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Thu, 2 Oct 2008 20:44:17 +0000
Subject: 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
---
 meta/packages/yum/files/hacks.patch    | 21 ---------------------
 meta/packages/yum/yum-native_3.2.18.bb |  2 +-
 meta/packages/yum/yum_3.2.18.bb        |  1 +
 3 files changed, 2 insertions(+), 22 deletions(-)

(limited to 'meta')

diff --git a/meta/packages/yum/files/hacks.patch b/meta/packages/yum/files/hacks.patch
index d0232ec9b..ac8445f7a 100644
--- 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 60dafe326..679f8e95b 100644
--- 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 67e9ad7b2..7d340970b 100644
--- 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 \
-- 
cgit v1.2.3