summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-10-02 21:28:14 +0000
committerRichard Purdie <richard@openedhand.com>2008-10-02 21:28:14 +0000
commitaea49588fada46de6beb2b9c7085af3929d09284 (patch)
tree15adc55c3ecc432290f0ce1bde93aada3b31898e /meta
parent537ff09c6982113c29260f29008fc9328565a9db (diff)
downloadpoky-aea49588fada46de6beb2b9c7085af3929d09284.tar.gz
yum-native: Fix hacks.patch to handle architecture detection issues
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5396 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/yum/files/hacks.patch36
-rw-r--r--meta/packages/yum/yum-native_3.2.18.bb2
2 files changed, 34 insertions, 4 deletions
diff --git a/meta/packages/yum/files/hacks.patch b/meta/packages/yum/files/hacks.patch
index ac8445f7ac..61f477172c 100644
--- a/meta/packages/yum/files/hacks.patch
+++ b/meta/packages/yum/files/hacks.patch
@@ -5,10 +5,40 @@
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-10-02 22:09:19.000000000 +0100
12@@ -275,6 +275,12 @@
13 return arch
14
15 def getCanonArch(skipRpmPlatform = 0):
16+ import os
17+ if 'YUM_ARCH_FORCE' in os.environ:
18+ return os.environ['YUM_ARCH_FORCE']
19+
20+ sys.exit(1)
21+
22 if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
23 try:
24 f = open("/etc/rpm/platform", "r")
25@@ -331,6 +338,12 @@
26 base arch is the arch before noarch in the arches dict if myarch is not
27 a key in the multilibArches."""
28
29+ import os
30+ if 'YUM_ARCH_FORCE' in os.environ:
31+ return os.environ['YUM_ARCH_FORCE']
32+
33+ sys.exit(1)
34+
35 if not myarch:
36 myarch = canonArch
37
8Index: yum-3.2.18/rpmUtils/transaction.py 38Index: yum-3.2.18/rpmUtils/transaction.py
9=================================================================== 39===================================================================
10--- yum-3.2.18.orig/rpmUtils/transaction.py 2008-06-17 14:05:42.000000000 +0100 40--- yum-3.2.18.orig/rpmUtils/transaction.py 2008-06-17 14:05:42.000000000 +0100
11+++ yum-3.2.18/rpmUtils/transaction.py 2008-09-03 17:55:27.000000000 +0100 41+++ yum-3.2.18/rpmUtils/transaction.py 2008-10-02 17:09:57.000000000 +0100
12@@ -43,6 +43,7 @@ 42@@ -43,6 +43,7 @@
13 'clean'] 43 'clean']
14 self.tsflags = [] 44 self.tsflags = []
@@ -20,7 +50,7 @@ Index: yum-3.2.18/rpmUtils/transaction.py
20Index: yum-3.2.18/yum/constants.py 50Index: yum-3.2.18/yum/constants.py
21=================================================================== 51===================================================================
22--- yum-3.2.18.orig/yum/constants.py 2008-07-21 16:56:54.000000000 +0100 52--- yum-3.2.18.orig/yum/constants.py 2008-07-21 16:56:54.000000000 +0100
23+++ yum-3.2.18/yum/constants.py 2008-09-01 15:47:11.000000000 +0100 53+++ yum-3.2.18/yum/constants.py 2008-10-02 17:09:57.000000000 +0100
24@@ -17,7 +17,7 @@ 54@@ -17,7 +17,7 @@
25 """ 55 """
26 56
@@ -33,7 +63,7 @@ Index: yum-3.2.18/yum/constants.py
33Index: yum-3.2.18/yum/depsolve.py 63Index: yum-3.2.18/yum/depsolve.py
34=================================================================== 64===================================================================
35--- yum-3.2.18.orig/yum/depsolve.py 2008-08-06 17:05:16.000000000 +0100 65--- yum-3.2.18.orig/yum/depsolve.py 2008-08-06 17:05:16.000000000 +0100
36+++ yum-3.2.18/yum/depsolve.py 2008-09-03 21:05:52.000000000 +0100 66+++ yum-3.2.18/yum/depsolve.py 2008-10-02 17:09:57.000000000 +0100
37@@ -141,9 +141,14 @@ 67@@ -141,9 +141,14 @@
38 else: 68 else:
39 self.logger.critical(_('Invalid tsflag in config file: %s'), flag) 69 self.logger.critical(_('Invalid tsflag in config file: %s'), flag)
diff --git a/meta/packages/yum/yum-native_3.2.18.bb b/meta/packages/yum/yum-native_3.2.18.bb
index 679f8e95b4..f4dc87ed43 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 = "r6" 8PR = "r7"
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