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 --- meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch') diff --git a/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch b/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch index 600e2c280c..713f84ee27 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch @@ -12,8 +12,10 @@ Upstream-Status: Pending Signed-off-by: Morgan Little ---- a/lua/local/luuid.c.orig -+++ b/lua/local/luuid.c +Index: rpm-5.4.14/lua/local/luuid.c +=================================================================== +--- rpm-5.4.14.orig/lua/local/luuid.c ++++ rpm-5.4.14/lua/local/luuid.c @@ -21,7 +21,7 @@ #ifdef LUA_USE_UUID @@ -23,9 +25,10 @@ Signed-off-by: Morgan Little /* Lua method: = uuid.generate([, , ]) */ static int luuid_generate(lua_State *L) - ---- a/rpmio/rpmuuid.c.orig -+++ b/rpmio/rpmuuid.c +Index: rpm-5.4.14/rpmio/rpmuuid.c +=================================================================== +--- rpm-5.4.14.orig/rpmio/rpmuuid.c ++++ rpm-5.4.14/rpmio/rpmuuid.c @@ -16,7 +16,7 @@ #include "rpmlog.h" #include "rpmuuid.h" @@ -34,4 +37,4 @@ Signed-off-by: Morgan Little +#include #endif #include "debug.h" - + -- cgit v1.2.3-54-g00ecf