commit e11184fda2e0f7992465944c27ed652e076e80d7 parent 87ab1a2f4c8c4e3abac43f07dd4b1fb82ca2f030 Author: Dylan Araps <dylan.araps@gmail.com> Date: Thu, 23 Apr 2020 15:06:54 +0300 flatpak: Drop fuse2 Diffstat:
M | flatpak/flatpak/build | | | 15 | +++++++++++++++ |
M | flatpak/flatpak/depends | | | 1 | - |
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/flatpak/flatpak/build b/flatpak/flatpak/build @@ -3,6 +3,19 @@ patch -p1 < fix-musl.patch patch -p1 < bubblewrap-musl.patch +# Remove fuse2 dependency (used solely with root "system-helper" +# daemon for file transfer. Unneeded in our case and drops the +# old fuse version. +sed -i 's/as_fn_error.*fuse/: "/g' configure + +# Turn the fuse2 filesystem into a C program which does nothing. +# This is the easiest way to "turn off" revokefs as there's +# no officials support for doing so. +cat <<EOF > revokefs/main.c +int main() { return 0; } +EOF +: > revokefs/writer.c + # Install python-pyparsing which is solely needed for # flatpak and thus contained in this build. { @@ -51,4 +64,6 @@ make DESTDIR="$1" install rm -rf "$1/usr/share" rm -rf "$1/usr/lib" rm -rf "$1/usr/include" + rm -f "$1/usr/libexec/flatpak-dbus-proxy" + rm -f "$1/usr/libexec/revokefs-fuse" } diff --git a/flatpak/flatpak/depends b/flatpak/flatpak/depends @@ -1,5 +1,4 @@ appstream-glib -fuse2 gdk-pixbuf gpgme json-glib