Skip to content
GitLab
Commit a37fce75 authored by Simon McVittie's avatar Simon McVittie
Browse files

capture-libs: Add "soname-match:" which does glob matching on ld.so.cache 



We still do this for unadorned wildcards, but explicit is better than
implicit.

Signed-off-by: Simon McVittie's avatarSimon McVittie <smcv@collabora.com>
parent 07c2ad38
Hide whitespace changes
Inline Side-by-side
tests/capture-libs.pl
View file @ a37fce75
......@@ -43,7 +43,7 @@ my $libdir = "${test_tempdir}/libdir";
ok(! system('rm', '-fr', $libdir));
mkdir($libdir);
run_ok([$CAPSULE_CAPTURE_LIBS_TOOL, 'libc.so.6'], '>&2',
run_ok([$CAPSULE_CAPTURE_LIBS_TOOL, 'literal:libc.so.6'], '>&2',
init => sub { chdir $libdir or die $!; });
ok(-e "$libdir/libc.so.6", 'libc.so.6 was captured');
like(readlink "$libdir/libc.so.6", qr{^$LIBDIR/libc\.so\.6$},
......@@ -68,7 +68,7 @@ my @libc_family;
ok(! system('rm', '-fr', $libdir));
mkdir($libdir);
run_ok([$CAPSULE_CAPTURE_LIBS_TOOL, '--link-target=/run/host',
"--dest=$libdir", 'libc.so.6'], '>&2');
"--dest=$libdir", 'soname-match:libc.so.6'], '>&2');
{
opendir(my $dir_iter, $libdir);
my @links = sort grep { $_ ne '.' and $_ ne '..' } readdir $dir_iter;
......@@ -89,7 +89,7 @@ run_ok([qw(bwrap --ro-bind / / --ro-bind /), $host,
qw(--dev-bind /dev /dev),
$CAPSULE_CAPTURE_LIBS_TOOL,
"--dest=$libdir",
"--provider=$host", 'libc.so.6'], '>&2');
"--provider=$host", 'literal:libc.so.6'], '>&2');
{
opendir(my $dir_iter, $libdir);
my @links = sort grep { $_ ne '.' and $_ ne '..' } readdir $dir_iter;
......@@ -110,7 +110,7 @@ run_ok([qw(bwrap --ro-bind / / --ro-bind /), $host,
qw(--dev-bind /dev /dev),
$CAPSULE_CAPTURE_LIBS_TOOL, '--link-target=/run/host',
"--dest=$libdir",
"--provider=$host", 'libc.so.6'], '>&2');
"--provider=$host", 'literal:libc.so.6'], '>&2');
{
opendir(my $dir_iter, $libdir);
my @links = sort grep { $_ ne '.' and $_ ne '..' } readdir $dir_iter;
......@@ -130,7 +130,8 @@ run_ok([qw(bwrap --ro-bind / / --ro-bind /), $host,
'--bind', $libdir, $libdir,
qw(--dev-bind /dev /dev),
$CAPSULE_CAPTURE_LIBS_TOOL, '--link-target=/',
"--dest=$libdir", "--provider=$host", 'libjp*g.so.6*'], '>&2');
"--dest=$libdir", "--provider=$host",
'soname-match:libjp*g.so.6*'], '>&2');
{
opendir(my $dir_iter, $libdir);
foreach my $symlink (readdir $dir_iter) {
......
tests/manual/gl.pl
View file @ a37fce75
......@@ -747,7 +747,7 @@ make_path("$tmpdir/updates", verbose => 1);
if ($libc_provider_tree eq 'auto') {
diag "Choosing GL provider's libc or container's libc automatically";
capture_libs($gl_provider_tree, $container_tree, \@multiarch_tuples,
$updates_tree, ['libc.so.6'], "$tmpdir/scratch", '/gl-provider');
$updates_tree, ['literal:libc.so.6'], "$tmpdir/scratch", '/gl-provider');
# See what we've got
foreach my $tuple (@multiarch_tuples) {
......@@ -773,7 +773,7 @@ if ($libc_provider_tree eq 'auto') {
}
elsif ($libc_provider_tree =~ m/^(?:gl-provider|host)$/) {
capture_libs($gl_provider_tree, $container_tree, \@multiarch_tuples,
$updates_tree, ['even-if-older:libc.so.6'],
$updates_tree, ['even-if-older:literal:libc.so.6'],
"$tmpdir/scratch", '/gl-provider');
diag "${ansi_bright}${ansi_green}Adding GL provider's libc via /updates ".
"as requested${ansi_reset}";
......@@ -788,7 +788,7 @@ else {
diag "${ansi_bright}${ansi_magenta}Adding ${libc_provider_tree} libc ".
"via /updates as requested${ansi_reset}";
capture_libs($libc_provider_tree, $container_tree, \@multiarch_tuples,
$updates_tree, ['even-if-older:libc.so.6'],
$updates_tree, ['even-if-older:literal:libc.so.6'],
"$tmpdir/scratch", '/libc-provider');
push @bwrap, use_ldso($libc_provider_tree, $container_tree,
\@multiarch_tuples, "$tmpdir/scratch");
......@@ -849,7 +849,7 @@ else {
if ($libcapsule_tree eq 'auto') {
diag "Using libcapsule from $gl_provider_tree if newer";
capture_libs($gl_provider_tree, $container_tree,
\@multiarch_tuples, $updates_tree, ['libcapsule.so.0'],
\@multiarch_tuples, $updates_tree, ['literal:libcapsule.so.0'],
"$tmpdir/scratch", '/gl-provider');
}
elsif ($libcapsule_tree eq 'container') {
......@@ -858,13 +858,15 @@ elsif ($libcapsule_tree eq 'container') {
elsif ($libcapsule_tree =~ m/^(?:gl-provider|host)$/) {
diag "${ansi_green}Using libcapsule from GL provider as requested${ansi_reset}";
capture_libs($gl_provider_tree, $container_tree,
\@multiarch_tuples, $updates_tree, ['even-if-older:libcapsule.so.0'],
\@multiarch_tuples, $updates_tree,
['even-if-older:literal:libcapsule.so.0'],
"$tmpdir/scratch", '/gl-provider');
}
else {
diag "${ansi_magenta}Using libcapsule from $libcapsule_tree${ansi_reset}";
capture_libs($libcapsule_tree, $container_tree,
\@multiarch_tuples, $updates_tree, ['even-if-older:libcapsule.so.0'],
\@multiarch_tuples, $updates_tree,
['even-if-older:literal:libcapsule.so.0'],
"$tmpdir/scratch", '/libcapsule-provider');
push @bwrap, bind_usr($libcapsule_tree, '/libcapsule-provider');
}
......@@ -886,7 +888,7 @@ if ($x11_provider_tree eq 'auto') {
diag "Using X libraries from $gl_provider_tree if newer";
capture_libs($gl_provider_tree, $container_tree,
\@multiarch_tuples, $updates_tree,
[map { "lib$_.so.*" } @XLIBS],
[map { "soname-match:lib$_.so.*" } @XLIBS],
"$tmpdir/scratch", '/gl-provider');
}
elsif ($x11_provider_tree eq 'container') {
......@@ -896,14 +898,14 @@ elsif ($x11_provider_tree =~ m/^(?:gl-provider|host)$/) {
diag "${ansi_green}Using X libraries from GL provider as requested${ansi_reset}";
capture_libs($gl_provider_tree, $container_tree,
\@multiarch_tuples, $updates_tree,
[map { "even-if-older:lib$_.so.*" } @XLIBS],
[map { "even-if-older:soname-match:lib$_.so.*" } @XLIBS],
"$tmpdir/scratch", '/gl-provider');
}
else {
diag "${ansi_magenta}Using X libraries from $x11_provider_tree as requested${ansi_reset}";
capture_libs($x11_provider_tree, $container_tree,
\@multiarch_tuples, $updates_tree,
[map { "even-if-older:lib$_.so.*" } @XLIBS],
[map { "even-if-older:soname-match:lib$_.so.*" } @XLIBS],
"$tmpdir/scratch", '/x11-provider', $ansi_magenta);
push @bwrap, bind_usr($libcapsule_tree, '/x11-provider');
}
......
utils/capture-libs.c
View file @ a37fce75
......@@ -156,6 +156,10 @@ static void usage (int code)
"SONAMEs (which will usually need to be quoted when using\n"
"a shell), or one of the following special strings:\n" );
fprintf( fh, "\n" );
fprintf( fh, "soname-match:GLOB\n"
"\tCapture every library in ld.so.cache that matches\n"
"\ta shell-style glob (which will usually need to be\n"
"\tquoted when using a shell)\n" );
fprintf( fh, "if-exists:SONAME\n"
"\tCapture SONAME, but don't fail if it doesn't exist\n" );
fprintf( fh, "literal:SONAME\n"
......@@ -471,8 +475,8 @@ cache_foreach_cb (const char *name, int flag, unsigned int osv,
}
static bool
capture_wildcard( const char *pattern, capture_flags flags,
int *code, char **message )
capture_soname_match( const char *pattern, capture_flags flags,
int *code, char **message )
{
_capsule_autofree char *cache_path = NULL;
cache_foreach_context ctx = {
......@@ -519,6 +523,12 @@ capture_pattern( const char *pattern, capture_flags flags,
flags, code, message );
}
if( strstarts( pattern, "soname-match:" ) )
{
return capture_soname_match( pattern + strlen( "soname-match:" ),
flags, code, message );
}
if( strstarts( pattern, "if-exists:" ) )
{
return capture_pattern( pattern + strlen( "if-exists:" ),
......@@ -602,7 +612,7 @@ capture_pattern( const char *pattern, capture_flags flags,
strchr( pattern, '?' ) != NULL ||
strchr( pattern, '[' ) != NULL )
{
return capture_wildcard( pattern, flags, code, message );
return capture_soname_match( pattern, flags, code, message );
}
return capture_one( pattern, flags, code, message );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment