summaryrefslogtreecommitdiffstats
path: root/meta/packages/yum
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-10-02 20:44:17 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-10-02 20:44:17 +0000
commit8a49dd28cc68e419990395c7d4f5846617e91356 (patch)
treed43abf243dd81fef8f1ce56be3ee9bad7ba1b43c /meta/packages/yum
parente5e21ca415095c805370a42daa0d3ddb3bd84da0 (diff)
downloadpoky-8a49dd28cc68e419990395c7d4f5846617e91356.tar.gz
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
Diffstat (limited to 'meta/packages/yum')
-rw-r--r--meta/packages/yum/files/hacks.patch21
-rw-r--r--meta/packages/yum/yum-native_3.2.18.bb2
-rw-r--r--meta/packages/yum/yum_3.2.18.bb1
3 files changed, 2 insertions, 22 deletions
diff --git a/meta/packages/yum/files/hacks.patch b/meta/packages/yum/files/hacks.patch
index d0232ec9be..ac8445f7ac 100644
--- a/meta/packages/yum/files/hacks.patch
+++ b/meta/packages/yum/files/hacks.patch
@@ -5,27 +5,6 @@
5 yum/depsolve.py | 2 ++ 5 yum/depsolve.py | 2 ++
6 4 files changed, 7 insertions(+), 1 deletion(-) 6 4 files changed, 7 insertions(+), 1 deletion(-)
7 7
8Index: yum-3.2.18/rpmUtils/arch.py
9===================================================================
10--- yum-3.2.18.orig/rpmUtils/arch.py 2008-06-17 14:05:42.000000000 +0100
11+++ yum-3.2.18/rpmUtils/arch.py 2008-09-01 15:47:11.000000000 +0100
12@@ -275,6 +275,7 @@
13 return arch
14
15 def getCanonArch(skipRpmPlatform = 0):
16+ return "arm"
17 if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
18 try:
19 f = open("/etc/rpm/platform", "r")
20@@ -331,6 +332,8 @@
21 base arch is the arch before noarch in the arches dict if myarch is not
22 a key in the multilibArches."""
23
24+ return "arm"
25+
26 if not myarch:
27 myarch = canonArch
28
29Index: yum-3.2.18/rpmUtils/transaction.py 8Index: yum-3.2.18/rpmUtils/transaction.py
30=================================================================== 9===================================================================
31--- yum-3.2.18.orig/rpmUtils/transaction.py 2008-06-17 14:05:42.000000000 +0100 10--- 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 60dafe3265..679f8e95b4 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 \
5 file://paths.patch;patch=1 \ 5 file://paths.patch;patch=1 \
6 file://yum-install-recommends.py \ 6 file://yum-install-recommends.py \
7 file://extract-postinst.awk" 7 file://extract-postinst.awk"
8PR = "r5" 8PR = "r6"
9 9
10DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native" 10DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native"
11 11
diff --git a/meta/packages/yum/yum_3.2.18.bb b/meta/packages/yum/yum_3.2.18.bb
index 67e9ad7b2c..7d340970bc 100644
--- a/meta/packages/yum/yum_3.2.18.bb
+++ b/meta/packages/yum/yum_3.2.18.bb
@@ -1,4 +1,5 @@
1HOMEPAGE = "http://linux.duke.edu/projects/yum/" 1HOMEPAGE = "http://linux.duke.edu/projects/yum/"
2PR = "r1"
2 3
3SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \ 4SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
4 file://hacks.patch;patch=1 \ 5 file://hacks.patch;patch=1 \