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/python-rpm-rpmsense.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/python-rpm-rpmsense.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch b/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch index a538a60bb9..471e6ea55b 100644 --- a/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch +++ b/meta/recipes-devtools/rpm/rpm/python-rpm-rpmsense.patch | |||
| @@ -8,26 +8,24 @@ Upstream-Status: Pending | |||
| 8 | 8 | ||
| 9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 10 | 10 | ||
| 11 | Index: rpm-5.4.14/python/rpmmodule.c | 11 | Index: rpm/python/rpmmodule.c |
| 12 | =================================================================== | 12 | =================================================================== |
| 13 | --- rpm-5.4.14.orig/python/rpmmodule.c | 13 | --- rpm.orig/python/rpmmodule.c |
| 14 | +++ rpm-5.4.14/python/rpmmodule.c | 14 | +++ rpm/python/rpmmodule.c |
| 15 | @@ -494,12 +494,16 @@ void init_rpm(void) | 15 | @@ -525,12 +525,15 @@ static int initModule(PyObject *m) |
| 16 | REGISTER_ENUM(RPMSENSE_EQUAL); | ||
| 17 | REGISTER_ENUM(RPMSENSE_NOTEQUAL); | ||
| 18 | REGISTER_ENUM(RPMSENSE_FIND_REQUIRES); | ||
| 19 | -#if defined(RPM_VENDOR_MANDRIVA) | ||
| 20 | +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE) | ||
| 21 | REGISTER_ENUM(RPMSENSE_PREREQ); | 16 | REGISTER_ENUM(RPMSENSE_PREREQ); |
| 17 | REGISTER_ENUM(RPMSENSE_PRETRANS); | ||
| 18 | REGISTER_ENUM(RPMSENSE_INTERP); | ||
| 19 | +#else | ||
| 20 | + #if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE) | ||
| 22 | REGISTER_ENUM(RPMSENSE_SCRIPT_PRE); | 21 | REGISTER_ENUM(RPMSENSE_SCRIPT_PRE); |
| 23 | REGISTER_ENUM(RPMSENSE_SCRIPT_POST); | 22 | REGISTER_ENUM(RPMSENSE_SCRIPT_POST); |
| 24 | REGISTER_ENUM(RPMSENSE_SCRIPT_PREUN); | 23 | REGISTER_ENUM(RPMSENSE_SCRIPT_PREUN); |
| 25 | - REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN) | 24 | REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN); |
| 26 | + REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN); | 25 | REGISTER_ENUM(RPMSENSE_SCRIPT_VERIFY); |
| 27 | +#endif | 26 | -#else |
| 28 | + | ||
| 29 | +#if defined(RPM_VENDOR_WINDRIVER) || defined(RPM_VENDOR_OE) | ||
| 30 | + REGISTER_ENUM(RPMSENSE_MISSINGOK); | 27 | + REGISTER_ENUM(RPMSENSE_MISSINGOK); |
| 28 | + #endif | ||
| 29 | REGISTER_ENUM(RPMSENSE_NOTEQUAL); | ||
| 31 | #endif | 30 | #endif |
| 32 | 31 | REGISTER_ENUM(RPMSENSE_FIND_REQUIRES); | |
| 33 | REGISTER_ENUM(RPMDEPS_FLAG_NOUPGRADE); | ||