mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 18:32:13 +02:00
rpm: fix with musl and latest elfutils.
(From OE-Core rev: 3ce81a8cfafb0fc04c61872a5d861c55560cd0bf) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
8f2f1af363
commit
0e70fac8fe
@@ -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"),
|
||||
@@ -43,6 +43,7 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.14.x \
|
||||
file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \
|
||||
file://0001-mono-find-provides-requires-do-not-use-monodis-from-.patch \
|
||||
file://0001-Rip-out-partial-support-for-unused-MD2-and-RIPEMD160.patch \
|
||||
file://0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch \
|
||||
"
|
||||
|
||||
PE = "1"
|
||||
|
||||
Reference in New Issue
Block a user