diff options
Diffstat (limited to 'meta/packages/yum/yum-native')
-rw-r--r-- | meta/packages/yum/yum-native/hacks.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/meta/packages/yum/yum-native/hacks.patch b/meta/packages/yum/yum-native/hacks.patch new file mode 100644 index 0000000000..0486b5f4e5 --- /dev/null +++ b/meta/packages/yum/yum-native/hacks.patch | |||
@@ -0,0 +1,66 @@ | |||
1 | --- | ||
2 | rpmUtils/arch.py | 3 +++ | ||
3 | rpmUtils/transaction.py | 1 + | ||
4 | yum/constants.py | 2 +- | ||
5 | yum/depsolve.py | 2 ++ | ||
6 | 4 files changed, 7 insertions(+), 1 deletion(-) | ||
7 | |||
8 | Index: yum-3.2.18/rpmUtils/arch.py | ||
9 | =================================================================== | ||
10 | --- yum-3.2.18.orig/rpmUtils/arch.py 2008-08-26 12:43:14.000000000 +0100 | ||
11 | +++ yum-3.2.18/rpmUtils/arch.py 2008-08-26 12:50:11.000000000 +0100 | ||
12 | @@ -275,6 +275,7 @@ def getCanonX86_64Arch(arch): | ||
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 @@ def getBaseArch(myarch=None): | ||
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 | |||
29 | Index: yum-3.2.18/rpmUtils/transaction.py | ||
30 | =================================================================== | ||
31 | --- yum-3.2.18.orig/rpmUtils/transaction.py 2008-08-26 13:03:13.000000000 +0100 | ||
32 | +++ yum-3.2.18/rpmUtils/transaction.py 2008-08-26 13:10:52.000000000 +0100 | ||
33 | @@ -43,6 +43,7 @@ class TransactionWrapper: | ||
34 | 'clean'] | ||
35 | self.tsflags = [] | ||
36 | self.open = True | ||
37 | + self.ts.setProbFilter(rpm.RPMPROB_FILTER_IGNOREOS | rpm.RPMPROB_FILTER_IGNOREARCH) | ||
38 | |||
39 | def __del__(self): | ||
40 | # Automatically close the rpm transaction when the reference is lost | ||
41 | Index: yum-3.2.18/yum/constants.py | ||
42 | =================================================================== | ||
43 | --- yum-3.2.18.orig/yum/constants.py 2008-08-26 13:12:39.000000000 +0100 | ||
44 | +++ yum-3.2.18/yum/constants.py 2008-08-26 13:12:46.000000000 +0100 | ||
45 | @@ -17,7 +17,7 @@ Yum constants. Usually dealing with rpm | ||
46 | """ | ||
47 | |||
48 | #Constants | ||
49 | -YUM_PID_FILE = '/var/run/yum.pid' | ||
50 | +YUM_PID_FILE = '/var/run2/yum.pid' | ||
51 | |||
52 | #transaction set states | ||
53 | TS_UPDATE = 10 | ||
54 | Index: yum-3.2.18/yum/depsolve.py | ||
55 | =================================================================== | ||
56 | --- yum-3.2.18.orig/yum/depsolve.py 2008-08-26 12:44:37.000000000 +0100 | ||
57 | +++ yum-3.2.18/yum/depsolve.py 2008-08-26 13:17:45.000000000 +0100 | ||
58 | @@ -144,6 +144,8 @@ class Depsolve(object): | ||
59 | probfilter = 0 | ||
60 | for flag in self.tsInfo.probFilterFlags: | ||
61 | probfilter |= flag | ||
62 | + probfilter |= rpm.RPMPROB_FILTER_IGNOREOS | ||
63 | + probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH | ||
64 | self._ts.setProbFilter(probfilter) | ||
65 | |||
66 | def whatProvides(self, name, flags, version): | ||