Commit d2130f73 authored by Mario Limonciello's avatar Mario Limonciello Committed by Richard Hughes
Browse files

trivial: Rename meson option tpm->plugin_tpm

parent d6cf6118
......@@ -23,7 +23,7 @@ meson .. \
-Dplugin_dell=false \
-Dplugin_nvme=false \
-Dplugin_platform_integrity=false \
-Dtpm=false \
-Dplugin_tpm=false \
-Dsystemd=false \
-Dplugin_emmc=false \
-Dplugin_amt=false \
......
......@@ -236,11 +236,11 @@ or server machines.
-Defi_sbat_distro_version="%{version}" \
-Defi_sbat_distro_url="https://src.fedoraproject.org/rpms/%{name}" \
%endif
-Dtpm=true \
-Dplugin_tpm=true \
%else
-Dplugin_uefi_capsule=false \
-Dplugin_uefi_pk=false \
-Dtpm=false \
-Dplugin_tpm=false \
%endif
%if 0%{?have_dell}
-Dplugin_dell=true \
......
......@@ -335,7 +335,7 @@ if cc.has_function('pwrite', args : '-D_XOPEN_SOURCE')
conf.set('HAVE_PWRITE', '1')
endif
if build_standalone and get_option('tpm')
if build_standalone and get_option('plugin_tpm')
tpm2tss = dependency('tss2-esys', version : '>= 2.0')
conf.set('HAVE_TSS2', '1')
else
......
......@@ -18,6 +18,7 @@ option('plugin_dummy', type : 'boolean', value : false, description : 'enable th
option('plugin_emmc', type : 'boolean', value : true, description : 'enable eMMC support')
option('plugin_synaptics_mst', type: 'boolean', value: true, description : 'enable Synaptics MST hub support')
option('plugin_synaptics_rmi', type: 'boolean', value: true, description : 'enable Synaptics RMI support')
option('plugin_tpm', type : 'boolean', value : true, description : 'enable TPM support')
option('plugin_thunderbolt', type : 'boolean', value : true, description : 'enable Thunderbolt support')
option('plugin_redfish', type : 'boolean', value : true, description : 'enable Redfish support')
option('plugin_uefi_capsule', type : 'boolean', value : true, description : 'enable UEFI capsule support')
......@@ -32,7 +33,6 @@ option('systemd', type : 'boolean', value : true, description : 'enable systemd
option('systemd_root_prefix', type: 'string', value: '', description: 'Directory to base systemd’s installation directories on')
option('elogind', type : 'boolean', value : false, description : 'enable elogind support')
option('tests', type : 'boolean', value : true, description : 'enable tests')
option('tpm', type : 'boolean', value : true, description : 'enable TPM support')
option('soup_session_compat', type : 'boolean', value : true, description : 'enable SoupSession runtime compatibility support')
option('curl', type : 'boolean', value : true, description : 'enable libcurl support')
option('udevdir', type: 'string', value: '', description: 'Directory for udev rules')
......
......@@ -66,7 +66,7 @@ subdir('wacom-usb')
subdir('csr')
endif
if get_option('tpm')
if get_option('plugin_tpm')
if not get_option('gudev')
error('gudev is required for tpm')
endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment