libfuse: run system install script based on a variant (#22518)

This commit is contained in:
Harmen Stoppels 2021-03-29 11:33:55 +02:00 committed by GitHub
parent e5d106c9ce
commit 1a080b9a00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 1 deletions

View file

@ -0,0 +1,27 @@
From daf0c12d13791978bd7eab2ef44c432802fbcc95 Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <harmenstoppels@gmail.com>
Date: Wed, 24 Mar 2021 17:29:10 +0100
Subject: [PATCH] Do not run install script by default
---
util/meson.build | 6 ------
1 file changed, 6 deletions(-)
diff --git a/util/meson.build b/util/meson.build
index 577668f..ef0bc81 100644
--- a/util/meson.build
+++ b/util/meson.build
@@ -20,10 +20,4 @@ if udevrulesdir == ''
udevrulesdir = join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d')
endif
-meson.add_install_script('install_helper.sh',
- join_paths(get_option('prefix'), get_option('sysconfdir')),
- join_paths(get_option('prefix'), get_option('bindir')),
- udevrulesdir,
- '@0@'.format(get_option('useroot')))
-
--
2.25.1

View file

@ -21,7 +21,16 @@ class Libfuse(MesonPackage):
version('3.9.3', sha256='0f8f7ad9cc6667c6751efa425dd0a665dcc9d75f0b7fc0cb5b85141a514110e9') version('3.9.3', sha256='0f8f7ad9cc6667c6751efa425dd0a665dcc9d75f0b7fc0cb5b85141a514110e9')
version('3.9.2', sha256='b4409255cbda6f6975ca330f5b04cb335b823a95ddd8c812c3d224ec53478fc0') version('3.9.2', sha256='b4409255cbda6f6975ca330f5b04cb335b823a95ddd8c812c3d224ec53478fc0')
variant('useroot', default=False) variant('useroot', default=False, description="Use root privileges to make fusermount a setuid binary after installation")
variant('system_install', default=False, description=(
"Do not run the post-install script "
"which typically sets up udev rules and "
"and init script in /etc/init.d"))
conflicts("+useroot", when='~system_install', msg="useroot requires system_install")
# Drops the install script which does system configuration
patch('0001-Do-not-run-install-script.patch', when='~system_install')
executables = ['^fusermount$'] executables = ['^fusermount$']