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-macros.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-macros.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-macros.patch | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch index c1516a422a..c7ab2d2bb7 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch @@ -7,10 +7,11 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in ---- rpm-5.4.8.orig/macros/macros.in 2012-03-21 19:04:06.000000000 -0500 -+++ rpm-5.4.8/macros/macros.in 2012-06-07 17:02:53.903046624 -0500 -@@ -985,7 +985,7 @@ +Index: rpm-5.4.14/macros/macros.in +=================================================================== +--- rpm-5.4.14.orig/macros/macros.in ++++ rpm-5.4.14/macros/macros.in +@@ -1022,7 +1022,7 @@ $_arbitrary_tags_tests Foo:Bar #============================================================================== # ---- rpmbuild macros. @@ -19,7 +20,7 @@ diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in #------------------------------------------------------------------------ # cmake(...) configuration -@@ -997,15 +997,15 @@ +@@ -1038,15 +1038,15 @@ $_arbitrary_tags_tests Foo:Bar #------------------------------------------------------------------------ # perl(...) configuration @@ -38,7 +39,7 @@ diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in #------------------------------------------------------------------------ # java(...) configuration. -@@ -1013,11 +1013,11 @@ +@@ -1054,11 +1054,11 @@ $_arbitrary_tags_tests Foo:Bar #------------------------------------------------------------------------ # libtool(...) configuration. @@ -52,12 +53,12 @@ diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in #------------------------------------------------------------------------ # mono(...) configuration. -@@ -1029,7 +1029,7 @@ +@@ -1070,7 +1070,7 @@ $_arbitrary_tags_tests Foo:Bar #------------------------------------------------------------------------ # tcl(...) configuration. -#%%{load:%{_usrlibrpm}/macros.d/tcl} +%{load:%{_usrlibrpm}/macros.d/tcl} - # \endverbatim - #*/ + #------------------------------------------------------------------------ + # typelib(...) configuration. |