diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2012-06-11 13:18:52 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-12 11:10:35 +0100 |
commit | b2381b63b94604fdc0e1a7591c854dc1df3ca8f4 (patch) | |
tree | 27dcac6f2750215e7395868fdd84aedadebc4e0b /meta/recipes-devtools/rpm/rpm/rpm-macros.patch | |
parent | 99822cd4a01342565f803678baba49d74192b7d1 (diff) | |
download | poky-b2381b63b94604fdc0e1a7591c854dc1df3ca8f4.tar.gz |
rpm: Upgrade RPM to 5.4.8 (db to 5.3.15)
RPM 5.4.8 requires db 5.3.x, so both are upgraded together.
(From OE-Core rev: c5898ef3fc3820ff9c44bc5b1b16e5def64aa877)
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 | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-macros.patch b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch new file mode 100644 index 0000000000..f25656a23d --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-macros.patch | |||
@@ -0,0 +1,61 @@ | |||
1 | macros/macros.in: Revert settings to the same as RPM 5.4.0 | ||
2 | |||
3 | Enable a reasonable set of rpmdeps dependency helper macros. These sets | ||
4 | were used by RPM 5.4.0. | ||
5 | |||
6 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
7 | |||
8 | diff -ur rpm-5.4.8.orig/macros/macros.in rpm-5.4.8/macros/macros.in | ||
9 | --- rpm-5.4.8.orig/macros/macros.in 2012-03-21 19:04:06.000000000 -0500 | ||
10 | +++ rpm-5.4.8/macros/macros.in 2012-06-07 17:02:53.903046624 -0500 | ||
11 | @@ -985,7 +985,7 @@ | ||
12 | |||
13 | #============================================================================== | ||
14 | # ---- rpmbuild macros. | ||
15 | -#%%{load:%{_usrlibrpm}/macros.rpmbuild} | ||
16 | +%{load:%{_usrlibrpm}/macros.rpmbuild} | ||
17 | |||
18 | #------------------------------------------------------------------------ | ||
19 | # cmake(...) configuration | ||
20 | @@ -997,15 +997,15 @@ | ||
21 | |||
22 | #------------------------------------------------------------------------ | ||
23 | # perl(...) configuration | ||
24 | -#%%{load:%{_usrlibrpm}/macros.d/perl} | ||
25 | +%{load:%{_usrlibrpm}/macros.d/perl} | ||
26 | |||
27 | #------------------------------------------------------------------------ | ||
28 | # python(...) configuration. | ||
29 | -#%%{load:%{_usrlibrpm}/macros.d/python} | ||
30 | +%{load:%{_usrlibrpm}/macros.d/python} | ||
31 | |||
32 | #------------------------------------------------------------------------ | ||
33 | # php(...) configuration. | ||
34 | -#%%{load:%{_usrlibrpm}/macros.d/php} | ||
35 | +%{load:%{_usrlibrpm}/macros.d/php} | ||
36 | |||
37 | #------------------------------------------------------------------------ | ||
38 | # java(...) configuration. | ||
39 | @@ -1013,11 +1013,11 @@ | ||
40 | |||
41 | #------------------------------------------------------------------------ | ||
42 | # libtool(...) configuration. | ||
43 | -#%%{load:%{_usrlibrpm}/macros.d/libtool} | ||
44 | +%{load:%{_usrlibrpm}/macros.d/libtool} | ||
45 | |||
46 | #------------------------------------------------------------------------ | ||
47 | # pkgconfig(...) configuration. | ||
48 | -#%%{load:%{_usrlibrpm}/macros.d/pkgconfig} | ||
49 | +%{load:%{_usrlibrpm}/macros.d/pkgconfig} | ||
50 | |||
51 | #------------------------------------------------------------------------ | ||
52 | # mono(...) configuration. | ||
53 | @@ -1029,7 +1029,7 @@ | ||
54 | |||
55 | #------------------------------------------------------------------------ | ||
56 | # tcl(...) configuration. | ||
57 | -#%%{load:%{_usrlibrpm}/macros.d/tcl} | ||
58 | +%{load:%{_usrlibrpm}/macros.d/tcl} | ||
59 | |||
60 | # \endverbatim | ||
61 | #*/ | ||