More universal utilities like sosreport and mustgather provide much more detailed information about OVN configuration these days than the ovn-bugtool. Also, ovs-bugtool was removed a while back already on the ovs side of things. Let's remove ovn-bugtool files.
This is also the last bit of code under LGPL-2.1. Signed-off-by: Ales Musil <[email protected]> --- NEWS | 1 + configure.ac | 1 - debian/copyright.in | 14 ------- debian/ovn-common.install | 3 -- rhel/ovn-fedora.spec.in | 9 +---- utilities/automake.mk | 2 - utilities/bugtool/automake.mk | 40 ------------------- utilities/bugtool/ovn-bugtool-nbctl-show | 19 --------- .../bugtool/ovn-bugtool-sbctl-lflow-list | 19 --------- utilities/bugtool/ovn-bugtool-sbctl-show | 19 --------- .../bugtool/plugins/network-status/ovn.xml | 23 ----------- utilities/checkpatch.py | 2 - 12 files changed, 3 insertions(+), 149 deletions(-) delete mode 100644 utilities/bugtool/automake.mk delete mode 100644 utilities/bugtool/ovn-bugtool-nbctl-show delete mode 100644 utilities/bugtool/ovn-bugtool-sbctl-lflow-list delete mode 100644 utilities/bugtool/ovn-bugtool-sbctl-show delete mode 100644 utilities/bugtool/plugins/network-status/ovn.xml diff --git a/NEWS b/NEWS index f1c56dd14..da9a077c1 100644 --- a/NEWS +++ b/NEWS @@ -16,6 +16,7 @@ Post v26.09.0 now written to the SB MAC_Binding table and consumed at the same priority as dynamic entries, making the preference option obsolete. + - Removed OVN's ovs-bugtool plugin and helper scripts. OVN v26.09.0 - xxx xx xxxx -------------------------- diff --git a/configure.ac b/configure.ac index 9220ad82b..06c3cf5d4 100644 --- a/configure.ac +++ b/configure.ac @@ -192,7 +192,6 @@ AC_CONFIG_FILES(include/ovn/version.h) dnl This makes sure that include/openflow gets created in the build directory. AC_CONFIG_COMMANDS([include/openflow/openflow.h.stamp]) -AC_CONFIG_COMMANDS([utilities/bugtool/dummy], [:]) AC_CONFIG_COMMANDS([utilities/dummy], [:]) AC_CONFIG_COMMANDS([ipsec/dummy], [:]) diff --git a/debian/copyright.in b/debian/copyright.in index bc5cb37a1..cf5da85ce 100644 --- a/debian/copyright.in +++ b/debian/copyright.in @@ -27,20 +27,6 @@ Upstream Copyright Holders: License: -* The following components are licensed under the - GNU Lesser General Public License version 2.1. - - utilities/bugtool/ovs-bugtool - utilities/bugtool/ovs-bugtool-* - utilities/bugtool/plugins/kernel-info/openvswitch.xml - utilities/bugtool/plugins/network-status/openvswitch.xml - utilities/bugtool/plugins/system-configuration.xml - utilities/bugtool/plugins/system-configuration/openvswitch.xml - - On Debian systems, the complete text of the - GNU Lesser General Public License version 2.1 can be found in - `/usr/share/common-licenses/LGPL-2.1' - * The following component is licensed under the GNU General Public License version 2. diff --git a/debian/ovn-common.install b/debian/ovn-common.install index fc48f07e4..6e51dffb8 100644 --- a/debian/ovn-common.install +++ b/debian/ovn-common.install @@ -9,7 +9,4 @@ usr/bin/ovn-debug usr/share/ovn/scripts/ovn-ctl usr/share/ovn/scripts/ovndb-servers.ocf usr/share/ovn/scripts/ovn-lib -usr/share/ovn/scripts/ovn-bugtool-nbctl-show -usr/share/ovn/scripts/ovn-bugtool-sbctl-lflow-list -usr/share/ovn/scripts/ovn-bugtool-sbctl-show usr/lib/*/libovn*.so.* diff --git a/rhel/ovn-fedora.spec.in b/rhel/ovn-fedora.spec.in index 131b3eaab..e70c581e7 100644 --- a/rhel/ovn-fedora.spec.in +++ b/rhel/ovn-fedora.spec.in @@ -40,9 +40,8 @@ Provides: openvswitch-ovn-common = %{?epoch:%{epoch}:}%{version}-%{release} # to skip running checks, pass --without check %bcond_without check -# Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the -# lib/sflow*.[ch] files are SISSL -License: ASL 2.0 and LGPLv2+ and SISSL +# Nearly all of openvswitch is ASL 2.0. The lib/sflow*.[ch] files are SISSL +License: ASL 2.0 and SISSL Release: 1%{?dist} Source: http://openvswitch.org/releases/ovn-%{version}.tar.gz Source10: http://openvswitch.org/releases/openvswitch-%{ovsver}.tar.gz @@ -212,7 +211,6 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man8/ovs* rm -f $RPM_BUILD_ROOT%{_mandir}/man8/vtep* rm -rf $RPM_BUILD_ROOT%{_datadir}/ovn/python rm -f $RPM_BUILD_ROOT%{_datadir}/ovn/scripts/ovs* -rm -rf $RPM_BUILD_ROOT%{_datadir}/ovn/bugtool-plugins rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc @@ -511,9 +509,6 @@ fi %{_datadir}/ovn/scripts/ovn-ctl %{_datadir}/ovn/scripts/ovn-lib %{_datadir}/ovn/scripts/ovndb-servers.ocf -%{_datadir}/ovn/scripts/ovn-bugtool-nbctl-show -%{_datadir}/ovn/scripts/ovn-bugtool-sbctl-lflow-list -%{_datadir}/ovn/scripts/ovn-bugtool-sbctl-show %{_mandir}/man8/ovn-ctl.8* %{_mandir}/man8/ovn-nbctl.8* %{_mandir}/man8/ovn-trace.8* diff --git a/utilities/automake.mk b/utilities/automake.mk index b620038d0..af032d024 100644 --- a/utilities/automake.mk +++ b/utilities/automake.mk @@ -125,5 +125,3 @@ utilities_ovn_brctl_SOURCES = \ utilities/ovn-dbctl.h \ utilities/ovn-brctl.c utilities_ovn_brctl_LDADD = lib/libovn.la $(OVSDB_LIBDIR)/libovsdb.la $(OVS_LIBDIR)/libopenvswitch.la - -include utilities/bugtool/automake.mk diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk deleted file mode 100644 index 69b29e600..000000000 --- a/utilities/bugtool/automake.mk +++ /dev/null @@ -1,40 +0,0 @@ -bugtool_plugins = \ - utilities/bugtool/plugins/network-status/ovn.xml - -bugtool_scripts = \ - utilities/bugtool/ovn-bugtool-nbctl-show \ - utilities/bugtool/ovn-bugtool-sbctl-show \ - utilities/bugtool/ovn-bugtool-sbctl-lflow-list - -scripts_SCRIPTS += $(bugtool_scripts) - -bugtoolpluginsdir = $(pkgdatadir)/bugtool-plugins -INSTALL_DATA_LOCAL += bugtool-install-data-local -bugtool-install-data-local: - for plugin in $(bugtool_plugins); do \ - stem=`echo "$$plugin" | sed 's,ovn/,,'`; \ - stem=`echo "$$stem" | sed 's,utilities/bugtool/plugins/,,'`; \ - dir=`expr "$$stem" : '\(.*\)/[^/]*$$'`; \ - $(MKDIR_P) "$(DESTDIR)$(bugtoolpluginsdir)/$$dir"; \ - $(INSTALL_DATA) "$(srcdir)/$$plugin" "$(DESTDIR)$(bugtoolpluginsdir)/$$stem"; \ - done - -UNINSTALL_LOCAL += bugtool-uninstall-local -bugtool-uninstall-local: - for plugin in $(bugtool_plugins); do \ - stem=`echo "$$plugin" | sed 's,ovn/,,'`; \ - stem=`echo "$$stem" | sed 's,utilities/bugtool/plugins/,,'`; \ - rm -f "$(DESTDIR)$(bugtoolpluginsdir)/$$stem"; \ - done - for plugin in $(bugtool_plugins); do \ - stem=`echo "$$plugin" | sed 's,ovn/,,'`; \ - stem=`echo "$$stem" | sed 's,utilities/bugtool/plugins/,,'`; \ - dir=`expr "$$stem" : '\(.*\)/[^/]*$$'`; \ - if [ ! -z "$$dir" ]; then \ - rm -rf "$(DESTDIR)$(bugtoolpluginsdir)/$$dir"; \ - fi \ - done; exit 0 - -EXTRA_DIST += \ - $(bugtool_plugins) \ - $(bugtool_scripts) diff --git a/utilities/bugtool/ovn-bugtool-nbctl-show b/utilities/bugtool/ovn-bugtool-nbctl-show deleted file mode 100644 index 927252745..000000000 --- a/utilities/bugtool/ovn-bugtool-nbctl-show +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General -# Public License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Copyright (C) 2016 Nicira, Inc. - -ovn-nbctl --timeout=3 show diff --git a/utilities/bugtool/ovn-bugtool-sbctl-lflow-list b/utilities/bugtool/ovn-bugtool-sbctl-lflow-list deleted file mode 100644 index 33a15d7d5..000000000 --- a/utilities/bugtool/ovn-bugtool-sbctl-lflow-list +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General -# Public License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Copyright (C) 2016 Nicira, Inc. - -ovn-sbctl --timeout=3 lflow-list diff --git a/utilities/bugtool/ovn-bugtool-sbctl-show b/utilities/bugtool/ovn-bugtool-sbctl-show deleted file mode 100644 index b6741bcc2..000000000 --- a/utilities/bugtool/ovn-bugtool-sbctl-show +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh - -# This library is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General -# Public License as published by the Free Software Foundation. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA -# -# Copyright (C) 2016 Nicira, Inc. - -ovn-sbctl --timeout=3 show diff --git a/utilities/bugtool/plugins/network-status/ovn.xml b/utilities/bugtool/plugins/network-status/ovn.xml deleted file mode 100644 index 3b399feb3..000000000 --- a/utilities/bugtool/plugins/network-status/ovn.xml +++ /dev/null @@ -1,23 +0,0 @@ -<!-- - This library is free software; you can redistribute it and/or modify - it under the terms of version 2.1 of the GNU Lesser General Public - License as published by the Free Software Foundation. - - This library is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA. - - Copyright (C) 2016 Nicira, Inc. ---> - -<collect> - <command label="ovn-nbctl-show" filters="ovn">/usr/share/openvswitch/scripts/ovn-bugtool-nbctl-show</command> - <command label="ovn-sbctl-show" filters="ovn">/usr/share/openvswitch/scripts/ovn-bugtool-sbctl-show</command> - <command label="ovn-sbctl-lflow-list" filters="ovn">/usr/share/openvswitch/scripts/ovn-bugtool-sbctl-lflow-list</command> -</collect> diff --git a/utilities/checkpatch.py b/utilities/checkpatch.py index d644db9e1..13b4d14a7 100755 --- a/utilities/checkpatch.py +++ b/utilities/checkpatch.py @@ -1081,8 +1081,6 @@ def ovs_checkpatch_parse(text, filename, author=None, committer=None): # for a common style. if current_file.startswith('include/sparse'): continue - if current_file.startswith('utilities/bugtool'): - continue run_checks(current_file, cmp_line, lineno) run_file_checks(text) -- 2.55.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
