meson: Always build hwdb file
We want systemd to pull our hwdb. In order to ease this, always build the hwdb file, even if it is disabled. Once systemd has merged the rules, downstream should turn off the rules in libfprint. The default in libfprint will also be changed to not build the hwdb (udev_rules option) eventually.
This commit is contained in:
parent
55a2bb5536
commit
cbce56c142
2 changed files with 12 additions and 8 deletions
|
@ -301,14 +301,16 @@ udev_hwdb = executable('fprint-list-udev-hwdb',
|
|||
link_with: libfprint_drivers,
|
||||
install: false)
|
||||
|
||||
if get_option('udev_rules')
|
||||
# We always build this file; primarily so that systemd can pull it
|
||||
# from the artefacts!
|
||||
custom_target('udev-rules',
|
||||
output: '60-autosuspend-@0@.hwdb'.format(versioned_libname),
|
||||
capture: true,
|
||||
command: [ udev_hwdb ],
|
||||
install: true,
|
||||
install_dir: udev_hwdb_dir)
|
||||
endif
|
||||
install: get_option('udev_rules'),
|
||||
install_dir: udev_hwdb_dir,
|
||||
build_by_default: true
|
||||
)
|
||||
|
||||
supported_devices = executable('fprint-list-supported-devices',
|
||||
'fprint-list-supported-devices.c',
|
||||
|
|
|
@ -181,6 +181,8 @@ if get_option('udev_rules')
|
|||
udev_dep = dependency('udev')
|
||||
udev_hwdb_dir = udev_dep.get_pkgconfig_variable('udevdir') + '/hwdb.d'
|
||||
endif
|
||||
else
|
||||
udev_hwdb_dir = false
|
||||
endif
|
||||
|
||||
if get_option('gtk-examples')
|
||||
|
|
Loading…
Reference in a new issue