proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-06 07:04:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow configuring systemd and udev directories (Fixes: #176)

Browse Source
This commit is contained in:
Mario Limonciello 2017-08-17 05:59:50 +08:00
parent 556ec355db
commit 38d7f13976
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
data/meson.build
View File

@ -21,7 +21,7 @@ install_data(['metadata.xml'],
) )
install_data(['90-fwupd-devices.rules'], install_data(['90-fwupd-devices.rules'],
install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') install_dir : join_paths(udevdir, 'rules.d')
) )
con2 = configuration_data() con2 = configuration_data()
@ -53,7 +53,7 @@ if get_option('enable-systemd')
output : 'fwupd-offline-update.service', output : 'fwupd-offline-update.service',
configuration : con2, configuration : con2,
install: true, install: true,
install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'), install_dir: systemdunitdir,
) )
endif endif
@ -64,6 +64,6 @@ if get_option('enable-systemd')
output : 'fwupd.service', output : 'fwupd.service',
configuration : con2, configuration : con2,
install: true, install: true,
install_dir: systemd.get_pkgconfig_variable('systemdsystemunitdir'), install_dir: systemdunitdir,
) )
endif endif

12
meson.build
View File

@ -202,6 +202,16 @@ if get_option('enable-consolekit')
conf.set('HAVE_CONSOLEKIT' , '1') conf.set('HAVE_CONSOLEKIT' , '1')
endif endif
systemdunitdir = get_option('with-systemdunitdir')
if systemdunitdir == 'dynamic'
systemdunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
endif
udevdir = get_option('with-udevdir')
if udevdir == 'dynamic'
udevdir = udev.get_pkgconfig_variable('udevdir')
endif
gnome = import('gnome') gnome = import('gnome')
i18n = import('i18n') i18n = import('i18n')
@ -267,5 +277,5 @@ if meson.version().version_compare('<0.41.0')
endif endif
if get_option('enable-systemd') if get_option('enable-systemd')
meson.add_install_script('meson_post_install.sh', systemd.get_pkgconfig_variable('systemdsystemunitdir'), localstatedir) meson.add_install_script('meson_post_install.sh', systemdunitdir, localstatedir)
endif endif

2
meson_options.txt
View File

@ -15,3 +15,5 @@ option('enable-dummy', type : 'boolean', value : false, description : 'enable th
option('enable-gpg', type : 'boolean', value : true, description : 'enable the GPG verification support') option('enable-gpg', type : 'boolean', value : true, description : 'enable the GPG verification support')
option('enable-pkcs7', type : 'boolean', value : true, description : 'enable the PKCS7 verification support') option('enable-pkcs7', type : 'boolean', value : true, description : 'enable the PKCS7 verification support')
option('with-bootdir', type : 'string', value : '/boot/efi', description : 'Directory for EFI system partition') option('with-bootdir', type : 'string', value : '/boot/efi', description : 'Directory for EFI system partition')
option('with-systemdunitdir', type: 'string', value: 'dynamic', description: 'Directory for systemd units')
option('with-udevdir', type: 'string', value: 'dynamic', description: 'Directory for udev rules')