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

tests: Make Exherbo architecture-specific ld.so stuff available too


I'm using Exherbo as an example of a host OS with an unusual layout
that breaks libcapsule's assumptions, in order to get the framework
in place for being able to receive patches from other weirder host OSs.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent a07f49d4
No related branches found
No related tags found
1 merge request!311Build capsule-capture-libs from a bundled copy of libcapsule
...@@ -23,6 +23,7 @@ use strict; ...@@ -23,6 +23,7 @@ use strict;
use warnings; use warnings;
use Cwd qw(abs_path); use Cwd qw(abs_path);
use File::Glob ':bsd_glob';
use FindBin; use FindBin;
use Exporter qw(import); use Exporter qw(import);
use IPC::Run qw(run); use IPC::Run qw(run);
...@@ -407,9 +408,14 @@ sub bind_usr { ...@@ -407,9 +408,14 @@ sub bind_usr {
} }
closedir $dir; closedir $dir;
if (-e "$tree/etc/ld.so.cache") { foreach my $ldso (bsd_glob("$tree/etc/ld.so.cache"),
push @bwrap, "--ro-bind", "$tree/etc/ld.so.cache", bsd_glob("$tree/etc/ld-*.cache"),
"$dest/etc/ld.so.cache"; bsd_glob("$tree/etc/ld-*.path")) {
next unless -e $ldso;
my $base = $ldso;
$base =~ s,.*/,,;
push @bwrap, "--ro-bind", $ldso, "$dest/etc/$base";
} }
# TODO: This wouldn't be necessary in a purely glvnd system # TODO: This wouldn't be necessary in a purely glvnd system
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment