proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-15 06:14:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

uefi: Move fwupdate into bindir

Browse Source 
Intended to be executed by users for debugging purposes, create a man
page as well.
This commit is contained in:
Mario Limonciello 2020-02-19 07:32:57 -06:00 committed by Mario Limonciello
parent bf6d455687
commit 21e7faa78b
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/debian/rules
View File

@ -58,7 +58,7 @@ override_dh_install:
#install the EFI binaries if needed #install the EFI binaries if needed
if [ -d debian/tmp/usr/libexec/fwupd/efi/ ]; then \ if [ -d debian/tmp/usr/libexec/fwupd/efi/ ]; then \
dh_install -pfwupd usr/libexec/fwupd/efi ;\ dh_install -pfwupd usr/libexec/fwupd/efi ;\
dh_install -pfwupd usr/libexec/fwupd/fwupdate; \ dh_install -pfwupd usr/bin/fwupdate; \
fi fi
#if build with meson subproject in CI need to install this too #if build with meson subproject in CI need to install this too
if [ ! -z "$$CI" ] && [ -f debian/tmp/usr/lib/xb-tool ]; then \ if [ ! -z "$$CI" ] && [ -f debian/tmp/usr/lib/xb-tool ]; then \

9
contrib/fwupd.spec.in
View File

@ -215,9 +215,6 @@ Data files for installed tests.
%endif %endif
%global fwup_efi_fn $RPM_BUILD_ROOT%{_libexecdir}/fwupd/efi/fwupd%{efiarch}.efi %global fwup_efi_fn $RPM_BUILD_ROOT%{_libexecdir}/fwupd/efi/fwupd%{efiarch}.efi
%pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.signed %pesign -s -i %{fwup_efi_fn} -o %{fwup_efi_fn}.signed
%if 0%{?rhel} > 7
ln -s %{_libexecdir}/fwupd/fwupdate $RPM_BUILD_ROOT%{_bindir}/fwupdate
%endif
%endif %endif
mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
@ -252,10 +249,7 @@ mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
%if 0%{?have_uefi} %if 0%{?have_uefi}
%{_libexecdir}/fwupd/efi/*.efi %{_libexecdir}/fwupd/efi/*.efi
%{_libexecdir}/fwupd/efi/*.efi.signed %{_libexecdir}/fwupd/efi/*.efi.signed
%{_libexecdir}/fwupd/fwupdate
%if 0%{?rhel} > 7
%{_bindir}/fwupdate %{_bindir}/fwupdate
%endif
%{_libexecdir}/fwupd/fwupdtpmevlog %{_libexecdir}/fwupd/fwupdtpmevlog
%endif %endif
%{_bindir}/dfu-tool %{_bindir}/dfu-tool
@ -290,6 +284,9 @@ 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
%if 0%{?have_uefi}
%{_datadir}/man/man1/fwupdate.1.gz
%endif
%{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml %{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml
%{_datadir}/icons/hicolor/scalable/apps/org.freedesktop.fwupd.svg %{_datadir}/icons/hicolor/scalable/apps/org.freedesktop.fwupd.svg
%{_datadir}/fwupd/firmware_packager.py %{_datadir}/fwupd/firmware_packager.py

21
plugins/uefi/meson.build
View File

@ -57,7 +57,7 @@ shared_module('fu_plugin_uefi',
], ],
) )
executable( fwupdate = executable(
'fwupdate', 'fwupdate',
resources_src, resources_src,
fu_hash, fu_hash,
@ -93,10 +93,27 @@ executable(
fwupdplugin, fwupdplugin,
], ],
install : true, install : true,
install_dir : join_paths(libexecdir, 'fwupd'), install_dir : bindir,
c_args : cargs, c_args : cargs,
) )
if get_option('man')
custom_target('fwupdate-man',
input : fwupdate,
output : 'fwupdate.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
install_data(['uefi.conf'], install_data(['uefi.conf'],
install_dir: join_paths(sysconfdir, 'fwupd') install_dir: join_paths(sysconfdir, 'fwupd')
) )