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:20:12 +0100 |
commit | fe483ca37c33ebfe4c3e391244c47969e1560aeb (patch) | |
tree | 4b703d42ad5b4c22f9075463c013e562ab649345 /meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch | |
parent | 107ef516a6b5dc8f6e4606d30e8fa204d75f0b21 (diff) | |
download | poky-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/makefile-am-exec-hook.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch b/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch index 12f85b7fc9..8fab9eb42f 100644 --- a/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch +++ b/meta/recipes-devtools/rpm/rpm/makefile-am-exec-hook.patch | |||
@@ -18,9 +18,11 @@ Upstream-Status: Pending | |||
18 | 18 | ||
19 | Signed-off-by: Morgan Little <morgan.little@windriver.com> | 19 | Signed-off-by: Morgan Little <morgan.little@windriver.com> |
20 | 20 | ||
21 | --- a/lua/Makefile.am.orig | 21 | Index: rpm-5.4.14/lua/Makefile.am |
22 | +++ b/lua/Makefile.am | 22 | =================================================================== |
23 | @@ -320,7 +320,7 @@ | 23 | --- rpm-5.4.14.orig/lua/Makefile.am |
24 | +++ rpm-5.4.14/lua/Makefile.am | ||
25 | @@ -326,7 +326,7 @@ clean-local: | ||
24 | # XXX Build & install as rpmlua/rpmluac with hardlinks to lua/luac post install. | 26 | # XXX Build & install as rpmlua/rpmluac with hardlinks to lua/luac post install. |
25 | # XXX CVS has lua/luac sub-directories in the Attic that collide with the | 27 | # XXX CVS has lua/luac sub-directories in the Attic that collide with the |
26 | # XXX lua/luac executable names when using cvs update. | 28 | # XXX lua/luac executable names when using cvs update. |