Move fwupdtpmevlog into bindir

This commit is contained in:
Mario Limonciello 2020-02-20 07:57:37 -06:00 committed by Mario Limonciello
parent 21e7faa78b
commit 9fa7b38ac1
3 changed files with 21 additions and 3 deletions

View File

@ -2,6 +2,7 @@ usr/bin/dfu-tool
usr/bin/fwupdmgr usr/bin/fwupdmgr
usr/bin/fwupdagent usr/bin/fwupdagent
usr/bin/fwupdtool usr/bin/fwupdtool
usr/bin/fwupdtpmevlog
etc/* etc/*
usr/share/bash-completion usr/share/bash-completion
usr/share/fwupd/* usr/share/fwupd/*
@ -12,7 +13,6 @@ usr/share/locale
usr/share/metainfo/* usr/share/metainfo/*
usr/libexec/fwupd/fwupd usr/libexec/fwupd/fwupd
usr/libexec/fwupd/fwupdoffline usr/libexec/fwupd/fwupdoffline
usr/libexec/fwupd/fwupdtpmevlog
usr/share/man/man1/* usr/share/man/man1/*
lib/systemd/system/* lib/systemd/system/*
lib/systemd/system-preset/* lib/systemd/system-preset/*

View File

@ -250,7 +250,7 @@ mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
%{_libexecdir}/fwupd/efi/*.efi %{_libexecdir}/fwupd/efi/*.efi
%{_libexecdir}/fwupd/efi/*.efi.signed %{_libexecdir}/fwupd/efi/*.efi.signed
%{_bindir}/fwupdate %{_bindir}/fwupdate
%{_libexecdir}/fwupd/fwupdtpmevlog %{_bindir}/fwupdtpmevlog
%endif %endif
%{_bindir}/dfu-tool %{_bindir}/dfu-tool
%{_bindir}/fwupdmgr %{_bindir}/fwupdmgr
@ -284,6 +284,7 @@ mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
%{_datadir}/man/man1/fwupdagent.1.gz %{_datadir}/man/man1/fwupdagent.1.gz
%{_datadir}/man/man1/dfu-tool.1.gz %{_datadir}/man/man1/dfu-tool.1.gz
%{_datadir}/man/man1/fwupdmgr.1.gz %{_datadir}/man/man1/fwupdmgr.1.gz
%{_datadir}/man/man1/fwupdtpmevlog.1.gz
%if 0%{?have_uefi} %if 0%{?have_uefi}
%{_datadir}/man/man1/fwupdate.1.gz %{_datadir}/man/man1/fwupdate.1.gz
%endif %endif

View File

@ -77,9 +77,26 @@ fwupdtpmevlog = executable(
fwupdplugin, fwupdplugin,
], ],
install : true, install : true,
install_dir : join_paths(libexecdir, 'fwupd') install_dir : bindir
) )
if get_option('man')
custom_target('fwupdtpmevlog-man',
input : fwupdtpmevlog,
output : 'fwupdtpmevlog.1',
command : [
help2man, '@INPUT@',
'--no-info',
'--output', '@OUTPUT@',
'--name', 'fwupd',
'--manual', 'User Commands',
'--version-string', fwupd_version,
],
install : true,
install_dir : join_paths(mandir, 'man1'),
)
endif
run_target('fuzz-tpm-eventlog', run_target('fuzz-tpm-eventlog',
command: [ command: [
join_paths(meson.source_root(), 'contrib/afl-fuzz.py'), join_paths(meson.source_root(), 'contrib/afl-fuzz.py'),