diff options
Diffstat (limited to 'meta/packages/yum/files/hacks.patch')
| -rw-r--r-- | meta/packages/yum/files/hacks.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/meta/packages/yum/files/hacks.patch b/meta/packages/yum/files/hacks.patch new file mode 100644 index 0000000000..d0232ec9be --- /dev/null +++ b/meta/packages/yum/files/hacks.patch | |||
| @@ -0,0 +1,72 @@ | |||
| 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-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 | |||
| 29 | Index: yum-3.2.18/rpmUtils/transaction.py | ||
| 30 | =================================================================== | ||
| 31 | --- yum-3.2.18.orig/rpmUtils/transaction.py 2008-06-17 14:05:42.000000000 +0100 | ||
| 32 | +++ yum-3.2.18/rpmUtils/transaction.py 2008-09-03 17:55:27.000000000 +0100 | ||
| 33 | @@ -43,6 +43,7 @@ | ||
| 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-07-21 16:56:54.000000000 +0100 | ||
| 44 | +++ yum-3.2.18/yum/constants.py 2008-09-01 15:47:11.000000000 +0100 | ||
| 45 | @@ -17,7 +17,7 @@ | ||
| 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-06 17:05:16.000000000 +0100 | ||
| 57 | +++ yum-3.2.18/yum/depsolve.py 2008-09-03 21:05:52.000000000 +0100 | ||
| 58 | @@ -141,9 +141,14 @@ | ||
| 59 | else: | ||
| 60 | self.logger.critical(_('Invalid tsflag in config file: %s'), flag) | ||
| 61 | |||
| 62 | + self._ts.addTsFlag(rpm.RPMTRANS_FLAG_NOPOST) | ||
| 63 | + self._ts.addTsFlag(rpm.RPMTRANS_FLAG_NOTRIGGERS) | ||
| 64 | + | ||
| 65 | probfilter = 0 | ||
| 66 | for flag in self.tsInfo.probFilterFlags: | ||
| 67 | probfilter |= flag | ||
| 68 | + probfilter |= rpm.RPMPROB_FILTER_IGNOREOS | ||
| 69 | + probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH | ||
| 70 | self._ts.setProbFilter(probfilter) | ||
| 71 | |||
| 72 | def whatProvides(self, name, flags, version): | ||
