From 8a49dd28cc68e419990395c7d4f5846617e91356 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz 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 --------------------- 1 file changed, 21 deletions(-) (limited to 'meta/packages/yum/files') 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 -- cgit v1.2.3