Skip to content

Allow some feature automagic to be disabled #568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
salahcoronya wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow some feature automagic to be disabled #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed52a1e
build: Non-automagic dracut support
salahcoronya Jul 13, 2026
19c9d2b
build: Non-automagic udisks2 support
salahcoronya Jul 13, 2026
6527d3a
build: Don't require bash-completions to install completions
salahcoronya Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
option('user', type: 'string', value: 'clevis', description: 'Unprivileged user for secure clevis operations')
option('group', type: 'string', value: 'clevis', description: 'Unprivileged group for secure clevis operations')
option('tpm1', type: 'feature', value: 'auto', description: 'Enable TPM 1.2 pin support')
option('dracut', type: 'feature', value: 'auto', description: 'Enable dracut support for clevis')
option('udisks', type: 'feature', value: 'auto', description: 'Enable udisks2 support for clevis')
option('bashcompdir', type: 'string', value: '', description: 'Directory for bash completion files')
8 changes: 6 additions & 2 deletions src/bash/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
bashcomp = dependency('bash-completion', required: false)

if bashcomp.found()
bashcompdir = bashcomp.get_pkgconfig_variable('completionsdir')
if get_option('bashcompdir') != '' or bashcomp.found()
if get_option('bashcompdir') != ''
bashcompdir = get_option('bashcompdir')
else
bashcompdir = bashcomp.get_variable(pkgconfig: 'completionsdir')
endif
install_data('clevis', install_dir: bashcompdir)
else
warning('Will not install bash completion due to missing dependencies!')
Expand Down
19 changes: 11 additions & 8 deletions src/luks/dracut/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
subdir('clevis')
subdir('clevis-pin-tang')
if not get_option('tpm1').disabled()
subdir('clevis-pin-tpm1')
dracut = dependency('dracut', required: get_option('dracut'))
if dracut.found()
subdir('clevis')
subdir('clevis-pin-tang')
if not get_option('tpm1').disabled()
subdir('clevis-pin-tpm1')
endif
subdir('clevis-pin-tpm2')
subdir('clevis-pin-sss')
subdir('clevis-pin-null')
subdir('clevis-pin-pkcs11')
endif
subdir('clevis-pin-tpm2')
subdir('clevis-pin-sss')
subdir('clevis-pin-null')
subdir('clevis-pin-pkcs11')
8 changes: 4 additions & 4 deletions src/luks/udisks2/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
audit = dependency('audit', version: '>=2.7.8', required: false)
udisks2 = dependency('udisks2', required: false)
gio = dependency('gio-2.0', required: false)
udisks2 = dependency('udisks2', required: get_option('udisks'))
audit = dependency('audit', version: '>=2.7.8', required: get_option('udisks'))
gio = dependency('gio-2.0', required: get_option('udisks'))

if udisks2.found() and audit.found() and gio.found()
autostartdir = join_paths(sysconfdir, 'xdg', 'autostart')
Expand All @@ -18,7 +18,7 @@ if udisks2.found() and audit.found() and gio.found()
install_dir: libexecdir,
install: true,
)
else
elif get_option('udisks').auto()
warning('Will not build udisks2 support due to missing dependencies!')
endif

Expand Down
Loading