NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

meson: Turn apparmor_profiles into a feature

Browse Source 
Similar knobs, such as firewalld_zone and sysctl_config, are
already features, so convert this one as well to comply with
expectations.

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:20:24 +02:00
parent 090e8076a9
commit 08c13484da
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libvirt.spec.in
View File

@ -1128,7 +1128,7 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
-Dselinux=enabled \ -Dselinux=enabled \
%{?arg_selinux_mount} \ %{?arg_selinux_mount} \
-Dapparmor=disabled \ -Dapparmor=disabled \
-Dapparmor_profiles=false \ -Dapparmor_profiles=disabled \
-Dsecdriver_apparmor=disabled \ -Dsecdriver_apparmor=disabled \
-Dudev=enabled \ -Dudev=enabled \
-Dyajl=enabled \ -Dyajl=enabled \

14
meson.build
View File

@ -857,11 +857,19 @@ if apparmor_dep.found()
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 get_option('apparmor_profiles').disabled()
apparmor_profiles_enable = true
if not conf.has('WITH_APPARMOR') if not conf.has('WITH_APPARMOR')
error('Cannot enable apparmor_profiles without apparmor') apparmor_profiles_enable = false
if get_option('apparmor_profiles').enabled()
error('Cannot enable apparmor_profiles without apparmor')
endif
endif
if apparmor_profiles_enable
conf.set('WITH_APPARMOR_PROFILES', 1)
endif endif
conf.set('WITH_APPARMOR_PROFILES', 1)
endif 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

2
meson_options.txt
View File

@ -69,7 +69,7 @@ option('driver_vmware', type: 'feature', value: 'auto', description: 'VMware dri
option('driver_vz', type: 'feature', value: 'auto', description: 'Virtuozzo driver') option('driver_vz', type: 'feature', value: 'auto', description: 'Virtuozzo driver')
option('secdriver_apparmor', type: 'feature', value: 'auto', description: 'use AppArmor security driver') option('secdriver_apparmor', type: 'feature', value: 'auto', description: 'use AppArmor security driver')
option('apparmor_profiles', type: 'boolean', value: false, description: 'install apparmor profiles') option('apparmor_profiles', type: 'feature', value: 'disabled', description: 'install apparmor profiles')
option('secdriver_selinux', type: 'feature', value: 'auto', description: 'use SELinux security driver') option('secdriver_selinux', type: 'feature', value: 'auto', description: 'use SELinux security driver')

2
mingw-libvirt.spec.in
View File

@ -108,7 +108,7 @@ exit 1
-Dcurl=enabled \ -Dcurl=enabled \
-Ddocs=enabled \ -Ddocs=enabled \
-Dapparmor=disabled \ -Dapparmor=disabled \
-Dapparmor_profiles=false \ -Dapparmor_profiles=disabled \
-Dattr=disabled \ -Dattr=disabled \
-Daudit=disabled \ -Daudit=disabled \
-Dbash_completion=disabled \ -Dbash_completion=disabled \