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-macros.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-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] | |||
7 | 7 | ||
8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
9 | 9 | ||
10 | diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in | 10 | Index: rpm-5.4.14/macros/macros.in |
11 | --- rpm-5.4.8.orig/macros/macros.in 2012-03-21 19:04:06.000000000 -0500 | 11 | =================================================================== |
12 | +++ rpm-5.4.8/macros/macros.in 2012-06-07 17:02:53.903046624 -0500 | 12 | --- rpm-5.4.14.orig/macros/macros.in |
13 | @@ -985,7 +985,7 @@ | 13 | +++ rpm-5.4.14/macros/macros.in |
14 | @@ -1022,7 +1022,7 @@ $_arbitrary_tags_tests Foo:Bar | ||
14 | 15 | ||
15 | #============================================================================== | 16 | #============================================================================== |
16 | # ---- rpmbuild macros. | 17 | # ---- rpmbuild macros. |
@@ -19,7 +20,7 @@ diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in | |||
19 | 20 | ||
20 | #------------------------------------------------------------------------ | 21 | #------------------------------------------------------------------------ |
21 | # cmake(...) configuration | 22 | # cmake(...) configuration |
22 | @@ -997,15 +997,15 @@ | 23 | @@ -1038,15 +1038,15 @@ $_arbitrary_tags_tests Foo:Bar |
23 | 24 | ||
24 | #------------------------------------------------------------------------ | 25 | #------------------------------------------------------------------------ |
25 | # perl(...) configuration | 26 | # perl(...) configuration |
@@ -38,7 +39,7 @@ diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in | |||
38 | 39 | ||
39 | #------------------------------------------------------------------------ | 40 | #------------------------------------------------------------------------ |
40 | # java(...) configuration. | 41 | # java(...) configuration. |
41 | @@ -1013,11 +1013,11 @@ | 42 | @@ -1054,11 +1054,11 @@ $_arbitrary_tags_tests Foo:Bar |
42 | 43 | ||
43 | #------------------------------------------------------------------------ | 44 | #------------------------------------------------------------------------ |
44 | # libtool(...) configuration. | 45 | # libtool(...) configuration. |
@@ -52,12 +53,12 @@ diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in | |||
52 | 53 | ||
53 | #------------------------------------------------------------------------ | 54 | #------------------------------------------------------------------------ |
54 | # mono(...) configuration. | 55 | # mono(...) configuration. |
55 | @@ -1029,7 +1029,7 @@ | 56 | @@ -1070,7 +1070,7 @@ $_arbitrary_tags_tests Foo:Bar |
56 | 57 | ||
57 | #------------------------------------------------------------------------ | 58 | #------------------------------------------------------------------------ |
58 | # tcl(...) configuration. | 59 | # tcl(...) configuration. |
59 | -#%%{load:%{_usrlibrpm}/macros.d/tcl} | 60 | -#%%{load:%{_usrlibrpm}/macros.d/tcl} |
60 | +%{load:%{_usrlibrpm}/macros.d/tcl} | 61 | +%{load:%{_usrlibrpm}/macros.d/tcl} |
61 | 62 | ||
62 | # \endverbatim | 63 | #------------------------------------------------------------------------ |
63 | #*/ | 64 | # typelib(...) configuration. |