diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2020-01-14 14:59:49 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-16 22:21:31 +0000 |
| commit | 3ce81a8cfafb0fc04c61872a5d861c55560cd0bf (patch) | |
| tree | 54057f028462c5eeaf6d9c68ddd41411aa1af6b9 /meta | |
| parent | 8c35a01dc771bf48f74129daa58d365100d18081 (diff) | |
| download | openembedded-core-3ce81a8cfafb0fc04c61872a5d861c55560cd0bf.tar.gz | |
rpm: fix with musl and latest elfutils.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-devtools/rpm/files/0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch b/meta/recipes-devtools/rpm/files/0001-rpmplugins.c-call-dlerror-prior-to-dlsym.patch new file mode 100644 index 0000000000..8842e3ebd7 --- /dev/null +++ b/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"), diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb index 339bd7b834..17255dc87a 100644 --- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb +++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb @@ -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" |