gnome-desktop/gnome-desktop-no-usr-merge.patch
Dominique Leuenberger c916011836 Accepting request 521737 from GNOME:Next
- Add gnome-desktop-no-usr-merge.patch: Also link /lib and /lib64
  into the bubblewrap container, as we do not (yet) have all the
  libs in /usr.
- Add bubblewrap dependency to libgnome-desktop-3-12.

OBS-URL: https://build.opensuse.org/request/show/521737
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-desktop?expand=0&rev=240
2017-09-06 19:39:50 +00:00

36 lines
1.3 KiB
Diff

From 9761561a3bc9dc8665e5f5aca7f7177429f87be2 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Sat, 2 Sep 2017 00:05:23 +0200
Subject: [PATCH] thumbnailer: also add /lib(64)? to bwrap's link-mounted
directory list
As not all distros have libs moves from /lib(64)? to /usr/lib(64), we need
to also bind-mount those directories, or the thumbnailers will fail to load
the required libraries.
https://bugzilla.gnome.org/show_bug.cgi?id=787072
---
libgnome-desktop/gnome-desktop-thumbnail-script.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
index 52dbf7b8..89ad5c3b 100644
--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
@@ -506,10 +506,10 @@ add_bwrap (GPtrArray *array,
add_args (array,
"bwrap",
"--ro-bind", "/usr", "/usr",
+ "--ro-bind", "/lib", "/lib",
+ "--ro-bind", "/lib64", "/lib64",
"--proc", "/proc",
"--dev", "/dev",
- "--symlink", "usr/lib", "/lib",
- "--symlink", "usr/lib64", "/lib64",
"--symlink", "usr/bin", "/bin",
"--symlink", "usr/sbin", "/sbin",
"--chdir", "/",
--
2.14.0