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/rpm-lua.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/rpm-lua.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-lua.patch | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-lua.patch b/meta/recipes-devtools/rpm/rpm/rpm-lua.patch index 348a9198dd..a9930d6705 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-lua.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-lua.patch | |||
| @@ -4,10 +4,11 @@ Upstream-Status: Pending | |||
| 4 | 4 | ||
| 5 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 5 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 6 | 6 | ||
| 7 | diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac | 7 | Index: rpm-5.4.14/configure.ac |
| 8 | --- rpm-5.4.9.orig/configure.ac 2012-05-16 12:16:36.589813548 -0500 | 8 | =================================================================== |
| 9 | +++ rpm-5.4.9/configure.ac 2012-05-16 12:26:01.070813518 -0500 | 9 | --- rpm-5.4.14.orig/configure.ac |
| 10 | @@ -120,6 +120,9 @@ | 10 | +++ rpm-5.4.14/configure.ac |
| 11 | @@ -121,6 +121,9 @@ AC_PROG_YACC | ||
| 11 | 12 | ||
| 12 | AC_PATH_PROG(AS, as, as) | 13 | AC_PATH_PROG(AS, as, as) |
| 13 | 14 | ||
| @@ -17,10 +18,11 @@ diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac | |||
| 17 | dnl # GCC specifics | 18 | dnl # GCC specifics |
| 18 | AC_PROG_GCC_TRADITIONAL | 19 | AC_PROG_GCC_TRADITIONAL |
| 19 | AC_ARG_ENABLE(build-pic, | 20 | AC_ARG_ENABLE(build-pic, |
| 20 | diff -ur rpm-5.4.9.orig/lua/Makefile.am rpm-5.4.9/lua/Makefile.am | 21 | Index: rpm-5.4.14/lua/Makefile.am |
| 21 | --- rpm-5.4.9.orig/lua/Makefile.am 2012-04-07 19:15:25.000000000 -0500 | 22 | =================================================================== |
| 22 | +++ rpm-5.4.9/lua/Makefile.am 2012-05-16 12:26:19.556856688 -0500 | 23 | --- rpm-5.4.14.orig/lua/Makefile.am |
| 23 | @@ -40,7 +40,7 @@ | 24 | +++ rpm-5.4.14/lua/Makefile.am |
| 25 | @@ -41,7 +41,7 @@ rpmluac_LDADD = liblua.la | ||
| 24 | 26 | ||
| 25 | # --- bin2c doesn't need anything but a compiler | 27 | # --- bin2c doesn't need anything but a compiler |
| 26 | bin2c$(EXEEXT): bin2c.c | 28 | bin2c$(EXEEXT): bin2c.c |