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

Install modules-load configs in the correct directory

Browse Source 
Signed-off-by: Richard Hughes <richard@hughsie.com>
This commit is contained in:
tinywrkb 2020-11-15 12:09:23 +02:00 committed by Richard Hughes
parent 646f23edd5
commit 07d5aef247
7 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/debian/fwupd.install
View File

@ -9,6 +9,7 @@ usr/share/polkit-1/*
usr/share/locale
usr/share/metainfo/*
usr/libexec/fwupd/*
usr/lib/modules-load.d/*.conf
usr/share/man/man1/*
lib/systemd/system/*
lib/systemd/system-preset/*

4
contrib/fwupd.spec.in
View File

@ -335,9 +335,9 @@ mkdir -p --mode=0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/fwupd/gnupg
%config(noreplace)%{_sysconfdir}/pki/fwupd
%{_sysconfdir}/pki/fwupd-metadata
%if 0%{?have_msr}
%{_sysconfdir}/modules-load.d/fwupd-msr.conf
/usr/lib/modules-load.d/fwupd-msr.conf
%endif
%{_sysconfdir}/modules-load.d/fwupd-platform-integrity.conf
/usr/lib/modules-load.d/fwupd-platform-integrity.conf
%{_datadir}/dbus-1/system.d/org.freedesktop.fwupd.conf
%{_datadir}/bash-completion/completions/fwupdmgr
%{_datadir}/bash-completion/completions/fwupdtool

2
meson.build
View File

@ -384,10 +384,12 @@ if build_standalone and get_option('systemd')
systemdunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
systemdsystempresetdir = systemd.get_pkgconfig_variable('systemdsystempresetdir')
systemd_shutdown_dir = systemd.get_pkgconfig_variable('systemdshutdowndir')
systemd_modules_load_dir = systemd.get_pkgconfig_variable('modulesloaddir')
else
systemdunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir', define_variable: ['rootprefix', systemd_root_prefix])
systemdsystempresetdir = systemd.get_pkgconfig_variable('systemdsystempresetdir', define_variable: ['rootprefix', systemd_root_prefix])
systemd_shutdown_dir = systemd.get_pkgconfig_variable('systemdshutdowndir', define_variable: [systemd.version().version_compare('>= 246') ? 'root_prefix' : 'rootprefix', systemd_root_prefix])
systemd_modules_load_dir = systemd.get_pkgconfig_variable('modulesloaddir', define_variable: ['rootprefix', systemd_root_prefix])
endif
else
libsystemd = dependency('', required: false)

4
plugins/msr/meson.build
View File

@ -4,9 +4,11 @@ install_data(['msr.quirk'],
install_dir: join_paths(datadir, 'fwupd', 'quirks.d')
)
if get_option('systemd')
install_data(['fwupd-msr.conf'],
install_dir: join_paths(sysconfdir, 'modules-load.d')
install_dir: systemd_modules_load_dir,
)
endif
shared_module('fu_plugin_msr',
fu_hash,

4
plugins/platform-integrity/meson.build
View File

@ -6,9 +6,11 @@ install_data([
install_dir: join_paths(datadir, 'fwupd', 'quirks.d')
)
if get_option('systemd')
install_data(['fwupd-platform-integrity.conf'],
install_dir: join_paths(sysconfdir, 'modules-load.d')
install_dir: systemd_modules_load_dir,
)
endif
shared_module('fu_plugin_platform_integrity',
fu_hash,

2
snap/hooks/install
View File

@ -20,4 +20,4 @@ systemctl daemon-reload
systemctl enable fwupd-activate
systemctl start fwupd-activate
#msr module
install_if_missing etc/modules-load.d/fwupd-msr.conf /
install_if_missing lib/modules-load.d/fwupd-msr.conf /

2
snap/hooks/remove
View File

@ -6,4 +6,4 @@ systemctl disable fwupd-activate
rm /etc/systemd/system/fwupd-activate.service -f
systemctl daemon-reload
#msr module
rm /etc/modules-load.d/fwupd-msr.conf -f
rm /usr/lib/modules-load.d/fwupd-msr.conf -f