mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

rpm: Change references from RPM_VENDOR_POKY to RPM_VENDOR_OE

Browse Source 
Change the #define references to match RPM_VENDOR_OE.

(From OE-Core rev: a84ecc5ad158a7529a904785de25ebfedf5767a7)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mark Hatle
2013-08-09 17:51:29 -05:00
committed by Richard Purdie
parent 5bac0df201
commit bef0aabeab
6 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch
+2 -2
View File
@@ -17,7 +17,7 @@ Index: rpm-5.4.9/python/rpmmodule.c
REGISTER_ENUM(RPMSENSE_NOTEQUAL); REGISTER_ENUM(RPMSENSE_NOTEQUAL);
REGISTER_ENUM(RPMSENSE_FIND_REQUIRES); REGISTER_ENUM(RPMSENSE_FIND_REQUIRES);
-#if defined(RPM_VENDOR_MANDRIVA) -#if defined(RPM_VENDOR_MANDRIVA)
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE)
REGISTER_ENUM(RPMSENSE_PREREQ); REGISTER_ENUM(RPMSENSE_PREREQ);
REGISTER_ENUM(RPMSENSE_SCRIPT_PRE); REGISTER_ENUM(RPMSENSE_SCRIPT_PRE);
REGISTER_ENUM(RPMSENSE_SCRIPT_POST); REGISTER_ENUM(RPMSENSE_SCRIPT_POST);
@@ -26,7 +26,7 @@ Index: rpm-5.4.9/python/rpmmodule.c
+ REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN); + REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN);
+#endif +#endif
+ +
+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) +#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE)
+ REGISTER_ENUM(RPMSENSE_MISSINGOK); + REGISTER_ENUM(RPMSENSE_MISSINGOK);
#endif #endif
meta/recipes-devtools/rpm/rpm/rpm-no-loopmsg.patch
+1 -1
View File
@@ -12,7 +12,7 @@ diff -urN rpm-5.4.0.orig/lib/order.c rpm-5.4.0/lib/order.c
rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS)) rpmlogLvl msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS))
? RPMLOG_WARNING : RPMLOG_ERR; ? RPMLOG_WARNING : RPMLOG_ERR;
-#if defined(RPM_VENDOR_MANDRIVA) /* loop-detection-optional-loglevel */ -#if defined(RPM_VENDOR_MANDRIVA) /* loop-detection-optional-loglevel */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_POKY) /* loop-detection-optional-loglevel */ +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_OE) /* loop-detection-optional-loglevel */
// Report loops as debug-level message by default (7 = RPMLOG_DEBUG), overridable // Report loops as debug-level message by default (7 = RPMLOG_DEBUG), overridable
msglvl = rpmExpandNumeric("%{?_loop_detection_loglevel}%{?!_loop_detection_loglevel:7}"); msglvl = rpmExpandNumeric("%{?_loop_detection_loglevel}%{?!_loop_detection_loglevel:7}");
#endif #endif
meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch
+1 -1
View File
@@ -12,7 +12,7 @@ index e676601..9140bbe 100644
#endif #endif
} }
+#if !defined(RPM_VENDOR_POKY) /* Skip the explicit-platform */ +#if !defined(RPM_VENDOR_OE) /* Skip the explicit-platform */
#if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */ #if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */
/* do not use vendor and GNU attribution */ /* do not use vendor and GNU attribution */
p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL); p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL);
meta/recipes-devtools/rpm/rpm/rpm-platform.patch
+4 -4
View File
@@ -14,7 +14,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c
} }
-#if defined(RPM_VENDOR_WINDRIVER) -#if defined(RPM_VENDOR_WINDRIVER)
+#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_POKY) +#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_OE)
/* /*
* If we're capable of installing multiple colors * If we're capable of installing multiple colors
* but at least one of the packages are white (0), we * 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
} }
-#if defined(RPM_VENDOR_WINDRIVER) -#if defined(RPM_VENDOR_WINDRIVER)
+#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_POKY) +#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_OE)
/* Is "compat" compatible w/ arch? */ /* Is "compat" compatible w/ arch? */
int _isCompatibleArch(const char * arch, const char * compat) int _isCompatibleArch(const char * arch, const char * compat)
{ {
@@ -32,7 +32,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c
if (arch == NULL || (parch = rpmteA(p)) == NULL) if (arch == NULL || (parch = rpmteA(p)) == NULL)
continue; continue;
-#if defined(RPM_VENDOR_WINDRIVER) -#if defined(RPM_VENDOR_WINDRIVER)
+#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_POKY) +#if defined(RPM_VENDOR_WINDRIVER) && !defined(RPM_VENDOR_OE)
/* XXX hackery for alias matching. */ /* XXX hackery for alias matching. */
if (!_isCompatibleArch(arch, parch)) if (!_isCompatibleArch(arch, parch))
continue; continue;
@@ -40,7 +40,7 @@ diff -ur rpm-5.4.0.orig/lib/depends.c rpm-5.4.0/lib/depends.c
return rc; return rc;
} }
+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) +#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE)
+#define _ETC_RPM_SYSINFO "%{_etcrpm}/sysinfo" +#define _ETC_RPM_SYSINFO "%{_etcrpm}/sysinfo"
+#else +#else
+#define _ETC_RPM_SYSINFO SYSCONFIGDIR "/sysinfo" +#define _ETC_RPM_SYSINFO SYSCONFIGDIR "/sysinfo"
meta/recipes-devtools/rpm/rpm/rpm-platform2.patch
+3 -3
View File
@@ -22,7 +22,7 @@ Index: rpm-5.4.9/lib/rpmrc.c
{ {
-#if defined(RPM_VENDOR_WINDRIVER) -#if defined(RPM_VENDOR_WINDRIVER)
+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) +#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE)
addMacro(NULL, "_usrlibrpm", NULL, __usrlibrpm, RMIL_DEFAULT); addMacro(NULL, "_usrlibrpm", NULL, __usrlibrpm, RMIL_DEFAULT);
addMacro(NULL, "_etcrpm", NULL, __etcrpm, RMIL_DEFAULT); addMacro(NULL, "_etcrpm", NULL, __etcrpm, RMIL_DEFAULT);
addMacro(NULL, "_vendor", NULL, "%{?_host_vendor}%{!?_host_vendor:wrs}", RMIL_DEFAULT); addMacro(NULL, "_vendor", NULL, "%{?_host_vendor}%{!?_host_vendor:wrs}", RMIL_DEFAULT);
@@ -38,7 +38,7 @@ Index: rpm-5.4.9/lib/rpmrc.c
} }
if (!parseCVOG(p, &cvog) && cvog != NULL) { if (!parseCVOG(p, &cvog) && cvog != NULL) {
+#if defined(RPM_VENDOR_POKY) +#if defined(RPM_VENDOR_OE)
+ char * _gnu = NULL; + char * _gnu = NULL;
+ +
+ addMacro(NULL, "_platform_cpu", NULL, cvog->cpu, -1); + addMacro(NULL, "_platform_cpu", NULL, cvog->cpu, -1);
@@ -98,7 +98,7 @@ Index: rpm-5.4.9/python/rpmmodule.c
-#if defined(RPM_VENDOR_WINDRIVER) -#if defined(RPM_VENDOR_WINDRIVER)
- platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_gnu}", NULL); - platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_gnu}", NULL);
+#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_POKY) +#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE)
+ platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_host_gnu}%{!?_host_gnu:%{?_gnu}}", NULL); + platform = rpmExpand(arch, "-%{_host_vendor}", "-%{_host_os}%{?_host_gnu}%{!?_host_gnu:%{?_gnu}}", NULL);
#else #else
platform = rpmExpand(arch, "-", "%{_vendor}", "-", "%{_os}", NULL); platform = rpmExpand(arch, "-", "%{_vendor}", "-", "%{_os}", NULL);
meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch
+11 -11
View File
@@ -20,7 +20,7 @@ Index: rpm-5.4.9/lib/psm.c
int xx; int xx;
int i; int i;
+#ifdef RPM_VENDOR_POKY +#ifdef RPM_VENDOR_OE
+ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL); + const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
+#endif +#endif
+ +
@@ -41,7 +41,7 @@ Index: rpm-5.4.9/lib/psm.c
+ argc = 0; + argc = 0;
+ } + }
+ +
+#ifdef RPM_VENDOR_POKY +#ifdef RPM_VENDOR_OE
+ if (scriptletWrapper && *scriptletWrapper) { + if (scriptletWrapper && *scriptletWrapper) {
+ argv[argc++] = scriptletWrapper; + argv[argc++] = scriptletWrapper;
+ argv[argc] = rpmtsRootDir(ts); + argv[argc] = rpmtsRootDir(ts);
@@ -69,7 +69,7 @@ Index: rpm-5.4.9/lib/psm.c
if (rpmIsDebug() && if (rpmIsDebug() &&
- (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash"))) - (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash")))
+ (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash")) + (!strcmp(argv[0], "/bin/sh") || !strcmp(argv[0], "/bin/bash"))
+#ifdef RPM_VENDOR_POKY +#ifdef RPM_VENDOR_OE
+ || (scriptletWrapper && *scriptletWrapper && !strcmp(argv[1], "/bin/sh")) + || (scriptletWrapper && *scriptletWrapper && !strcmp(argv[1], "/bin/sh"))
+ || (scriptletWrapper && *scriptletWrapper && !strcmp(argv[1], "/bin/bash")) + || (scriptletWrapper && *scriptletWrapper && !strcmp(argv[1], "/bin/bash"))
+#endif +#endif
@@ -81,7 +81,7 @@ Index: rpm-5.4.9/lib/psm.c
{ const char * rootDir = rpmtsRootDir(ts); { const char * rootDir = rpmtsRootDir(ts);
if (!rpmtsChrootDone(ts) && rootDir != NULL && if (!rpmtsChrootDone(ts) && rootDir != NULL &&
+#ifdef RPM_VENDOR_POKY +#ifdef RPM_VENDOR_OE
+ !(scriptletWrapper && *scriptletWrapper) && + !(scriptletWrapper && *scriptletWrapper) &&
+#endif +#endif
!(rootDir[0] == '/' && rootDir[1] == '\0')) !(rootDir[0] == '/' && rootDir[1] == '\0'))
@@ -90,7 +90,7 @@ Index: rpm-5.4.9/lib/psm.c
xx = Chroot(rootDir); xx = Chroot(rootDir);
/*@=modobserver@*/ /*@=modobserver@*/
} }
+#ifdef RPM_VENDOR_POKY +#ifdef RPM_VENDOR_OE
+ if (!rpmtsChrootDone(ts) && rootDir != NULL && + if (!rpmtsChrootDone(ts) && rootDir != NULL &&
+ (scriptletWrapper && *scriptletWrapper) && + (scriptletWrapper && *scriptletWrapper) &&
+ !(rootDir[0] == '/' && rootDir[1] == '\0')) + !(rootDir[0] == '/' && rootDir[1] == '\0'))
@@ -105,7 +105,7 @@ Index: rpm-5.4.9/lib/psm.c
/* XXX running %verifyscript/%sanitycheck doesn't have psm->te */ /* XXX running %verifyscript/%sanitycheck doesn't have psm->te */
{ rpmtxn _parent = (psm && psm->te ? psm->te->txn : NULL); { rpmtxn _parent = (psm && psm->te ? psm->te->txn : NULL);
+ +
+#ifdef RPM_VENDOR_POKY +#ifdef RPM_VENDOR_OE
+ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL); + const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
+ if (scriptletWrapper && *scriptletWrapper) + if (scriptletWrapper && *scriptletWrapper)
+ rc = rpmpsmNext(psm, PSM_CHROOT_OUT); + rc = rpmpsmNext(psm, PSM_CHROOT_OUT);
@@ -118,7 +118,7 @@ Index: rpm-5.4.9/lib/psm.c
else else
xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn); xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn);
rpmtsGetRdb(ts)->db_txn = NULL; rpmtsGetRdb(ts)->db_txn = NULL;
+#ifdef RPM_VENDOR_POKY +#ifdef RPM_VENDOR_OE
+ if (scriptletWrapper && *scriptletWrapper) + if (scriptletWrapper && *scriptletWrapper)
+ rc = rpmpsmNext(psm, PSM_CHROOT_IN); + rc = rpmpsmNext(psm, PSM_CHROOT_IN);
+#endif +#endif
@@ -126,13 +126,13 @@ Index: rpm-5.4.9/lib/psm.c
case PSM_TRIGGERS: case PSM_TRIGGERS:
/* Run triggers in other package(s) this package sets off. */ /* Run triggers in other package(s) this package sets off. */
if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST) break; if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST) break;
+#ifdef RPM_VENDOR_POKY +#ifdef RPM_VENDOR_OE
+ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL); + const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
+ if (scriptletWrapper && *scriptletWrapper) + if (scriptletWrapper && *scriptletWrapper)
+ rc = rpmpsmNext(psm, PSM_CHROOT_OUT); + rc = rpmpsmNext(psm, PSM_CHROOT_OUT);
+#endif +#endif
rc = runTriggers(psm); rc = runTriggers(psm);
+#ifdef RPM_VENDOR_POKY +#ifdef RPM_VENDOR_OE
+ if (scriptletWrapper && *scriptletWrapper) + if (scriptletWrapper && *scriptletWrapper)
+ rc = rpmpsmNext(psm, PSM_CHROOT_IN); + rc = rpmpsmNext(psm, PSM_CHROOT_IN);
+#endif +#endif
@@ -143,14 +143,14 @@ Index: rpm-5.4.9/lib/psm.c
F_SET(psm, GOTTRIGGERS); F_SET(psm, GOTTRIGGERS);
} }
if (psm->triggers != NULL) if (psm->triggers != NULL)
+#ifdef RPM_VENDOR_POKY +#ifdef RPM_VENDOR_OE
+ { + {
+ const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL); + const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL);
+ if (scriptletWrapper && *scriptletWrapper) + if (scriptletWrapper && *scriptletWrapper)
+ rc = rpmpsmNext(psm, PSM_CHROOT_OUT); + rc = rpmpsmNext(psm, PSM_CHROOT_OUT);
+#endif +#endif
rc = runImmedTriggers(psm); rc = runImmedTriggers(psm);
+#ifdef RPM_VENDOR_POKY +#ifdef RPM_VENDOR_OE
+ if (scriptletWrapper && *scriptletWrapper) + if (scriptletWrapper && *scriptletWrapper)
+ rc = rpmpsmNext(psm, PSM_CHROOT_IN); + rc = rpmpsmNext(psm, PSM_CHROOT_IN);
+ } + }