Skip to content

Commit 4c1eabc

Browse files
committed
Remove ezio-term and ovs-switchui utilities.
These utilities were useful when Nicira was building switches with 16x2 LCD front panel displays, but they aren't useful for other environments and even Nicira does not use that kind of switch any longer. So remove them and all the build infrastructure on which they depended.
1 parent 38c6ecb commit 4c1eabc

26 files changed

Lines changed: 1 addition & 6274 deletions

Makefile.am

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ ACLOCAL_AMFLAGS = -I m4
1010
SUBDIRS = datapath
1111

1212
AM_CPPFLAGS = $(SSL_CFLAGS)
13-
AM_CPPFLAGS += $(NCURSES_CFLAGS)
14-
AM_CPPFLAGS += $(PCRE_CFLAGS)
1513
AM_CPPFLAGS += -I $(top_srcdir)/include
1614
AM_CPPFLAGS += -I $(top_srcdir)/lib
1715

@@ -132,5 +130,4 @@ include debian/automake.mk
132130
include vswitchd/automake.mk
133131
include ovsdb/automake.mk
134132
include xenserver/automake.mk
135-
include extras/ezio/automake.mk
136133

configure.ac

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@ OVS_CHECK_NDEBUG
4747
OVS_CHECK_NETLINK
4848
OVS_CHECK_OPENSSL
4949
OVS_CHECK_LOGDIR
50-
OVS_CHECK_CURSES
51-
OVS_CHECK_LINUX_VT_H
52-
OVS_CHECK_PCRE
5350
OVS_CHECK_PYTHON
5451
OVS_CHECK_PYUIC4
5552
OVS_CHECK_OVSDBMONITOR
@@ -64,7 +61,6 @@ OVS_CHECK_PKIDIR
6461
OVS_CHECK_RUNDIR
6562
OVS_CHECK_MALLOC_HOOKS
6663
OVS_CHECK_VALGRIND
67-
OVS_CHECK_TTY_LOCK_DIR
6864
OVS_CHECK_SOCKET_LIBS
6965
OVS_CHECK_LINKER_SECTIONS
7066

debian/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
/openvswitch-pki
1616
/openvswitch-pki-server
1717
/openvswitch-switch
18-
/openvswitch-switchui
1918
/openvswitch-switch-config
2019
/openvswitch-switch.copyright
2120
/openvswitch-wdt

debian/automake.mk

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ EXTRA_DIST += \
4646
debian/openvswitch-switch.postinst \
4747
debian/openvswitch-switch.postrm \
4848
debian/openvswitch-switch.template \
49-
debian/openvswitch-switchui.copyright \
50-
debian/openvswitch-switchui.default \
51-
debian/openvswitch-switchui.dirs \
52-
debian/openvswitch-switchui.init \
53-
debian/openvswitch-switchui.install \
5449
debian/openvswitch-wdt.default \
5550
debian/openvswitch-wdt.dirs \
5651
debian/openvswitch-wdt.init \

debian/control

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ Maintainer: Open vSwitch developers <dev@openvswitch.org>
55
Uploaders: Ben Pfaff <blp@nicira.com>, Simon Horman <horms@debian.org>
66
Build-Depends:
77
debhelper (>= 5), autoconf (>= 2.64), automake1.10, libssl-dev,
8-
pkg-config (>= 0.21), po-debconf, bzip2, openssl, libncurses5-dev,
9-
libpcre3-dev, python
8+
pkg-config (>= 0.21), po-debconf, bzip2, openssl, python
109
Standards-Version: 3.9.1
1110

1211
Package: openvswitch-datapath-source
@@ -49,20 +48,6 @@ Description: Open vSwitch switch implementations
4948
.
5049
Open vSwitch is a full-featured software-based Ethernet switch.
5150

52-
Package: openvswitch-switchui
53-
Architecture: any
54-
Recommends: openvswitch-switch
55-
Depends: ${shlibs:Depends}, ${misc:Depends}, console-tools
56-
Description: Monitoring utility for OpenFlow switches
57-
The ovs-switchui utility included in this package provides a
58-
"front-panel display" to allow administrators to view the status of
59-
an OpenFlow switch at a glance.
60-
.
61-
The ezio-term utility, also included, provides a VT100-compatible
62-
terminal interface for EZIO3 (aka MTB-134) 16x2 LCD displays found on
63-
server appliances made by Portwell. It allows ovs-switchui to work
64-
with such displays.
65-
6651
Package: openvswitch-pki
6752
Architecture: all
6853
Depends:
@@ -130,20 +115,3 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
130115
Description: Watchdog utility for Open vSwitch switches
131116
The ovs-wdt program included in this package manages the hardware
132117
watchdog timer in switches based on the Portwell NAR-5520 hardware.
133-
134-
Package: nicira-switch
135-
Architecture: all
136-
Depends:
137-
openvswitch-common (>= ${source:Version}),
138-
openvswitch-common (<< ${source:Version}.1~),
139-
openvswitch-switch (>= ${source:Version}),
140-
openvswitch-switch (<< ${source:Version}.1~),
141-
openvswitch-switchui (>= ${source:Version}),
142-
openvswitch-switchui (<< ${source:Version}.1~),
143-
openvswitch-datapath-module (>= ${source:Version}),
144-
openvswitch-datapath-module (<< ${source:Version}.1~),
145-
corekeeper, openvswitch-monitor, openvswitch-wdt, ${misc:Depends}
146-
Description: A meta-package for installing a Nicira Open vSwitch switch
147-
Installing this package will install everything needed for a Nicira
148-
Portwell-based Open vSwitch switch, including monitoring and the switch UI.
149-

debian/openvswitch-switchui.copyright

Lines changed: 0 additions & 21 deletions
This file was deleted.

debian/openvswitch-switchui.default

Lines changed: 0 additions & 35 deletions
This file was deleted.

debian/openvswitch-switchui.dirs

Lines changed: 0 additions & 3 deletions
This file was deleted.

debian/openvswitch-switchui.init

Lines changed: 0 additions & 210 deletions
This file was deleted.

debian/openvswitch-switchui.install

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)