From fe483ca37c33ebfe4c3e391244c47969e1560aeb Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Wed, 2 Jul 2014 19:57:44 -0500 Subject: 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 Signed-off-by: Richard Purdie --- .../rpm/debugedit-valid-file-to-fix-segment-fault.patch | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'meta/recipes-devtools/rpm/rpm/debugedit-valid-file-to-fix-segment-fault.patch') 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 2696cd3..f7c3100 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 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 - -- cgit v1.1