summaryrefslogtreecommitdiffstats
path: root/meta/packages/yum/files/hacks.patch
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:14:24 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-27 15:29:45 +0100
commit29d6678fd546377459ef75cf54abeef5b969b5cf (patch)
tree8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/packages/yum/files/hacks.patch
parentda49de6885ee1bc424e70bc02f21f6ab920efb55 (diff)
downloadpoky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/yum/files/hacks.patch')
-rw-r--r--meta/packages/yum/files/hacks.patch81
1 files changed, 0 insertions, 81 deletions
diff --git a/meta/packages/yum/files/hacks.patch b/meta/packages/yum/files/hacks.patch
deleted file mode 100644
index 61f477172c..0000000000
--- a/meta/packages/yum/files/hacks.patch
+++ /dev/null
@@ -1,81 +0,0 @@
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
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
38Index: yum-3.2.18/rpmUtils/transaction.py
39===================================================================
40--- yum-3.2.18.orig/rpmUtils/transaction.py 2008-06-17 14:05:42.000000000 +0100
41+++ yum-3.2.18/rpmUtils/transaction.py 2008-10-02 17:09:57.000000000 +0100
42@@ -43,6 +43,7 @@
43 'clean']
44 self.tsflags = []
45 self.open = True
46+ self.ts.setProbFilter(rpm.RPMPROB_FILTER_IGNOREOS | rpm.RPMPROB_FILTER_IGNOREARCH)
47
48 def __del__(self):
49 # Automatically close the rpm transaction when the reference is lost
50Index: yum-3.2.18/yum/constants.py
51===================================================================
52--- yum-3.2.18.orig/yum/constants.py 2008-07-21 16:56:54.000000000 +0100
53+++ yum-3.2.18/yum/constants.py 2008-10-02 17:09:57.000000000 +0100
54@@ -17,7 +17,7 @@
55 """
56
57 #Constants
58-YUM_PID_FILE = '/var/run/yum.pid'
59+YUM_PID_FILE = '/var/run2/yum.pid'
60
61 #transaction set states
62 TS_UPDATE = 10
63Index: yum-3.2.18/yum/depsolve.py
64===================================================================
65--- yum-3.2.18.orig/yum/depsolve.py 2008-08-06 17:05:16.000000000 +0100
66+++ yum-3.2.18/yum/depsolve.py 2008-10-02 17:09:57.000000000 +0100
67@@ -141,9 +141,14 @@
68 else:
69 self.logger.critical(_('Invalid tsflag in config file: %s'), flag)
70
71+ self._ts.addTsFlag(rpm.RPMTRANS_FLAG_NOPOST)
72+ self._ts.addTsFlag(rpm.RPMTRANS_FLAG_NOTRIGGERS)
73+
74 probfilter = 0
75 for flag in self.tsInfo.probFilterFlags:
76 probfilter |= flag
77+ probfilter |= rpm.RPMPROB_FILTER_IGNOREOS
78+ probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH
79 self._ts.setProbFilter(probfilter)
80
81 def whatProvides(self, name, flags, version):