Skip to content
Snippets Groups Projects
Commit 7bad94e8 authored by Simon McVittie's avatar Simon McVittie
Browse files

runtime: Take ldd, etc. from provider if we are using its glibc


Resolves: T29581
Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent c89449bd
No related branches found
No related tags found
1 merge request!344Use more glibc executables from provider when appropriate
Pipeline #16380 passed
...@@ -4338,9 +4338,25 @@ pv_runtime_finish_libc_family (PvRuntime *self, ...@@ -4338,9 +4338,25 @@ pv_runtime_finish_libc_family (PvRuntime *self,
enum { OPTIONAL, IMPORTANT, ESSENTIAL } priority; enum { OPTIONAL, IMPORTANT, ESSENTIAL } priority;
} glibc_executables[] = } glibc_executables[] =
{ {
/* This is basically the libc-bin Debian package, which is
* marked Essential. At least ldd can fail to work if it is too
* dissimilar to the libc.so.6 in use. */
{ "catchsegv" },
{ "getconf" },
{ "getent" },
{ "iconv" },
{ "ldconfig", .priority = ESSENTIAL, .target_path = "/sbin/ldconfig" }, { "ldconfig", .priority = ESSENTIAL, .target_path = "/sbin/ldconfig" },
{ "ldd", .priority = IMPORTANT },
{ "locale", .priority = IMPORTANT }, { "locale", .priority = IMPORTANT },
{ "localedef", .priority = IMPORTANT }, { "localedef", .priority = IMPORTANT },
{ "pldd" },
{ "tzselect" },
{ "zdump" },
/* We probably don't need developer tools gencat, rpcgen, memusage,
* memusagestat, mtrace, sotruss, sprof from libc-dev-bin, libc-devtools
* (and some have non-trivial dependencies). */
/* We probably don't need sysadmin tools /usr/sbin/iconvconfig,
* /usr/sbin/zic from libc-bin. */
}; };
g_return_val_if_fail (self->provider != NULL, FALSE); g_return_val_if_fail (self->provider != NULL, FALSE);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment