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-db_buffer_small.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-db_buffer_small.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch b/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch index 59022f4e63..16b8e30a1d 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch | |||
@@ -18,11 +18,11 @@ Upstream-Status: Inappropriate (workaround) | |||
18 | 18 | ||
19 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 19 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
20 | 20 | ||
21 | Index: rpm-5.4.9/rpmdb/rpmdb.c | 21 | Index: rpm-5.4.14/rpmdb/rpmdb.c |
22 | =================================================================== | 22 | =================================================================== |
23 | --- rpm-5.4.9.orig/rpmdb/rpmdb.c | 23 | --- rpm-5.4.14.orig/rpmdb/rpmdb.c |
24 | +++ rpm-5.4.9/rpmdb/rpmdb.c | 24 | +++ rpm-5.4.14/rpmdb/rpmdb.c |
25 | @@ -2212,8 +2212,12 @@ static int rpmmiGet(dbiIndex dbi, DBC * | 25 | @@ -2212,8 +2212,12 @@ static int rpmmiGet(dbiIndex dbi, DBC * |
26 | vp->flags |= DB_DBT_USERMEM; | 26 | vp->flags |= DB_DBT_USERMEM; |
27 | rc = dbiGet(dbi, dbcursor, kp, vp, flags); | 27 | rc = dbiGet(dbi, dbcursor, kp, vp, flags); |
28 | if (rc == DB_BUFFER_SMALL) { | 28 | if (rc == DB_BUFFER_SMALL) { |
@@ -36,7 +36,7 @@ Index: rpm-5.4.9/rpmdb/rpmdb.c | |||
36 | if (uh == NULL || uh == (void *)-1) | 36 | if (uh == NULL || uh == (void *)-1) |
37 | fprintf(stderr, | 37 | fprintf(stderr, |
38 | "==> mmap(%p[%u], 0x%x, 0x%x, %d, 0x%x) error(%d): %s\n", | 38 | "==> mmap(%p[%u], 0x%x, 0x%x, %d, 0x%x) error(%d): %s\n", |
39 | @@ -2235,6 +2239,25 @@ static int rpmmiGet(dbiIndex dbi, DBC * | 39 | @@ -2235,6 +2239,25 @@ static int rpmmiGet(dbiIndex dbi, DBC * |
40 | if (munmap(uh, uhlen) != 0) | 40 | if (munmap(uh, uhlen) != 0) |
41 | fprintf(stderr, "==> munmap(%p[%u]) error(%d): %s\n", | 41 | fprintf(stderr, "==> munmap(%p[%u]) error(%d): %s\n", |
42 | uh, (unsigned)uhlen, errno, strerror(errno)); | 42 | uh, (unsigned)uhlen, errno, strerror(errno)); |
@@ -62,11 +62,11 @@ Index: rpm-5.4.9/rpmdb/rpmdb.c | |||
62 | } | 62 | } |
63 | } | 63 | } |
64 | } else | 64 | } else |
65 | Index: rpm-5.4.9/rpmdb/db3.c | 65 | Index: rpm-5.4.14/rpmdb/db3.c |
66 | =================================================================== | 66 | =================================================================== |
67 | --- rpm-5.4.9.orig/rpmdb/db3.c | 67 | --- rpm-5.4.14.orig/rpmdb/db3.c |
68 | +++ rpm-5.4.9/rpmdb/db3.c | 68 | +++ rpm-5.4.14/rpmdb/db3.c |
69 | @@ -1452,7 +1452,7 @@ assert(db != NULL); | 69 | @@ -1509,7 +1509,7 @@ assert(db != NULL); |
70 | #endif | 70 | #endif |
71 | } | 71 | } |
72 | 72 | ||