diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-12-20 10:19:39 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-12-21 10:50:33 +0100 |
| commit | 7bc21957218f1bf890f3cecd0b95521b22f2f9d5 (patch) | |
| tree | eaffbd36e5b0f90219783d22d105eb4158dc28d0 | |
| parent | 68fa0ea8eb1817d84dddda6664294481a8e10993 (diff) | |
| download | NetworkManager-7bc21957218f1bf890f3cecd0b95521b22f2f9d5.tar.gz | |
build/meson: drop option for deprecated ifcfg-suse setting plugins
| -rw-r--r-- | meson.build | 5 | ||||
| -rw-r--r-- | meson_options.txt | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 11e6cdd90d..2efa1ad6b3 100644 --- a/meson.build +++ b/meson.build @@ -221,7 +221,6 @@ else endif enable_ifcfg_rh = get_option('ifcfg_rh') or (distro == 'redhat') -enable_ifcfg_suse = get_option('ifcfg_suse') or (distro == 'suse') enable_ifupdown = get_option('ifupdown') or (distro == 'debian') enable_ifnet = get_option('ifnet') or (distro == 'gentoo') @@ -236,10 +235,6 @@ if config_plugins_default == '' config_plugins += ['ifcfg-rh'] endif - if enable_ifcfg_suse - config_plugins += ['ifcfg-suse'] - endif - if enable_ifupdown config_plugins += ['ifupdown'] endif diff --git a/meson_options.txt b/meson_options.txt index 5786462116..2fbefa7e43 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -46,7 +46,6 @@ option('bluez5_dun', type: 'boolean', value: false, description: 'enable Bluez5 option('config_plugins_default', type: 'string', value: '', description: 'Default configuration option for main.plugins setting, used as fallback if the configuration option is unset') option('config_plugin_ibft', type: 'boolean', value: true, description: 'enable ibft configuration plugin') option('ifcfg_rh', type: 'boolean', value: false, description: 'enable ifcfg-rh configuration plugin (Fedora/RHEL)') -option('ifcfg_suse', type: 'boolean', value: false, description: 'enable ifcfg-suse configuration plugin (SUSE) (deprecated)') option('ifupdown', type: 'boolean', value: false, description: 'enable ifupdown configuration plugin (Debian/Ubuntu)') option('ifnet', type: 'boolean', value: false, description: 'enable ifnet configuration plugin (Gentoo)') |