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-uuid-include.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-uuid-include.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-uuid-include.patch | 15 |
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 Signed-off-by: Morgan Little <morgan.little@windriver.com> ---- 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 <morgan.little@windriver.com> /* Lua method: <uuid> = uuid.generate(<version>[, <uuid-namespace>, <data>]) */ 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 <morgan.little@windriver.com> +#include <ossp/uuid.h> #endif #include "debug.h" - + |