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/debugedit-valid-file-to-fix-segment-fault.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/debugedit-valid-file-to-fix-segment-fault.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch b/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch index 2696cd3168..f7c31006b4 100644 --- a/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch +++ b/meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch @@ -20,10 +20,11 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> tools/debugedit.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -diff --git a/tools/debugedit.c b/tools/debugedit.c ---- a/tools/debugedit.c -+++ b/tools/debugedit.c -@@ -1512,6 +1512,28 @@ handle_build_id (DSO *dso, Elf_Data *build_id, +Index: rpm-5.4.14/tools/debugedit.c +=================================================================== +--- rpm-5.4.14.orig/tools/debugedit.c ++++ rpm-5.4.14/tools/debugedit.c +@@ -1525,6 +1525,28 @@ handle_build_id (DSO *dso, Elf_Data *bui } } @@ -52,7 +53,7 @@ diff --git a/tools/debugedit.c b/tools/debugedit.c int main (int argc, char *argv[]) { -@@ -1608,6 +1630,9 @@ main (int argc, char *argv[]) +@@ -1621,6 +1643,9 @@ main (int argc, char *argv[]) exit (1); } @@ -62,6 +63,3 @@ diff --git a/tools/debugedit.c b/tools/debugedit.c dso = fdopen_dso (fd, file); if (dso == NULL) exit (1); --- -1.8.1.2 - |