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 16:59:55 +0000 |
| commit | ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8 (patch) | |
| tree | bf62d871484732f064894b0002fa30353a76b50b /meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch | |
| parent | e609c4edb211c576af35b7ac0c190dc9a7673483 (diff) | |
| download | openembedded-core-contrib-ee97e53fcceabc6ef4ddc68f38c5fa0e05c5d9a8.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
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch b/meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch new file mode 100644 index 0000000000..a6003bae7b --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpm-fix-parseEmbedded.patch @@ -0,0 +1,27 @@ +Fix an issue where parseEmbedded is not defined, but is still used. + +Upstream-Status: Pending + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +Index: rpm/rpmio/macro.c +=================================================================== +--- rpm.orig/rpmio/macro.c ++++ rpm/rpmio/macro.c +@@ -1616,8 +1616,6 @@ exit: + * @retval *avp invocation args + * @return script string + */ +-#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_MOZJS) || defined(WITH_JNIEMBED) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_MRUBY_EMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL) +- + static char _FIXME_embedded_interpreter_eval_returned_null[] = + "FIXME: embedded interpreter eval returned null."; + +@@ -1668,7 +1666,6 @@ bingo: + script[nb] = '\0'; + return script; + } +-#endif + + /** + * The main macro recursion loop. |