forked from Mirrors/flatpak-builder
Add --with-privileged-group options
This allows distros to change the wheel group into something else, for instance admin (ubuntu) or sudo (debian).tingping/wmclass
parent
b85e7f0de7
commit
2b6f4f1bcf
|
@ -62,6 +62,12 @@ AX_VALGRIND_CHECK
|
||||||
|
|
||||||
PKG_PROG_PKG_CONFIG([0.24])
|
PKG_PROG_PKG_CONFIG([0.24])
|
||||||
|
|
||||||
|
AC_ARG_WITH(privileged_group,
|
||||||
|
AS_HELP_STRING([--with-privileged-group=GROUP],[Name of privileged group, [default=wheel]]),
|
||||||
|
with_privileged_group="$withval", with_privileged_group=wheel)
|
||||||
|
PRIVILEGED_GROUP=$with_privileged_group
|
||||||
|
AC_SUBST(PRIVILEGED_GROUP)
|
||||||
|
|
||||||
AC_ARG_WITH(dbus_service_dir,
|
AC_ARG_WITH(dbus_service_dir,
|
||||||
AS_HELP_STRING([--with-dbus-service-dir=PATH],[choose directory for dbus service files, [default=PREFIX/share/dbus-1/services]]),
|
AS_HELP_STRING([--with-dbus-service-dir=PATH],[choose directory for dbus service files, [default=PREFIX/share/dbus-1/services]]),
|
||||||
with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services)
|
with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services)
|
||||||
|
|
|
@ -20,15 +20,18 @@ flatpak_system_helper_SOURCES = \
|
||||||
flatpak_system_helper_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(POLKIT_LIBS) libflatpak-common.la
|
flatpak_system_helper_LDADD = $(BASE_LIBS) $(OSTREE_LIBS) $(POLKIT_LIBS) libflatpak-common.la
|
||||||
flatpak_system_helper_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(POLKIT_CFLAGS)
|
flatpak_system_helper_CFLAGS = $(BASE_CFLAGS) $(OSTREE_CFLAGS) $(POLKIT_CFLAGS)
|
||||||
|
|
||||||
|
system-helper/org.freedesktop.Flatpak.rules: system-helper/org.freedesktop.Flatpak.rules.in
|
||||||
|
$(AM_V_GEN) $(SED) -e "s|\@privileged_group\@|$(PRIVILEGED_GROUP)|" $< > $@
|
||||||
|
|
||||||
polkit_rulesdir = $(datadir)/polkit-1/rules.d
|
polkit_rulesdir = $(datadir)/polkit-1/rules.d
|
||||||
dist_polkit_rules_DATA = \
|
polkit_rules_DATA = \
|
||||||
system-helper/org.freedesktop.Flatpak.rules
|
system-helper/org.freedesktop.Flatpak.rules
|
||||||
|
|
||||||
polkit_policydir = $(datadir)/polkit-1/actions
|
polkit_policydir = $(datadir)/polkit-1/actions
|
||||||
dist_polkit_policy_DATA = \
|
polkit_policy_DATA = \
|
||||||
system-helper/org.freedesktop.Flatpak.policy
|
system-helper/org.freedesktop.Flatpak.policy
|
||||||
|
|
||||||
@INTLTOOL_POLICY_RULE@
|
@INTLTOOL_POLICY_RULE@
|
||||||
|
|
||||||
EXTRA_DIST += system-helper/org.freedesktop.Flatpak.policy.in system-helper/org.freedesktop.Flatpak.SystemHelper.conf
|
EXTRA_DIST += system-helper/org.freedesktop.Flatpak.policy.in system-helper/org.freedesktop.Flatpak.SystemHelper.conf system-helper/org.freedesktop.Flatpak.rules.in
|
||||||
DISTCLEANFILES += system-helper/org.freedesktop.Flatpak.policy system-helper/flatpak-system-helper.service system-helper/org.freedesktop.Flatpak.SystemHelper.service
|
DISTCLEANFILES += system-helper/org.freedesktop.Flatpak.policy system-helper/org.freedesktop.Flatpak.rules system-helper/flatpak-system-helper.service system-helper/org.freedesktop.Flatpak.SystemHelper.service
|
||||||
|
|
Loading…
Reference in New Issue