diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch b/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch index 8a9e712..f4e4228 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 int xx; int i; -+#ifdef RPM_VENDOR_POKY ++#ifdef RPM_VENDOR_OE + const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL); +#endif + @@ -41,7 +41,7 @@ Index: rpm-5.4.9/lib/psm.c + argc = 0; + } + -+#ifdef RPM_VENDOR_POKY ++#ifdef RPM_VENDOR_OE + if (scriptletWrapper && *scriptletWrapper) { + argv[argc++] = scriptletWrapper; + argv[argc] = rpmtsRootDir(ts); @@ -69,7 +69,7 @@ Index: rpm-5.4.9/lib/psm.c if (rpmIsDebug() && - (!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/bash")) +#endif @@ -81,7 +81,7 @@ Index: rpm-5.4.9/lib/psm.c { const char * rootDir = rpmtsRootDir(ts); if (!rpmtsChrootDone(ts) && rootDir != NULL && -+#ifdef RPM_VENDOR_POKY ++#ifdef RPM_VENDOR_OE + !(scriptletWrapper && *scriptletWrapper) && +#endif !(rootDir[0] == '/' && rootDir[1] == '\0')) @@ -90,7 +90,7 @@ Index: rpm-5.4.9/lib/psm.c xx = Chroot(rootDir); /*@=modobserver@*/ } -+#ifdef RPM_VENDOR_POKY ++#ifdef RPM_VENDOR_OE + if (!rpmtsChrootDone(ts) && rootDir != NULL && + (scriptletWrapper && *scriptletWrapper) && + !(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 */ { 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); + if (scriptletWrapper && *scriptletWrapper) + rc = rpmpsmNext(psm, PSM_CHROOT_OUT); @@ -118,7 +118,7 @@ Index: rpm-5.4.9/lib/psm.c else xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn); rpmtsGetRdb(ts)->db_txn = NULL; -+#ifdef RPM_VENDOR_POKY ++#ifdef RPM_VENDOR_OE + if (scriptletWrapper && *scriptletWrapper) + rc = rpmpsmNext(psm, PSM_CHROOT_IN); +#endif @@ -126,13 +126,13 @@ Index: rpm-5.4.9/lib/psm.c case PSM_TRIGGERS: /* Run triggers in other package(s) this package sets off. */ if (rpmtsFlags(ts) & RPMTRANS_FLAG_TEST) break; -+#ifdef RPM_VENDOR_POKY ++#ifdef RPM_VENDOR_OE + const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL); + if (scriptletWrapper && *scriptletWrapper) + rc = rpmpsmNext(psm, PSM_CHROOT_OUT); +#endif rc = runTriggers(psm); -+#ifdef RPM_VENDOR_POKY ++#ifdef RPM_VENDOR_OE + if (scriptletWrapper && *scriptletWrapper) + rc = rpmpsmNext(psm, PSM_CHROOT_IN); +#endif @@ -143,14 +143,14 @@ Index: rpm-5.4.9/lib/psm.c F_SET(psm, GOTTRIGGERS); } if (psm->triggers != NULL) -+#ifdef RPM_VENDOR_POKY ++#ifdef RPM_VENDOR_OE + { + const char * scriptletWrapper = rpmExpand("%{?_cross_scriptlet_wrapper}", NULL); + if (scriptletWrapper && *scriptletWrapper) + rc = rpmpsmNext(psm, PSM_CHROOT_OUT); +#endif rc = runImmedTriggers(psm); -+#ifdef RPM_VENDOR_POKY ++#ifdef RPM_VENDOR_OE + if (scriptletWrapper && *scriptletWrapper) + rc = rpmpsmNext(psm, PSM_CHROOT_IN); + } |
