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-lua.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-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 Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac ---- rpm-5.4.9.orig/configure.ac 2012-05-16 12:16:36.589813548 -0500 -+++ rpm-5.4.9/configure.ac 2012-05-16 12:26:01.070813518 -0500 -@@ -120,6 +120,9 @@ +Index: rpm-5.4.14/configure.ac +=================================================================== +--- rpm-5.4.14.orig/configure.ac ++++ rpm-5.4.14/configure.ac +@@ -121,6 +121,9 @@ AC_PROG_YACC AC_PATH_PROG(AS, as, as) @@ -17,10 +18,11 @@ diff -ur rpm-5.4.9.orig/configure.ac rpm-5.4.9/configure.ac dnl # GCC specifics AC_PROG_GCC_TRADITIONAL AC_ARG_ENABLE(build-pic, -diff -ur rpm-5.4.9.orig/lua/Makefile.am rpm-5.4.9/lua/Makefile.am ---- rpm-5.4.9.orig/lua/Makefile.am 2012-04-07 19:15:25.000000000 -0500 -+++ rpm-5.4.9/lua/Makefile.am 2012-05-16 12:26:19.556856688 -0500 -@@ -40,7 +40,7 @@ +Index: rpm-5.4.14/lua/Makefile.am +=================================================================== +--- rpm-5.4.14.orig/lua/Makefile.am ++++ rpm-5.4.14/lua/Makefile.am +@@ -41,7 +41,7 @@ rpmluac_LDADD = liblua.la # --- bin2c doesn't need anything but a compiler bin2c$(EXEEXT): bin2c.c |