diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2016-02-23 11:28:21 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 17:00:27 +0000 |
commit | 007c284cb83cf5d98f3e4f605244ca6f1d46caea (patch) | |
tree | 32efe1a38e908bdc64ac59cad5f7b5e6b2d99ecf /meta/recipes-devtools/rpm/rpm/uclibc-support.patch | |
parent | a27ca6da59e6939a5bbab641236f7f792c03694f (diff) | |
download | poky-007c284cb83cf5d98f3e4f605244ca6f1d46caea.tar.gz |
rpm: Uprev to rpm-5.4.16 (pre) and rpm-5.4+cvs to current CVS head
meta/lib/oe/package_manager.py was also updated. This ensures that any
diagnostic messages are ignored from the output of rpmresolve.
The patches have been split into bug fixes (things that belong upstream)
and local changes that are OE specific.
The following patches are obsolete and have been removed:
rpm-remove-sykcparse-decl.patch
fstack-protector-configure-check.patch
rpm-disable-Wno-override-init.patch
rpm-lua-fix-print.patch
rpm-rpmpgp-fix.patch
verify-fix-broken-logic-for-ghost-avoidance-Mark-Hat.patch
(From OE-Core rev: ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8)
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/uclibc-support.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/uclibc-support.patch | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/uclibc-support.patch b/meta/recipes-devtools/rpm/rpm/uclibc-support.patch index 8870adb9e7..3b4b924510 100644 --- a/meta/recipes-devtools/rpm/rpm/uclibc-support.patch +++ b/meta/recipes-devtools/rpm/rpm/uclibc-support.patch | |||
@@ -4,10 +4,10 @@ Upstream-Status: Pending | |||
4 | 4 | ||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
6 | 6 | ||
7 | Index: rpm-5.4.14/rpmio/rpmio.h | 7 | Index: rpm/rpmio/rpmio.h |
8 | =================================================================== | 8 | =================================================================== |
9 | --- rpm-5.4.14.orig/rpmio/rpmio.h | 9 | --- rpm.orig/rpmio/rpmio.h |
10 | +++ rpm-5.4.14/rpmio/rpmio.h | 10 | +++ rpm/rpmio/rpmio.h |
11 | @@ -23,7 +23,8 @@ | 11 | @@ -23,7 +23,8 @@ |
12 | */ | 12 | */ |
13 | /*@{*/ | 13 | /*@{*/ |
@@ -18,11 +18,11 @@ Index: rpm-5.4.14/rpmio/rpmio.h | |||
18 | #define USE_COOKIE_SEEK_POINTER 1 | 18 | #define USE_COOKIE_SEEK_POINTER 1 |
19 | typedef _IO_off64_t _libio_off_t; | 19 | typedef _IO_off64_t _libio_off_t; |
20 | typedef _libio_off_t * _libio_pos_t; | 20 | typedef _libio_off_t * _libio_pos_t; |
21 | Index: rpm-5.4.14/system.h | 21 | Index: rpm/system.h |
22 | =================================================================== | 22 | =================================================================== |
23 | --- rpm-5.4.14.orig/system.h | 23 | --- rpm.orig/system.h |
24 | +++ rpm-5.4.14/system.h | 24 | +++ rpm/system.h |
25 | @@ -481,7 +481,7 @@ extern void muntrace (void) | 25 | @@ -489,7 +489,7 @@ extern void muntrace (void) |
26 | #endif /* defined(__LCLINT__) */ | 26 | #endif /* defined(__LCLINT__) */ |
27 | 27 | ||
28 | /* Memory allocation via macro defs to get meaningful locations from mtrace() */ | 28 | /* Memory allocation via macro defs to get meaningful locations from mtrace() */ |
@@ -31,11 +31,11 @@ Index: rpm-5.4.14/system.h | |||
31 | #define xmalloc(_size) (malloc(_size) ? : vmefail(_size)) | 31 | #define xmalloc(_size) (malloc(_size) ? : vmefail(_size)) |
32 | #define xcalloc(_nmemb, _size) (calloc((_nmemb), (_size)) ? : vmefail(_size)) | 32 | #define xcalloc(_nmemb, _size) (calloc((_nmemb), (_size)) ? : vmefail(_size)) |
33 | #define xrealloc(_ptr, _size) (realloc((_ptr), (_size)) ? : vmefail(_size)) | 33 | #define xrealloc(_ptr, _size) (realloc((_ptr), (_size)) ? : vmefail(_size)) |
34 | Index: rpm-5.4.14/lib/librpm.vers | 34 | Index: rpm/lib/librpm.vers |
35 | =================================================================== | 35 | =================================================================== |
36 | --- rpm-5.4.14.orig/lib/librpm.vers | 36 | --- rpm.orig/lib/librpm.vers |
37 | +++ rpm-5.4.14/lib/librpm.vers | 37 | +++ rpm/lib/librpm.vers |
38 | @@ -405,6 +405,10 @@ LIBRPM_0 | 38 | @@ -406,6 +406,10 @@ LIBRPM_0 |
39 | specedit; | 39 | specedit; |
40 | strict_erasures; | 40 | strict_erasures; |
41 | XrpmtsiInit; | 41 | XrpmtsiInit; |
@@ -46,14 +46,14 @@ Index: rpm-5.4.14/lib/librpm.vers | |||
46 | local: | 46 | local: |
47 | *; | 47 | *; |
48 | }; | 48 | }; |
49 | Index: rpm-5.4.14/rpmio/librpmio.vers | 49 | Index: rpm/rpmio/librpmio.vers |
50 | =================================================================== | 50 | =================================================================== |
51 | --- rpm-5.4.14.orig/rpmio/librpmio.vers | 51 | --- rpm.orig/rpmio/librpmio.vers |
52 | +++ rpm-5.4.14/rpmio/librpmio.vers | 52 | +++ rpm/rpmio/librpmio.vers |
53 | @@ -1056,6 +1056,10 @@ LIBRPMIO_0 | 53 | @@ -1455,6 +1455,10 @@ LIBRPMIO_0 |
54 | mongo_write_concern_set_mode; | 54 | _mongoc_write_result_init; |
55 | mongo_write_concern_set_w; | 55 | _mongoc_write_result_merge; |
56 | mongo_write_concern_set_wtimeout; | 56 | _mongoc_write_result_merge_legacy; |
57 | + xmalloc; | 57 | + xmalloc; |
58 | + xrealloc; | 58 | + xrealloc; |
59 | + xcalloc; | 59 | + xcalloc; |