summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2014-07-02 19:57:44 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-08 11:20:12 +0100
commitfe483ca37c33ebfe4c3e391244c47969e1560aeb (patch)
tree4b703d42ad5b4c22f9075463c013e562ab649345 /meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch
parent107ef516a6b5dc8f6e4606d30e8fa204d75f0b21 (diff)
downloadpoky-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-uuid-include.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch15
1 files changed, 9 insertions, 6 deletions
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
12Signed-off-by: Morgan Little <morgan.little@windriver.com> 12Signed-off-by: Morgan Little <morgan.little@windriver.com>
13 13
14 14
15--- a/lua/local/luuid.c.orig 15Index: rpm-5.4.14/lua/local/luuid.c
16+++ b/lua/local/luuid.c 16===================================================================
17--- rpm-5.4.14.orig/lua/local/luuid.c
18+++ rpm-5.4.14/lua/local/luuid.c
17@@ -21,7 +21,7 @@ 19@@ -21,7 +21,7 @@
18 20
19 #ifdef LUA_USE_UUID 21 #ifdef LUA_USE_UUID
@@ -23,9 +25,10 @@ Signed-off-by: Morgan Little <morgan.little@windriver.com>
23 25
24 /* Lua method: <uuid> = uuid.generate(<version>[, <uuid-namespace>, <data>]) */ 26 /* Lua method: <uuid> = uuid.generate(<version>[, <uuid-namespace>, <data>]) */
25 static int luuid_generate(lua_State *L) 27 static int luuid_generate(lua_State *L)
26 28Index: rpm-5.4.14/rpmio/rpmuuid.c
27--- a/rpmio/rpmuuid.c.orig 29===================================================================
28+++ b/rpmio/rpmuuid.c 30--- rpm-5.4.14.orig/rpmio/rpmuuid.c
31+++ rpm-5.4.14/rpmio/rpmuuid.c
29@@ -16,7 +16,7 @@ 32@@ -16,7 +16,7 @@
30 #include "rpmlog.h" 33 #include "rpmlog.h"
31 #include "rpmuuid.h" 34 #include "rpmuuid.h"
@@ -34,4 +37,4 @@ Signed-off-by: Morgan Little <morgan.little@windriver.com>
34+#include <ossp/uuid.h> 37+#include <ossp/uuid.h>
35 #endif 38 #endif
36 #include "debug.h" 39 #include "debug.h"
37 40