From 0a4a2b2610c7c29ef8ab7608780ff27d4a31c637 Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Tue, 21 Feb 2023 09:38:06 -0600 Subject: [PATCH] trivial: flip compat_cli default We've had compat_cli around for since fwupd 1.7.2. We've given people enough time to migrate, and so we should stop shipping the compatibility tools by default too. They're still there is someone (or an enterprise distro) needs them. --- contrib/fwupd.spec.in | 11 ----------- meson_options.txt | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/contrib/fwupd.spec.in b/contrib/fwupd.spec.in index 411b9d86c..f1e57171e 100644 --- a/contrib/fwupd.spec.in +++ b/contrib/fwupd.spec.in @@ -348,15 +348,10 @@ done %endif %{_libexecdir}/fwupd/fwupdoffline %if 0%{?have_uefi} -%{_bindir}/fwupdate -%endif -%{_bindir}/dfu-tool -%if 0%{?have_uefi} %{_bindir}/dbxtool %endif %{_bindir}/fwupdmgr %{_bindir}/fwupdtool -%{_bindir}/fwupdagent %dir %{_sysconfdir}/fwupd %dir %{_sysconfdir}/fwupd/bios-settings.d %{_sysconfdir}/fwupd/bios-settings.d/README.md @@ -377,7 +372,6 @@ done %{_datadir}/dbus-1/system.d/org.freedesktop.fwupd.conf %{_datadir}/bash-completion/completions/fwupdmgr %{_datadir}/bash-completion/completions/fwupdtool -%{_datadir}/bash-completion/completions/fwupdagent %{_datadir}/fish/vendor_completions.d/fwupdmgr.fish %{_datadir}/fwupd/metainfo/org.freedesktop.fwupd*.metainfo.xml %if 0%{?have_dell} @@ -389,15 +383,10 @@ done %{_datadir}/polkit-1/rules.d/org.freedesktop.fwupd.rules %{_datadir}/dbus-1/system-services/org.freedesktop.fwupd.service %{_mandir}/man1/fwupdtool.1* -%{_mandir}/man1/fwupdagent.1* -%{_mandir}/man1/dfu-tool.1* %if 0%{?have_uefi} %{_mandir}/man1/dbxtool.* %endif %{_mandir}/man1/fwupdmgr.1* -%if 0%{?have_uefi} -%{_mandir}/man1/fwupdate.1* -%endif %{_datadir}/metainfo/org.freedesktop.fwupd.metainfo.xml %{_datadir}/icons/hicolor/scalable/apps/org.freedesktop.fwupd.svg %{_datadir}/fwupd/firmware_packager.py diff --git a/meson_options.txt b/meson_options.txt index d472474c2..013d0faa5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -67,5 +67,5 @@ option('metainfo', type: 'boolean', value : true, description : 'install the pro option('bash_completion', type: 'boolean', value : true, description : 'enable bash completion') option('fish_completion', type: 'boolean', value : true, description : 'enable fish completion') option('offline', type: 'feature', description : 'Allow installing firmware using a pre-boot systemd target', deprecated: {'true': 'enabled', 'false': 'disabled'}) -option('compat_cli', type: 'boolean', value : true, description : 'enable legacy commands: fwupdagent,dfu-tool,fwupdate') +option('compat_cli', type: 'boolean', value : false, description : 'enable legacy commands: fwupdagent,dfu-tool,fwupdate') option('hsi', type: 'feature', description : ' Host Security Information', deprecated: {'true': 'enabled', 'false': 'disabled'})