summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch4
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch2
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-platform.patch8
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-platform2.patch6
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch22
6 files changed, 22 insertions, 22 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch b/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
index 0fae571e49..c1fab3e1a0 100644
--- a/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
+++ b/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
@@ -17,7 +17,7 @@ Index: rpm-5.4.9/python/rpmmodule.c
17 REGISTER_ENUM(RPMSENSE_NOTEQUAL); 17 REGISTER_ENUM(RPMSENSE_NOTEQUAL);
18 REGISTER_ENUM(RPMSENSE_FIND_REQUIRES); 18 REGISTER_ENUM(RPMSENSE_FIND_REQUIRES);
19-#if defined(RPM_VENDOR_MANDRIVA) 19-#if defined(RPM_VENDOR_MANDRIVA)
20+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) 20+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE)
21 REGISTER_ENUM(RPMSENSE_PREREQ); 21 REGISTER_ENUM(RPMSENSE_PREREQ);
22 REGISTER_ENUM(RPMSENSE_SCRIPT_PRE); 22 REGISTER_ENUM(RPMSENSE_SCRIPT_PRE);
23 REGISTER_ENUM(RPMSENSE_SCRIPT_POST); 23 REGISTER_ENUM(RPMSENSE_SCRIPT_POST);
@@ -26,7 +26,7 @@ Index: rpm-5.4.9/python/rpmmodule.c
26+ REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN); 26+ REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN);
27+#endif 27+#endif
28+ 28+
29+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) 29+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE)
30+ REGISTER_ENUM(RPMSENSE_MISSINGOK); 30+ REGISTER_ENUM(RPMSENSE_MISSINGOK);
31 #endif 31 #endif
32 32
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
index d81e25ac4e..c4b4c03de8 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
@@ -12,7 +12,7 @@ diff -urN rpm-5.4.0.orig/lib/order.c rpm-5.4.0/lib/order.c
12 rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS)) 12 rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS))
13 ? RPMLOG_WARNING : RPMLOG_ERR; 13 ? RPMLOG_WARNING : RPMLOG_ERR;
14-#if defined(RPM_VENDOR_MANDRIVA) /* loop-detection-optional-loglevel */ 14-#if defined(RPM_VENDOR_MANDRIVA) /* loop-detection-optional-loglevel */
15+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_POKY) /* loop-detection-optional-loglevel */ 15+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OE) /* loop-detection-optional-loglevel */
16 // Report loops as debug-level message by default (7 = RPMLOG_DEBUG), overridable 16 // Report loops as debug-level message by default (7 = RPMLOG_DEBUG), overridable
17 msglvl = rpmExpandNumeric("%{?_loop_detection_loglevel}%{?!_loop_detection_loglevel:7}"); 17 msglvl = rpmExpandNumeric("%{?_loop_detection_loglevel}%{?!_loop_detection_loglevel:7}");
18 #endif 18 #endif
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch
index 0f391d213a..1432b16244 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch
@@ -12,7 +12,7 @@ index e676601..9140bbe 100644
12 #endif 12 #endif
13 } 13 }
14 14
15+#if !defined(RPM_VENDOR_POKY) /* Skip the explicit-platform */ 15+#if !defined(RPM_VENDOR_OE) /* Skip the explicit-platform */
16 #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */ 16 #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */
17 /* do not use vendor and GNU attribution */ 17 /* do not use vendor and GNU attribution */
18 p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL); 18 p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL);
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
index 9e167d82f3..172510cb9e 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-platform.patch
@@ -14,7 +14,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c
14 } 14 }
15 15
16-#if defined(RPM_VENDOR_WINDRIVER) 16-#if defined(RPM_VENDOR_WINDRIVER)
17+#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_POKY) 17+#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_OE)
18 /* 18 /*
19 * If we're capable of installing multiple colors 19 * If we're capable of installing multiple colors
20 * but at least one of the packages are white (0), we 20 * but at least one of the packages are white (0), we
@@ -23,7 +23,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c
23 } 23 }
24 24
25-#if defined(RPM_VENDOR_WINDRIVER) 25-#if defined(RPM_VENDOR_WINDRIVER)
26+#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_POKY) 26+#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_OE)
27 /* Is "compat" compatible w/ arch? */ 27 /* Is "compat" compatible w/ arch? */
28 int _isCompatibleArch(const char * arch, const char * compat) 28 int _isCompatibleArch(const char * arch, const char * compat)
29 { 29 {
@@ -32,7 +32,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c
32 if (arch == NULL || (parch = rpmteA(p)) == NULL) 32 if (arch == NULL || (parch = rpmteA(p)) == NULL)
33 continue; 33 continue;
34-#if defined(RPM_VENDOR_WINDRIVER) 34-#if defined(RPM_VENDOR_WINDRIVER)
35+#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_POKY) 35+#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_OE)
36 /* XXX hackery for alias matching. */ 36 /* XXX hackery for alias matching. */
37 if (!_isCompatibleArch(arch, parch)) 37 if (!_isCompatibleArch(arch, parch))
38 continue; 38 continue;
@@ -40,7 +40,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c
40 return rc; 40 return rc;
41 } 41 }
42 42
43+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) 43+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE)
44+#define _ETC_RPM_SYSINFO "%{_etcrpm}/sysinfo" 44+#define _ETC_RPM_SYSINFO "%{_etcrpm}/sysinfo"
45+#else 45+#else
46+#define _ETC_RPM_SYSINFO SYSCONFIGDIR "/sysinfo" 46+#define _ETC_RPM_SYSINFO SYSCONFIGDIR "/sysinfo"
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch b/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
index 6683d8fdbf..79124bb6c4 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
@@ -22,7 +22,7 @@ Index: rpm-5.4.9/lib/rpmrc.c
22 { 22 {
23 23
24-#if defined(RPM_VENDOR_WINDRIVER) 24-#if defined(RPM_VENDOR_WINDRIVER)
25+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) 25+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE)
26 addMacro(NULL, "_usrlibrpm", NULL, __usrlibrpm, RMIL_DEFAULT); 26 addMacro(NULL, "_usrlibrpm", NULL, __usrlibrpm, RMIL_DEFAULT);
27 addMacro(NULL, "_etcrpm", NULL, __etcrpm, RMIL_DEFAULT); 27 addMacro(NULL, "_etcrpm", NULL, __etcrpm, RMIL_DEFAULT);
28 addMacro(NULL, "_vendor", NULL, "%{?_host_vendor}%{!?_host_vendor:wrs}", RMIL_DEFAULT); 28 addMacro(NULL, "_vendor", NULL, "%{?_host_vendor}%{!?_host_vendor:wrs}", RMIL_DEFAULT);
@@ -38,7 +38,7 @@ Index: rpm-5.4.9/lib/rpmrc.c
38 } 38 }
39 39
40 if (!parseCVOG(p, &cvog) && cvog != NULL) { 40 if (!parseCVOG(p, &cvog) && cvog != NULL) {
41+#if defined(RPM_VENDOR_POKY) 41+#if defined(RPM_VENDOR_OE)
42+ char * _gnu = NULL; 42+ char * _gnu = NULL;
43+ 43+
44+ addMacro(NULL, "_platform_cpu", NULL, cvog->cpu, -1); 44+ addMacro(NULL, "_platform_cpu", NULL, cvog->cpu, -1);
@@ -98,7 +98,7 @@ Index: rpm-5.4.9/python/rpmmodule.c
98 98
99-#if defined(RPM_VENDOR_WINDRIVER) 99-#if defined(RPM_VENDOR_WINDRIVER)
100- platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_gnu}", NULL); 100- platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_gnu}", NULL);
101+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) 101+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE)
102+ platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_host_gnu}%{!?_host_gnu:%{?_gnu}}", NULL); 102+ platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_host_gnu}%{!?_host_gnu:%{?_gnu}}", NULL);
103 #else 103 #else
104 platform = rpmExpand(arch, "-", "%{_vendor}", "-", "%{_os}", NULL); 104 platform = rpmExpand(arch, "-", "%{_vendor}", "-", "%{_os}", NULL);
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch b/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
index 8a9e712acf..f4e42287da 100644
--- a/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
+++ b/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
@@ -20,7 +20,7 @@ Index: rpm-5.4.9/lib/psm.c
20 int xx; 20 int xx;
21 int i; 21 int i;
22 22
23+#ifdef RPM_VENDOR_POKY 23+#ifdef RPM_VENDOR_OE
24+ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL); 24+ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
25+#endif 25+#endif
26+ 26+
@@ -41,7 +41,7 @@ Index: rpm-5.4.9/lib/psm.c
41+ argc = 0; 41+ argc = 0;
42+ } 42+ }
43+ 43+
44+#ifdef RPM_VENDOR_POKY 44+#ifdef RPM_VENDOR_OE
45+ if (scriptletWrapper && *scriptletWrapper) { 45+ if (scriptletWrapper && *scriptletWrapper) {
46+ argv[argc++] = scriptletWrapper; 46+ argv[argc++] = scriptletWrapper;
47+ argv[argc] = rpmtsRootDir(ts); 47+ argv[argc] = rpmtsRootDir(ts);
@@ -69,7 +69,7 @@ Index: rpm-5.4.9/lib/psm.c
69 if (rpmIsDebug() && 69 if (rpmIsDebug() &&
70- (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash"))) 70- (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash")))
71+ (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash")) 71+ (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash"))
72+#ifdef RPM_VENDOR_POKY 72+#ifdef RPM_VENDOR_OE
73+ || (scriptletWrapper && *scriptletWrapper && !strcmp(argv[1], "/bin/sh")) 73+ || (scriptletWrapper && *scriptletWrapper && !strcmp(argv[1], "/bin/sh"))
74+ || (scriptletWrapper && *scriptletWrapper && !strcmp(argv[1], "/bin/bash")) 74+ || (scriptletWrapper && *scriptletWrapper && !strcmp(argv[1], "/bin/bash"))
75+#endif 75+#endif
@@ -81,7 +81,7 @@ Index: rpm-5.4.9/lib/psm.c
81 81
82 { const char * rootDir = rpmtsRootDir(ts); 82 { const char * rootDir = rpmtsRootDir(ts);
83 if (!rpmtsChrootDone(ts) && rootDir != NULL && 83 if (!rpmtsChrootDone(ts) && rootDir != NULL &&
84+#ifdef RPM_VENDOR_POKY 84+#ifdef RPM_VENDOR_OE
85+ !(scriptletWrapper && *scriptletWrapper) && 85+ !(scriptletWrapper && *scriptletWrapper) &&
86+#endif 86+#endif
87 !(rootDir[0] == '/' && rootDir[1] == '\0')) 87 !(rootDir[0] == '/' && rootDir[1] == '\0'))
@@ -90,7 +90,7 @@ Index: rpm-5.4.9/lib/psm.c
90 xx = Chroot(rootDir); 90 xx = Chroot(rootDir);
91 /*@=modobserver@*/ 91 /*@=modobserver@*/
92 } 92 }
93+#ifdef RPM_VENDOR_POKY 93+#ifdef RPM_VENDOR_OE
94+ if (!rpmtsChrootDone(ts) && rootDir != NULL && 94+ if (!rpmtsChrootDone(ts) && rootDir != NULL &&
95+ (scriptletWrapper && *scriptletWrapper) && 95+ (scriptletWrapper && *scriptletWrapper) &&
96+ !(rootDir[0] == '/' && rootDir[1] == '\0')) 96+ !(rootDir[0] == '/' && rootDir[1] == '\0'))
@@ -105,7 +105,7 @@ Index: rpm-5.4.9/lib/psm.c
105 /* XXX running %verifyscript/%sanitycheck doesn't have psm->te */ 105 /* XXX running %verifyscript/%sanitycheck doesn't have psm->te */
106 { rpmtxn _parent = (psm && psm->te ? psm->te->txn : NULL); 106 { rpmtxn _parent = (psm && psm->te ? psm->te->txn : NULL);
107+ 107+
108+#ifdef RPM_VENDOR_POKY 108+#ifdef RPM_VENDOR_OE
109+ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL); 109+ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
110+ if (scriptletWrapper && *scriptletWrapper) 110+ if (scriptletWrapper && *scriptletWrapper)
111+ rc = rpmpsmNext(psm, PSM_CHROOT_OUT); 111+ rc = rpmpsmNext(psm, PSM_CHROOT_OUT);
@@ -118,7 +118,7 @@ Index: rpm-5.4.9/lib/psm.c
118 else 118 else
119 xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn); 119 xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn);
120 rpmtsGetRdb(ts)->db_txn = NULL; 120 rpmtsGetRdb(ts)->db_txn = NULL;
121+#ifdef RPM_VENDOR_POKY 121+#ifdef RPM_VENDOR_OE
122+ if (scriptletWrapper && *scriptletWrapper) 122+ if (scriptletWrapper && *scriptletWrapper)
123+ rc = rpmpsmNext(psm, PSM_CHROOT_IN); 123+ rc = rpmpsmNext(psm, PSM_CHROOT_IN);
124+#endif 124+#endif
@@ -126,13 +126,13 @@ Index: rpm-5.4.9/lib/psm.c
126 case PSM_TRIGGERS: 126 case PSM_TRIGGERS:
127 /* Run triggers in other package(s) this package sets off. */ 127 /* Run triggers in other package(s) this package sets off. */
128 if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST) break; 128 if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST) break;
129+#ifdef RPM_VENDOR_POKY 129+#ifdef RPM_VENDOR_OE
130+ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL); 130+ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
131+ if (scriptletWrapper && *scriptletWrapper) 131+ if (scriptletWrapper && *scriptletWrapper)
132+ rc = rpmpsmNext(psm, PSM_CHROOT_OUT); 132+ rc = rpmpsmNext(psm, PSM_CHROOT_OUT);
133+#endif 133+#endif
134 rc = runTriggers(psm); 134 rc = runTriggers(psm);
135+#ifdef RPM_VENDOR_POKY 135+#ifdef RPM_VENDOR_OE
136+ if (scriptletWrapper && *scriptletWrapper) 136+ if (scriptletWrapper && *scriptletWrapper)
137+ rc = rpmpsmNext(psm, PSM_CHROOT_IN); 137+ rc = rpmpsmNext(psm, PSM_CHROOT_IN);
138+#endif 138+#endif
@@ -143,14 +143,14 @@ Index: rpm-5.4.9/lib/psm.c
143 F_SET(psm, GOTTRIGGERS); 143 F_SET(psm, GOTTRIGGERS);
144 } 144 }
145 if (psm->triggers != NULL) 145 if (psm->triggers != NULL)
146+#ifdef RPM_VENDOR_POKY 146+#ifdef RPM_VENDOR_OE
147+ { 147+ {
148+ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL); 148+ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
149+ if (scriptletWrapper && *scriptletWrapper) 149+ if (scriptletWrapper && *scriptletWrapper)
150+ rc = rpmpsmNext(psm, PSM_CHROOT_OUT); 150+ rc = rpmpsmNext(psm, PSM_CHROOT_OUT);
151+#endif 151+#endif
152 rc = runImmedTriggers(psm); 152 rc = runImmedTriggers(psm);
153+#ifdef RPM_VENDOR_POKY 153+#ifdef RPM_VENDOR_OE
154+ if (scriptletWrapper && *scriptletWrapper) 154+ if (scriptletWrapper && *scriptletWrapper)
155+ rc = rpmpsmNext(psm, PSM_CHROOT_IN); 155+ rc = rpmpsmNext(psm, PSM_CHROOT_IN);
156+ } 156+ }