diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2014-07-02 19:57:44 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-08 11:20:12 +0100 |
commit | fe483ca37c33ebfe4c3e391244c47969e1560aeb (patch) | |
tree | 4b703d42ad5b4c22f9075463c013e562ab649345 /meta/recipes-devtools/rpm/rpm/rpm-scriptletexechelper.patch | |
parent | 107ef516a6b5dc8f6e4606d30e8fa204d75f0b21 (diff) | |
download | poky-fe483ca37c33ebfe4c3e391244c47969e1560aeb.tar.gz |
rpm: Upgrade to 5.4.14
Update various patches. A few corrections to the patch descriptions,
otherwise simple quilt refresh or conflict resolution.
Remove rpm-solvedb.patch and rpm-respect-arch.patch. These are both related
to the old solvedb package dependency solver. This is no longer used since
we moved to smartpm.
rpm-stub-out-git_strerror was a backport and is no longer needed.
RPM 5.4.12 and newer normally requires Berkley DB 6.0 or newer. A small
patch to configure allows RPM to dynamically select DB 5.3 or DB 6.0 based
on what is available at configure time.
(From OE-Core rev: 0c7b4a5e23836889196f85f472f081d51529e94e)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | |||
12 | 12 | ||
13 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 13 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
14 | 14 | ||
15 | Index: rpm-5.4.9/lib/psm.c | 15 | Index: rpm-5.4.14/lib/psm.c |
16 | =================================================================== | 16 | =================================================================== |
17 | --- rpm-5.4.9.orig/lib/psm.c | 17 | --- rpm-5.4.14.orig/lib/psm.c |
18 | +++ rpm-5.4.9/lib/psm.c | 18 | +++ rpm-5.4.14/lib/psm.c |
19 | @@ -801,6 +801,10 @@ static rpmRC runScript(rpmpsm psm, Heade | 19 | @@ -806,6 +806,10 @@ static rpmRC runScript(rpmpsm psm, Heade |
20 | int xx; | 20 | int xx; |
21 | int i; | 21 | int i; |
22 | 22 | ||
@@ -27,7 +27,7 @@ Index: rpm-5.4.9/lib/psm.c | |||
27 | if (psm->sstates != NULL && ix >= 0 && ix < RPMSCRIPT_MAX) | 27 | if (psm->sstates != NULL && ix >= 0 && ix < RPMSCRIPT_MAX) |
28 | ssp = psm->sstates + ix; | 28 | ssp = psm->sstates + ix; |
29 | if (ssp != NULL) | 29 | if (ssp != NULL) |
30 | @@ -867,14 +871,29 @@ assert(he->p.str != NULL); | 30 | @@ -872,14 +876,29 @@ assert(he->p.str != NULL); |
31 | (F_ISSET(psm, UNORDERED) ? "a" : "")); | 31 | (F_ISSET(psm, UNORDERED) ? "a" : "")); |
32 | 32 | ||
33 | if (Phe->p.argv == NULL) { | 33 | if (Phe->p.argv == NULL) { |
@@ -63,7 +63,7 @@ Index: rpm-5.4.9/lib/psm.c | |||
63 | ldconfig_done = (ldconfig_path && !strcmp(argv[0], ldconfig_path) | 63 | ldconfig_done = (ldconfig_path && !strcmp(argv[0], ldconfig_path) |
64 | ? 1 : 0); | 64 | ? 1 : 0); |
65 | } | 65 | } |
66 | @@ -925,7 +944,12 @@ assert(he->p.str != NULL); | 66 | @@ -930,7 +949,12 @@ assert(he->p.str != NULL); |
67 | goto exit; | 67 | goto exit; |
68 | 68 | ||
69 | if (rpmIsDebug() && | 69 | if (rpmIsDebug() && |
@@ -77,7 +77,7 @@ Index: rpm-5.4.9/lib/psm.c | |||
77 | { | 77 | { |
78 | static const char set_x[] = "set -x\n"; | 78 | static const char set_x[] = "set -x\n"; |
79 | nw = Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); | 79 | nw = Fwrite(set_x, sizeof(set_x[0]), sizeof(set_x)-1, fd); |
80 | @@ -1060,12 +1084,22 @@ assert(he->p.str != NULL); | 80 | @@ -1065,12 +1089,22 @@ assert(he->p.str != NULL); |
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 && |
@@ -100,7 +100,7 @@ Index: rpm-5.4.9/lib/psm.c | |||
100 | xx = Chdir("/"); | 100 | xx = Chdir("/"); |
101 | rpmlog(RPMLOG_DEBUG, D_("%s: %s(%s)\texecv(%s) pid %d\n"), | 101 | rpmlog(RPMLOG_DEBUG, D_("%s: %s(%s)\texecv(%s) pid %d\n"), |
102 | psm->stepName, sln, NVRA, | 102 | psm->stepName, sln, NVRA, |
103 | @@ -2977,6 +3011,13 @@ assert(psm->te != NULL); | 103 | @@ -2985,6 +3019,13 @@ assert(psm->te != NULL); |
104 | case PSM_SCRIPT: /* Run current package scriptlets. */ | 104 | case PSM_SCRIPT: /* Run current package scriptlets. */ |
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); |
@@ -114,7 +114,7 @@ Index: rpm-5.4.9/lib/psm.c | |||
114 | xx = rpmtxnBegin(rpmtsGetRdb(ts), _parent, NULL); | 114 | xx = rpmtxnBegin(rpmtsGetRdb(ts), _parent, NULL); |
115 | rc = runInstScript(psm); | 115 | rc = runInstScript(psm); |
116 | if (rc) | 116 | if (rc) |
117 | @@ -2984,11 +3025,24 @@ assert(psm->te != NULL); | 117 | @@ -2992,11 +3033,24 @@ assert(psm->te != NULL); |
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; |
@@ -139,7 +139,7 @@ Index: rpm-5.4.9/lib/psm.c | |||
139 | break; | 139 | break; |
140 | case PSM_IMMED_TRIGGERS: | 140 | case PSM_IMMED_TRIGGERS: |
141 | /* Run triggers in this package other package(s) set off. */ | 141 | /* Run triggers in this package other package(s) set off. */ |
142 | @@ -2998,7 +3052,18 @@ assert(psm->te != NULL); | 142 | @@ -3006,7 +3060,18 @@ assert(psm->te != NULL); |
143 | F_SET(psm, GOTTRIGGERS); | 143 | F_SET(psm, GOTTRIGGERS); |
144 | } | 144 | } |
145 | if (psm->triggers != NULL) | 145 | if (psm->triggers != NULL) |