diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch b/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch index f4e42287da..f825372e82 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch @@ -12,11 +12,11 @@ Upstream-Status: Pending Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Index: rpm-5.4.9/lib/psm.c +Index: rpm-5.4.14/lib/psm.c =================================================================== ---- rpm-5.4.9.orig/lib/psm.c -+++ rpm-5.4.9/lib/psm.c -@@ -801,6 +801,10 @@ static rpmRC runScript(rpmpsm psm, Heade +--- rpm-5.4.14.orig/lib/psm.c ++++ rpm-5.4.14/lib/psm.c +@@ -806,6 +806,10 @@ static rpmRC runScript(rpmpsm psm, Heade int xx; int i; @@ -27,7 +27,7 @@ Index: rpm-5.4.9/lib/psm.c if (psm->sstates != NULL && ix >= 0 && ix < RPMSCRIPT_MAX) ssp = psm->sstates + ix; if (ssp != NULL) -@@ -867,14 +871,29 @@ assert(he->p.str != NULL); +@@ -872,14 +876,29 @@ assert(he->p.str != NULL); (F_ISSET(psm, UNORDERED) ? "a" : "")); if (Phe->p.argv == NULL) { @@ -63,7 +63,7 @@ Index: rpm-5.4.9/lib/psm.c ldconfig_done = (ldconfig_path && !strcmp(argv[0], ldconfig_path) ? 1 : 0); } -@@ -925,7 +944,12 @@ assert(he->p.str != NULL); +@@ -930,7 +949,12 @@ assert(he->p.str != NULL); goto exit; if (rpmIsDebug() && @@ -77,7 +77,7 @@ Index: rpm-5.4.9/lib/psm.c { static const char set_x[] = "set -x\n"; nw = Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); -@@ -1060,12 +1084,22 @@ assert(he->p.str != NULL); +@@ -1065,12 +1089,22 @@ assert(he->p.str != NULL); { const char * rootDir = rpmtsRootDir(ts); if (!rpmtsChrootDone(ts) && rootDir != NULL && @@ -100,7 +100,7 @@ Index: rpm-5.4.9/lib/psm.c xx = Chdir("/"); rpmlog(RPMLOG_DEBUG, D_("%s: %s(%s)\texecv(%s) pid %d\n"), psm->stepName, sln, NVRA, -@@ -2977,6 +3011,13 @@ assert(psm->te != NULL); +@@ -2985,6 +3019,13 @@ assert(psm->te != NULL); case PSM_SCRIPT: /* Run current package scriptlets. */ /* XXX running %verifyscript/%sanitycheck doesn't have psm->te */ { rpmtxn _parent = (psm && psm->te ? psm->te->txn : NULL); @@ -114,7 +114,7 @@ Index: rpm-5.4.9/lib/psm.c xx = rpmtxnBegin(rpmtsGetRdb(ts), _parent, NULL); rc = runInstScript(psm); if (rc) -@@ -2984,11 +3025,24 @@ assert(psm->te != NULL); +@@ -2992,11 +3033,24 @@ assert(psm->te != NULL); else xx = rpmtxnCommit(rpmtsGetRdb(ts)->db_txn); rpmtsGetRdb(ts)->db_txn = NULL; @@ -139,7 +139,7 @@ Index: rpm-5.4.9/lib/psm.c break; case PSM_IMMED_TRIGGERS: /* Run triggers in this package other package(s) set off. */ -@@ -2998,7 +3052,18 @@ assert(psm->te != NULL); +@@ -3006,7 +3060,18 @@ assert(psm->te != NULL); F_SET(psm, GOTTRIGGERS); } if (psm->triggers != NULL) |