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

wrap: Don't fail if more than one dri directory is found


Instead of failing, merge the directories' contents.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 1bf461f6
Branches
Tags
No related merge requests found
...@@ -573,7 +573,7 @@ if [ -n "$runtime" ]; then ...@@ -573,7 +573,7 @@ if [ -n "$runtime" ]; then
for dir in "/lib/$t" "/usr/lib/$t" "$libQUAL" "/usr$libQUAL"; do for dir in "/lib/$t" "/usr/lib/$t" "$libQUAL" "/usr$libQUAL"; do
if [ -d "$dir/dri" ]; then if [ -d "$dir/dri" ]; then
ln -s "/run/host$dir/dri" "$tmpdir/overrides/lib/$t/dri" mkdir -p "$tmpdir/overrides/lib/$t/dri"
"$BWRAP" \ "$BWRAP" \
--ro-bind / / \ --ro-bind / / \
...@@ -586,6 +586,13 @@ if [ -n "$runtime" ]; then ...@@ -586,6 +586,13 @@ if [ -n "$runtime" ]; then
--dest="$tmpdir/overrides/lib/$t" \ --dest="$tmpdir/overrides/lib/$t" \
--provider="/" \ --provider="/" \
"only-dependencies:path-match:$dir/dri/*" "only-dependencies:path-match:$dir/dri/*"
"$BWRAP" \
--ro-bind / / \
--tmpfs /run \
--ro-bind / /run/host \
--bind "$tmpdir/overrides" "$tmpdir/overrides" \
sh -c 'ln -fns "$1"/* "$2"' \
sh "/run/host$dir/dri" "$tmpdir/overrides/lib/$t/dri"
fi fi
# S3TC or S2TC support for Mesa # S3TC or S2TC support for Mesa
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment