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:19:48 +0100 |
| commit | 0c7b4a5e23836889196f85f472f081d51529e94e (patch) | |
| tree | f300a95188e10f51ddd30f53ee2eff73e92d41ff /meta/recipes-devtools/rpm/rpm/rpm-db_buffer_small.patch | |
| parent | 04bb223110da2f92725c341bc3ec0cf26325f675 (diff) | |
| download | openembedded-core-contrib-0c7b4a5e23836889196f85f472f081d51529e94e.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.
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) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Index: rpm-5.4.9/rpmdb/rpmdb.c +Index: rpm-5.4.14/rpmdb/rpmdb.c =================================================================== ---- rpm-5.4.9.orig/rpmdb/rpmdb.c -+++ rpm-5.4.9/rpmdb/rpmdb.c -@@ -2212,8 +2212,12 @@ static int rpmmiGet(dbiIndex dbi, DBC * +--- rpm-5.4.14.orig/rpmdb/rpmdb.c ++++ rpm-5.4.14/rpmdb/rpmdb.c +@@ -2212,8 +2212,12 @@ static int rpmmiGet(dbiIndex dbi, DBC * vp->flags |= DB_DBT_USERMEM; rc = dbiGet(dbi, dbcursor, kp, vp, flags); if (rc == DB_BUFFER_SMALL) { @@ -36,7 +36,7 @@ Index: rpm-5.4.9/rpmdb/rpmdb.c if (uh == NULL || uh == (void *)-1) fprintf(stderr, "==> mmap(%p[%u], 0x%x, 0x%x, %d, 0x%x) error(%d): %s\n", -@@ -2235,6 +2239,25 @@ static int rpmmiGet(dbiIndex dbi, DBC * +@@ -2235,6 +2239,25 @@ static int rpmmiGet(dbiIndex dbi, DBC * if (munmap(uh, uhlen) != 0) fprintf(stderr, "==> munmap(%p[%u]) error(%d): %s\n", uh, (unsigned)uhlen, errno, strerror(errno)); @@ -62,11 +62,11 @@ Index: rpm-5.4.9/rpmdb/rpmdb.c } } } else -Index: rpm-5.4.9/rpmdb/db3.c +Index: rpm-5.4.14/rpmdb/db3.c =================================================================== ---- rpm-5.4.9.orig/rpmdb/db3.c -+++ rpm-5.4.9/rpmdb/db3.c -@@ -1452,7 +1452,7 @@ assert(db != NULL); +--- rpm-5.4.14.orig/rpmdb/db3.c ++++ rpm-5.4.14/rpmdb/db3.c +@@ -1509,7 +1509,7 @@ assert(db != NULL); #endif } |