diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-platform.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-platform.patch | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch index 172510cb9e..11fd039036 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch | |||
@@ -6,10 +6,11 @@ This ensures that RPM knows the compatible set of package types at all times. | |||
6 | 6 | ||
7 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 7 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
8 | 8 | ||
9 | diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c | 9 | Index: rpm-5.4.14/lib/depends.c |
10 | --- rpm-5.4.0.orig/lib/depends.c 2011-02-15 20:40:13.002849708 -0600 | 10 | =================================================================== |
11 | +++ rpm-5.4.0/lib/depends.c 2011-02-15 20:47:05.838981632 -0600 | 11 | --- rpm-5.4.14.orig/lib/depends.c |
12 | @@ -248,7 +248,7 @@ | 12 | +++ rpm-5.4.14/lib/depends.c |
13 | @@ -250,7 +250,7 @@ static int rpmtsAddUpgrades(rpmts ts, rp | ||
13 | he->p.ptr = _free(he->p.ptr); | 14 | he->p.ptr = _free(he->p.ptr); |
14 | } | 15 | } |
15 | 16 | ||
@@ -18,7 +19,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c | |||
18 | /* | 19 | /* |
19 | * If we're capable of installing multiple colors | 20 | * If we're capable of installing multiple colors |
20 | * but at least one of the packages are white (0), we | 21 | * but at least one of the packages are white (0), we |
21 | @@ -505,7 +505,7 @@ | 22 | @@ -507,7 +507,7 @@ assert(lastx >= 0 && lastx < ts->orderCo |
22 | return 0; | 23 | return 0; |
23 | } | 24 | } |
24 | 25 | ||
@@ -27,7 +28,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c | |||
27 | /* Is "compat" compatible w/ arch? */ | 28 | /* Is "compat" compatible w/ arch? */ |
28 | int _isCompatibleArch(const char * arch, const char * compat) | 29 | int _isCompatibleArch(const char * arch, const char * compat) |
29 | { | 30 | { |
30 | @@ -649,7 +649,7 @@ | 31 | @@ -663,7 +663,7 @@ assert(he->p.str != NULL); |
31 | 32 | ||
32 | if (arch == NULL || (parch = rpmteA(p)) == NULL) | 33 | if (arch == NULL || (parch = rpmteA(p)) == NULL) |
33 | continue; | 34 | continue; |
@@ -36,7 +37,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c | |||
36 | /* XXX hackery for alias matching. */ | 37 | /* XXX hackery for alias matching. */ |
37 | if (!_isCompatibleArch(arch, parch)) | 38 | if (!_isCompatibleArch(arch, parch)) |
38 | continue; | 39 | continue; |
39 | @@ -815,6 +815,12 @@ | 40 | @@ -829,6 +829,12 @@ int rpmtsAddEraseElement(rpmts ts, Heade |
40 | return rc; | 41 | return rc; |
41 | } | 42 | } |
42 | 43 | ||
@@ -49,7 +50,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c | |||
49 | /*@only@*/ /*@null@*/ /*@unchecked@*/ | 50 | /*@only@*/ /*@null@*/ /*@unchecked@*/ |
50 | static char *sysinfo_path = NULL; | 51 | static char *sysinfo_path = NULL; |
51 | 52 | ||
52 | @@ -1296,7 +1302,7 @@ | 53 | @@ -1311,7 +1317,7 @@ retry: |
53 | sysinfo_path = rpmExpand("%{?_rpmds_sysinfo_path}", NULL); | 54 | sysinfo_path = rpmExpand("%{?_rpmds_sysinfo_path}", NULL); |
54 | if (!(sysinfo_path != NULL && *sysinfo_path == '/')) { | 55 | if (!(sysinfo_path != NULL && *sysinfo_path == '/')) { |
55 | sysinfo_path = _free(sysinfo_path); | 56 | sysinfo_path = _free(sysinfo_path); |
@@ -58,10 +59,11 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c | |||
58 | } | 59 | } |
59 | } | 60 | } |
60 | 61 | ||
61 | diff -ur rpm-5.4.0.orig/lib/rpmds.c rpm-5.4.0/lib/rpmds.c | 62 | Index: rpm-5.4.14/lib/rpmds.c |
62 | --- rpm-5.4.0.orig/lib/rpmds.c 2011-02-15 20:40:13.004855352 -0600 | 63 | =================================================================== |
63 | +++ rpm-5.4.0/lib/rpmds.c 2011-02-15 20:41:55.598846670 -0600 | 64 | --- rpm-5.4.14.orig/lib/rpmds.c |
64 | @@ -1737,7 +1737,7 @@ | 65 | +++ rpm-5.4.14/lib/rpmds.c |
66 | @@ -1759,7 +1759,7 @@ int rpmdsSysinfo(rpmPRCO PRCO, const cha | ||
65 | /*@-observertrans @*/ | 67 | /*@-observertrans @*/ |
66 | _sysinfo_path = _free(_sysinfo_path); | 68 | _sysinfo_path = _free(_sysinfo_path); |
67 | /*@=observertrans @*/ | 69 | /*@=observertrans @*/ |
@@ -70,9 +72,10 @@ diff -ur rpm-5.4.0.orig/lib/rpmds.c rpm-5.4.0/lib/rpmds.c | |||
70 | } | 72 | } |
71 | } | 73 | } |
72 | /*@=modobserver@*/ | 74 | /*@=modobserver@*/ |
73 | diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c | 75 | Index: rpm-5.4.14/lib/rpmrc.c |
74 | --- rpm-5.4.0.orig/lib/rpmrc.c 2011-02-15 20:40:13.006853913 -0600 | 76 | =================================================================== |
75 | +++ rpm-5.4.0/lib/rpmrc.c 2011-02-15 20:44:39.708972391 -0600 | 77 | --- rpm-5.4.14.orig/lib/rpmrc.c |
78 | +++ rpm-5.4.14/lib/rpmrc.c | ||
76 | @@ -38,7 +38,13 @@ | 79 | @@ -38,7 +38,13 @@ |
77 | static const char * configTarget = NULL; | 80 | static const char * configTarget = NULL; |
78 | 81 | ||
@@ -88,7 +91,7 @@ diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c | |||
88 | 91 | ||
89 | /*@only@*/ /*@relnull@*/ /*@unchecked@*/ | 92 | /*@only@*/ /*@relnull@*/ /*@unchecked@*/ |
90 | void * platpat = NULL; | 93 | void * platpat = NULL; |
91 | @@ -685,16 +691,17 @@ | 94 | @@ -694,16 +700,17 @@ static void defaultMachine(/*@out@*/ con |
92 | int rc; | 95 | int rc; |
93 | 96 | ||
94 | while (!gotDefaults) { | 97 | while (!gotDefaults) { |
@@ -113,7 +116,7 @@ diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c | |||
113 | /* utsname fields on some platforms (like HP-UX) are very small | 116 | /* utsname fields on some platforms (like HP-UX) are very small |
114 | (just about 8 characters). This is too small for OpenPKG, so cheat! */ | 117 | (just about 8 characters). This is too small for OpenPKG, so cheat! */ |
115 | rc = uname(&un_real); | 118 | rc = uname(&un_real); |
116 | @@ -771,9 +778,7 @@ | 119 | @@ -780,9 +787,7 @@ static void defaultMachine(/*@out@*/ con |
117 | if (cp != NULL && cp != _platform) | 120 | if (cp != NULL && cp != _platform) |
118 | cp = _free(cp); | 121 | cp = _free(cp); |
119 | #endif | 122 | #endif |
@@ -123,7 +126,7 @@ diff -ur rpm-5.4.0.orig/lib/rpmrc.c rpm-5.4.0/lib/rpmrc.c | |||
123 | 126 | ||
124 | if (configTarget && !parseCVOG(configTarget, &cvog) && cvog != NULL) { | 127 | if (configTarget && !parseCVOG(configTarget, &cvog) && cvog != NULL) { |
125 | gotDefaults = 1; | 128 | gotDefaults = 1; |
126 | @@ -1096,6 +1101,8 @@ | 129 | @@ -1101,6 +1106,8 @@ int rpmReadConfigFiles(/*@unused@*/ cons |
127 | 130 | ||
128 | #ifdef PREMACROFILES | 131 | #ifdef PREMACROFILES |
129 | if (rpmReadRC(PREMACROFILES)) return -1; | 132 | if (rpmReadRC(PREMACROFILES)) return -1; |