diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta/recipes-devtools/rpm/files/0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-devtools/rpm/files/0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch')
-rw-r--r-- | poky/meta/recipes-devtools/rpm/files/0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/poky/meta/recipes-devtools/rpm/files/0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch b/poky/meta/recipes-devtools/rpm/files/0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch new file mode 100644 index 000000000..8842e3ebd --- /dev/null +++ b/poky/meta/recipes-devtools/rpm/files/0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch @@ -0,0 +1,29 @@ +From 6878a83f9bac015c64d83cee42530a20a264cc5a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 7 Jan 2020 12:02:06 +0100 +Subject: [PATCH] rpmplugins.c: call dlerror() prior to dlsym() + +This is the recommended way in the manpage; if there is +a lingering error from an unrelated dl*() call that was +never obtained via dlerror(), it needs to be cleared +prior to calling dlsym(). + +Upstream-Status: Submitted [https://github.com/rpm-software-management/rpm/pull/998] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + lib/rpmplugins.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/lib/rpmplugins.c b/lib/rpmplugins.c +index 65e684e84..b950f85cf 100644 +--- a/lib/rpmplugins.c ++++ b/lib/rpmplugins.c +@@ -68,6 +68,8 @@ static rpmPlugin rpmPluginNew(const char *name, const char *path, + + /* make sure the plugin has the supported hooks flag */ + hooks_name = rstrscat(NULL, name, "_hooks", NULL); ++ /* clear out any old errors that weren't fetched */ ++ dlerror(); + hooks = dlsym(handle, hooks_name); + if ((error = dlerror()) != NULL) { + rpmlog(RPMLOG_ERR, _("Failed to resolve symbol %s: %s\n"), |