diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-10-02 14:26:24 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-10-02 14:26:24 +0000 |
commit | 94fa2b90c53ced5d6b720a57edcd290123d812d2 (patch) | |
tree | ab95598ac4bc64a9121c74598117060dd8083f46 /meta/packages/yum/files/hacks.patch | |
parent | 8626cf563c9b0b46f0e04de09250fc5cc1be816d (diff) | |
download | openembedded-core-94fa2b90c53ced5d6b720a57edcd290123d812d2.tar.gz openembedded-core-94fa2b90c53ced5d6b720a57edcd290123d812d2.tar.bz2 openembedded-core-94fa2b90c53ced5d6b720a57edcd290123d812d2.tar.xz openembedded-core-94fa2b90c53ced5d6b720a57edcd290123d812d2.zip |
yum: added 3.2.18
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5379 311d38ba-8fff-0310-9ca6-ca027cbcb966
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 000000000..d0232ec9b --- /dev/null +++ b/meta/packages/yum/files/hacks.patch @@ -0,0 +1,72 @@ +--- + rpmUtils/arch.py | 3 +++ + rpmUtils/transaction.py | 1 + + yum/constants.py | 2 +- + 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 ++++ yum-3.2.18/rpmUtils/transaction.py 2008-09-03 17:55:27.000000000 +0100 +@@ -43,6 +43,7 @@ + 'clean'] + self.tsflags = [] + self.open = True ++ self.ts.setProbFilter(rpm.RPMPROB_FILTER_IGNOREOS | rpm.RPMPROB_FILTER_IGNOREARCH) + + def __del__(self): + # Automatically close the rpm transaction when the reference is lost +Index: yum-3.2.18/yum/constants.py +=================================================================== +--- yum-3.2.18.orig/yum/constants.py 2008-07-21 16:56:54.000000000 +0100 ++++ yum-3.2.18/yum/constants.py 2008-09-01 15:47:11.000000000 +0100 +@@ -17,7 +17,7 @@ + """ + + #Constants +-YUM_PID_FILE = '/var/run/yum.pid' ++YUM_PID_FILE = '/var/run2/yum.pid' + + #transaction set states + TS_UPDATE = 10 +Index: yum-3.2.18/yum/depsolve.py +=================================================================== +--- yum-3.2.18.orig/yum/depsolve.py 2008-08-06 17:05:16.000000000 +0100 ++++ yum-3.2.18/yum/depsolve.py 2008-09-03 21:05:52.000000000 +0100 +@@ -141,9 +141,14 @@ + else: + self.logger.critical(_('Invalid tsflag in config file: %s'), flag) + ++ self._ts.addTsFlag(rpm.RPMTRANS_FLAG_NOPOST) ++ self._ts.addTsFlag(rpm.RPMTRANS_FLAG_NOTRIGGERS) ++ + probfilter = 0 + for flag in self.tsInfo.probFilterFlags: + probfilter |= flag ++ probfilter |= rpm.RPMPROB_FILTER_IGNOREOS ++ probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH + self._ts.setProbFilter(probfilter) + + def whatProvides(self, name, flags, version): |