openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

meson: Rewrite apparmor_profiles check 

Attempting to enable apparmor_profiles when apparmor support
is not enabled should result in an error.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Andrea Bolognani 2021-05-27 15:17:19 +02:00
parent fe7c07adac
commit 090e8076a9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
meson.build
View File

@ -852,14 +852,18 @@ endif
apparmor_dep = dependency('libapparmor', required: get_option('apparmor')) apparmor_dep = dependency('libapparmor', required: get_option('apparmor'))
if apparmor_dep.found() if apparmor_dep.found()
if get_option('apparmor_profiles')
conf.set('WITH_APPARMOR_PROFILES', 1)
endif
conf.set('WITH_APPARMOR', 1) conf.set('WITH_APPARMOR', 1)
conf.set_quoted('APPARMOR_DIR', sysconfdir / 'apparmor.d') conf.set_quoted('APPARMOR_DIR', sysconfdir / 'apparmor.d')
conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor/profiles') conf.set_quoted('APPARMOR_PROFILES_PATH', '/sys/kernel/security/apparmor/profiles')
endif endif
if get_option('apparmor_profiles')
if not conf.has('WITH_APPARMOR')
error('Cannot enable apparmor_profiles without apparmor')
endif
conf.set('WITH_APPARMOR_PROFILES', 1)
endif
# FIXME rewrite to use dependency() once we can use 2.4.48 # FIXME rewrite to use dependency() once we can use 2.4.48
attr_dep = cc.find_library('attr', required: get_option('attr')) attr_dep = cc.find_library('attr', required: get_option('attr'))
if attr_dep.found() if attr_dep.found()