mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-22 13:33:56 +03:00
meson: there is no smack library
Detection would always fail, so this was broken. Treat this as a binary enable/disable option.
This commit is contained in:
parent
80c6fce81c
commit
5464ec8a8e
13
meson.build
13
meson.build
@ -642,18 +642,6 @@ else
|
||||
libapparmor = []
|
||||
endif
|
||||
|
||||
want_smack = get_option('smack')
|
||||
if want_smack != 'false'
|
||||
libsmack = dependency('libsmack',
|
||||
required : want_smack == 'true')
|
||||
if libsmack.found()
|
||||
conf.set('HAVE_SMACK', 1)
|
||||
m4_defines += ['-DHAVE_SMACK']
|
||||
endif
|
||||
else
|
||||
libsmack = []
|
||||
endif
|
||||
|
||||
smack_run_label = get_option('smack-run-label')
|
||||
if smack_run_label != ''
|
||||
conf.set_quoted('SMACK_RUN_LABEL', smack_run_label)
|
||||
@ -988,6 +976,7 @@ foreach pair : [['utmp', 'HAVE_UTMP'],
|
||||
['efi', 'ENABLE_EFI'],
|
||||
['tpm', 'SD_BOOT_LOG_TPM'],
|
||||
['ima', 'HAVE_IMA'],
|
||||
['smack', 'HAVE_SMACK'],
|
||||
]
|
||||
|
||||
if get_option(pair[0])
|
||||
|
@ -168,7 +168,7 @@ option('selinux', type : 'combo', choices : ['auto', 'true', 'false'],
|
||||
description : 'SELinux support')
|
||||
option('apparmor', type : 'combo', choices : ['auto', 'true', 'false'],
|
||||
description : 'AppArmor support')
|
||||
option('smack', type : 'combo', choices : ['auto', 'true', 'false'],
|
||||
option('smack', type : 'boolean',
|
||||
description : 'SMACK support')
|
||||
option('smack-run-label', type : 'string',
|
||||
description : 'run systemd --system itself with a specific SMACK label')
|
||||
|
Loading…
Reference in New Issue
Block a user