From 007c284cb83cf5d98f3e4f605244ca6f1d46caea Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 23 Feb 2016 11:28:21 -0600 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm/rpm-py-init.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'meta/recipes-devtools/rpm/rpm/rpm-py-init.patch') diff --git a/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch b/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch index 07d407d36a..92ef1dc50e 100644 --- a/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch +++ b/meta/recipes-devtools/rpm/rpm/rpm-py-init.patch @@ -11,15 +11,17 @@ Upstream-Status: Pending Signed-off-by: Mark Hatle -Index: rpm-5.4.14/python/rpmmodule.c +Index: rpm/python/rpmmodule.c =================================================================== ---- rpm-5.4.14.orig/python/rpmmodule.c -+++ rpm-5.4.14/python/rpmmodule.c -@@ -392,7 +392,8 @@ void init_rpm(void) - if (Py_AtExit(rpm_exithook) == -1) - return; +--- rpm.orig/python/rpmmodule.c ++++ rpm/python/rpmmodule.c +@@ -382,9 +382,8 @@ static int initModule(PyObject *m) + /* XXX add --noparentdirs --nolinktos to rpmtsCheck() */ + global_depFlags = (RPMDEPS_FLAG_NOPARENTDIRS | RPMDEPS_FLAG_NOLINKTOS); -- rpmReadConfigFiles(NULL, NULL); +- /* failure to initialize rpm (crypto and all) is rather fatal too... */ +- if (rpmReadConfigFiles(NULL, NULL) == -1) +- return 0; + const char *argv[1] = {"rpmmodule", 0}; + rpmcliInit(1, argv, NULL); -- cgit v1.2.3-54-g00ecf