Get rid of vswitchext entirely.

diff --git a/.gitignore b/.gitignore
index 4f38c4854a2086c2d515c11f4bff012c607cb3ba..480615ac96ef068b861317c5ad07cea337c46476 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,4 @@
 Module.symvers
 TAGS
 cscope.*
-ext.m4
-ext.mk
 tags

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644 (file)
index 57d67d1..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "ext"]
-       path = ext
-       url = ../openflowext

diff --git a/Makefile.am b/Makefile.am
index 95d67ff2e8b042058804a38e8ddd07aef95bdd1d..b3c98c8a55cb6b5c7b24c50b2d829a77bac6d64a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,9 +18,6 @@ AM_CPPFLAGS += $(NCURSES_CFLAGS)
 AM_CPPFLAGS += $(PCRE_CFLAGS)
 AM_CPPFLAGS += -I $(top_srcdir)/include
 AM_CPPFLAGS += -I $(top_srcdir)/lib
-if HAVE_EXT
-AM_CPPFLAGS += -I $(top_srcdir)/ext/include
-endif
 
 AM_CFLAGS = -Wstrict-prototypes
 
@@ -77,5 +74,4 @@ if HAVE_PCRE
 include extras/ezio/automake.mk
 endif
 endif
-include ext.mk
 endif # ENABLE_USERSPACE

diff --git a/acinclude.m4 b/acinclude.m4
index 3c58780578544a8a31a4c497918c0f34c16b686b..43c4f826a452dcca98144a046c09153245099e74 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -172,38 +172,6 @@ AC_DEFUN([OVS_CHECK_IF_PACKET],
                 [Define to 1 if net/if_packet.h is available.])
    fi])
 
-dnl Enable OpenVSwitch extension submodule.
-AC_DEFUN([OVS_ENABLE_EXT],
-  [AC_ARG_ENABLE([ext],
-     AS_HELP_STRING([--enable-ext], 
-                    [use OpenVSwitch extensions
-                     (default is yes if "ext" dir exists)]))
-   case "${enable_ext}" in
-     (yes)
-       HAVE_EXT=yes
-       ;;
-     (no)
-       HAVE_EXT=no
-       ;;
-     (*)
-       if test -e "$srcdir/ext/automake.mk"; then
-         HAVE_EXT=yes
-       else
-         HAVE_EXT=no
-       fi
-       ;;
-   esac
-   if test $HAVE_EXT = yes; then
-     if test -e "$srcdir/ext/automake.mk"; then
-       :
-     else
-       AC_MSG_ERROR([cannot configure extensions without "ext" directory])
-     fi
-     AC_DEFINE([HAVE_EXT], [1], 
-               [Whether the OpenVSwitch extensions submodule is available])
-   fi
-   AM_CONDITIONAL([HAVE_EXT], [test $HAVE_EXT = yes])])
-
 dnl Checks for dpkg-buildpackage.  If this is available then we check
 dnl that the Debian packaging is functional at "make distcheck" time.
 AC_DEFUN([OVS_CHECK_DPKG_BUILDPACKAGE],

diff --git a/boot.sh b/boot.sh
index 33228e0ba68428f1a1847f1cae6438c3d968b2e4..05dd3599646e634b2599cd512b00408a884e444d 100755 (executable)
--- a/boot.sh
+++ b/boot.sh
@@ -1,40 +1,2 @@
 #! /bin/sh
-
-set -e
-
-have_ext=$(if test -e ext/automake.mk; then echo yes; else echo no; fi)
-for opt
-do
-    case $opt in
-        (--enable-ext) have_ext=yes ;;
-        (--disable-ext) have_ext=no ;;
-        (--help) cat <<EOF
-$0: bootstrap OpenVSwitch from a checked-out VCS tree
-usage: $0 [OPTIONS]
-The recognized options are:
-  --enable-ext      include vswitchext
-  --disable-ext     exclude vswitchext
-By default, vswitchext is included if it is present.
-EOF
-        exit 0
-        ;;
-        (*) echo "unknown option $opt; use --help for help"; exit 1 ;;
-    esac
-done
-
-# Enable or disable ext.
-if test "$have_ext" = yes; then
-    echo 'Enabling vswitchext...'
-    echo 'include ext/automake.mk' > ext.mk
-    cat debian/control.in ext/debian/control.in > debian/control
-    for d in $(cat ext/debian/LINKS); do
-        test -e debian/$d || ln -s ../ext/debian/$d debian/$d
-    done
-else
-    echo 'Disabling vswitchext...'
-    echo '# This file intentionally left blank.' > ext.mk
-    cat debian/control.in > debian/control
-fi
-
-# Bootstrap configure system from .ac/.am files
-autoreconf --install -I config --force
+autoreconf --install --force

diff --git a/configure.ac b/configure.ac
index d5cb0ad8c648b8a73c27bbdf3e1fa2ae33681798..c8962607bf4ef35562c78f70d1d67d7ae038e462 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -95,8 +95,6 @@ if $build_userspace; then
     OVS_ENABLE_OPTION([-Wno-override-init])
 fi
 
-OVS_ENABLE_EXT
-
 AC_ARG_VAR(KARCH, [Kernel Architecture String])
 AC_SUBST(KARCH)
 OVS_CHECK_LINUX(l26, 2.6, KSRC26, L26_ENABLED)

diff --git a/debian/automake.mk b/debian/automake.mk
index ef0b0cb6e108e18a0a349e3d234ba661ee091461..813987e73a721515dc928841e654bcd9f739f45e 100644 (file)
--- a/debian/automake.mk
+++ b/debian/automake.mk
@@ -3,7 +3,7 @@ EXTRA_DIST += \
        debian/commands/reconfigure \
        debian/commands/update \
        debian/compat \
-       debian/control.in \
+       debian/control \
        debian/control.modules.in \
        debian/copyright \
        debian/corekeeper.cron.daily \

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..770f11b
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,143 @@
+Source: openvswitch
+Section: net
+Priority: extra
+Maintainer: OpenVSwitch developers <ovs-dev@openvswitch.org>
+Build-Depends: debhelper (>= 5), autoconf (>= 2.60), automake1.10, libssl-dev, pkg-config (>= 0.21), po-debconf, bzip2, openssl, libncurses5-dev, libpcre3-dev
+Standards-Version: 3.7.3
+
+Package: openvswitch-datapath-source
+Architecture: all
+Depends: module-assistant, bzip2, debhelper (>= 5.0.37)
+Suggests: openvswitch-switch
+Description: Source code for OpenVSwitch datapath Linux module
+ This package provides the OpenVSwitch datapath module source code
+ that is needed by openvswitch-switch.  The kernel module can be built
+ from it using module-assistant or make-kpkg.  README.Debian in this
+ package provides further instructions.
+ .
+ OpenVSwitch is a software-based Ethernet switch targeted at virtual
+ servers.
+
+Package: openvswitch-common
+Architecture: any
+Depends: ${shlibs:Depends}, openssl
+Description: OpenVSwitch common components
+ openvswitch-common provides components required by both openvswitch-switch
+ and openvswitch-controller.
+ .
+ OpenVSwitch is a software-based Ethernet switch targeted at virtual
+ servers.
+
+Package: openvswitch-switch
+Architecture: any
+Suggests: openvswitch-datapath-module
+Depends: ${shlibs:Depends}, ${misc:Depends}, openvswitch-common, dhcp3-client, module-init-tools, dmidecode, procps, debianutils
+Description: OpenVSwitch switch implementations
+ openvswitch-switch provides the userspace components and utilities for
+ the Openvswitch kernel-based switch.  
+ .
+ OpenVSwitch is a software-based Ethernet switch targeted at virtual
+ servers.
+
+Package: openvswitch-switch-config
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, openvswitch-switch, libwww-perl, libdigest-sha1-perl
+Description: OpenVSwitch switch implementations
+ openvswitch-switch-config provides a utility for interactively configuring
+ the OpenVSwitch switch provided in the openvswitch-switch package.
+ .
+ OpenVSwitch is a software-based Ethernet switch targeted at virtual
+ servers.
+
+Package: openvswitch-switchui
+Architecture: any
+Recommends: openvswitch-switch
+Depends: ${shlibs:Depends}, ${misc:Depends}, console-tools
+Description: Monitoring utility for OpenFlow switches
+ The ovs-switchui utility included in this package provides a
+ "front-panel display" to allow administrators to view the status of
+ an OpenFlow switch at a glance.
+ .
+ The ezio-term utility, also included, provides a VT100-compatible
+ terminal interface for EZIO3 (aka MTB-134) 16x2 LCD displays found on
+ server appliances made by Portwell.  It allows ovs-switchui to work
+ with such displays.
+
+Package: openvswitch-pki
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, openvswitch-common
+Description: OpenVSwitch public key infrastructure
+ openvswitch-pki provides PKI (public key infrastructure) support for
+ OpenVSwitch switches and controllers, reducing the risk of
+ man-in-the-middle attacks on the Openvswitch network infrastructure.
+ .
+ OpenVSwitch is a software-based Ethernet switch targeted at virtual
+ servers.
+
+Package: openvswitch-pki-server
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, openvswitch-pki, apache2
+Description: OpenVSwitch public key infrastructure (HTTP server support)
+ openvswitch-pki-server provides HTTP access to the OpenVSwitch PKI (public
+ key infrastructure) maintained on the local machine by the
+ openvswitch-pki package.  This HTTP access is needed for secure and
+ convenient OpenFlow switch setup using the ovs-switch-setup program
+ in the openvswitch-switch package.
+ .
+ OpenVSwitch is a software-based Ethernet switch targeted at virtual
+ servers.
+
+Package: openvswitch-controller
+Architecture: any
+Depends: ${shlibs:Depends}, openvswitch-common, openvswitch-pki
+Description: OpenVSwitch controller implementation
+ The OpenVSwitch controller enables OpenFlow switches that connect to it
+ to act as MAC-learning Ethernet switches.
+ .
+ OpenVSwitch is a software-based Ethernet switch targeted at virtual
+ servers.
+
+Package: corekeeper
+Architecture: all
+Depends: tmpreaper
+Description: Core file centralizer and reaper
+ The corekeeper package configures the system to dump all core files to
+ /var/log/core.  It also deletes core files older than 7 days.
+
+Package: openvswitch-dbg
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Debug symbols for OpenVSwitch packages
+ This package contains the debug symbols for all the other openvswitch-*
+ packages.  Install it to debug one of them or to examine a core dump
+ produced by one of them.
+
+Package: openvswitch-monitor
+Architecture: any
+Recommends: openvswitch-switch
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Monitor utility for OpenVSwitch switches
+ The ovs-monitor utility included in this package monitors the secure
+ channel and datapath.  If either become unresponsive, the switch is
+ rebooted.
+
+Package: openvswitch-wdt
+Architecture: any
+Recommends: openvswitch-switch
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Watchdog utility for OpenVSwitch switches
+ The ovs-wdt program included in this package manages the hardware
+ watchdog timer in switches based on the Portwell NAR-5520 hardware.
+
+Package: nicira-switch
+Architecture: all
+Depends: 
+ openvswitch-common (= ${source:Version}), 
+ openvswitch-switch (= ${source:Version}), 
+ openvswitch-switchui (= ${source:Version}), 
+ openvswitch-datapath-module (= ${source:Version}),
+ corekeeper, openvswitch-monitor, openvswitch-wdt
+Description: Metapackage for installing a Nicira OpenVSwitch switch
+ Installing this package will install everything needed for a Nicira
+ Portwell-based OpenVSwitch switch, including monitoring and the switch UI.
+

diff --git a/debian/control.in b/debian/control.in
deleted file mode 100644 (file)
index e344b9f..0000000
--- a/debian/control.in
+++ /dev/null
@@ -1,131 +0,0 @@
-Source: openvswitch
-Section: net
-Priority: extra
-Maintainer: OpenVSwitch developers <ovs-dev@openvswitch.org>
-Build-Depends: debhelper (>= 5), autoconf (>= 2.60), automake1.10, libssl-dev, pkg-config (>= 0.21), po-debconf, bzip2, openssl, libncurses5-dev, libpcre3-dev
-Standards-Version: 3.7.3
-
-Package: openvswitch-datapath-source
-Architecture: all
-Depends: module-assistant, bzip2, debhelper (>= 5.0.37)
-Suggests: openvswitch-switch
-Description: Source code for OpenVSwitch datapath Linux module
- This package provides the OpenVSwitch datapath module source code
- that is needed by openvswitch-switch.  The kernel module can be built
- from it using module-assistant or make-kpkg.  README.Debian in this
- package provides further instructions.
- .
- OpenVSwitch is a software-based Ethernet switch targeted at virtual
- servers.
-
-Package: openvswitch-common
-Architecture: any
-Depends: ${shlibs:Depends}, openssl
-Description: OpenVSwitch common components
- openvswitch-common provides components required by both openvswitch-switch
- and openvswitch-controller.
- .
- OpenVSwitch is a software-based Ethernet switch targeted at virtual
- servers.
-
-Package: openvswitch-switch
-Architecture: any
-Suggests: openvswitch-datapath-module
-Depends: ${shlibs:Depends}, ${misc:Depends}, openvswitch-common, dhcp3-client, module-init-tools, dmidecode, procps, debianutils
-Description: OpenVSwitch switch implementations
- openvswitch-switch provides the userspace components and utilities for
- the Openvswitch kernel-based switch.  
- .
- OpenVSwitch is a software-based Ethernet switch targeted at virtual
- servers.
-
-Package: openvswitch-switch-config
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, openvswitch-switch, libwww-perl, libdigest-sha1-perl
-Description: OpenVSwitch switch implementations
- openvswitch-switch-config provides a utility for interactively configuring
- the OpenVSwitch switch provided in the openvswitch-switch package.
- .
- OpenVSwitch is a software-based Ethernet switch targeted at virtual
- servers.
-
-Package: openvswitch-switchui
-Architecture: any
-Recommends: openvswitch-switch
-Depends: ${shlibs:Depends}, ${misc:Depends}, console-tools
-Description: Monitoring utility for OpenFlow switches
- The ovs-switchui utility included in this package provides a
- "front-panel display" to allow administrators to view the status of
- an OpenFlow switch at a glance.
- .
- The ezio-term utility, also included, provides a VT100-compatible
- terminal interface for EZIO3 (aka MTB-134) 16x2 LCD displays found on
- server appliances made by Portwell.  It allows ovs-switchui to work
- with such displays.
-
-Package: openvswitch-pki
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, openvswitch-common
-Description: OpenVSwitch public key infrastructure
- openvswitch-pki provides PKI (public key infrastructure) support for
- OpenVSwitch switches and controllers, reducing the risk of
- man-in-the-middle attacks on the Openvswitch network infrastructure.
- .
- OpenVSwitch is a software-based Ethernet switch targeted at virtual
- servers.
-
-Package: openvswitch-pki-server
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, openvswitch-pki, apache2
-Description: OpenVSwitch public key infrastructure (HTTP server support)
- openvswitch-pki-server provides HTTP access to the OpenVSwitch PKI (public
- key infrastructure) maintained on the local machine by the
- openvswitch-pki package.  This HTTP access is needed for secure and
- convenient OpenFlow switch setup using the ovs-switch-setup program
- in the openvswitch-switch package.
- .
- OpenVSwitch is a software-based Ethernet switch targeted at virtual
- servers.
-
-Package: openvswitch-controller
-Architecture: any
-Depends: ${shlibs:Depends}, openvswitch-common, openvswitch-pki
-Description: OpenVSwitch controller implementation
- The OpenVSwitch controller enables OpenFlow switches that connect to it
- to act as MAC-learning Ethernet switches.
- .
- OpenVSwitch is a software-based Ethernet switch targeted at virtual
- servers.
-
-Package: corekeeper
-Architecture: all
-Depends: tmpreaper
-Description: Core file centralizer and reaper
- The corekeeper package configures the system to dump all core files to
- /var/log/core.  It also deletes core files older than 7 days.
-
-Package: openvswitch-dbg
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Debug symbols for OpenVSwitch packages
- This package contains the debug symbols for all the other openvswitch-*
- packages.  Install it to debug one of them or to examine a core dump
- produced by one of them.
-
-Package: openvswitch-monitor
-Architecture: any
-Recommends: openvswitch-switch
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Monitor utility for OpenVSwitch switches
- The ovs-monitor utility included in this package monitors the secure
- channel and datapath.  If either become unresponsive, the switch is
- rebooted.
-
-Package: openvswitch-wdt
-Architecture: any
-Recommends: openvswitch-switch
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Watchdog utility for OpenVSwitch switches
- The ovs-wdt program included in this package manages the hardware
- watchdog timer in switches based on the Portwell NAR-5520 hardware.
-

diff --git a/debian/rules b/debian/rules
index 8475ee741c5f10dd5e1a5e7f361be4670e164ed4..695d61f49e7ad089f2b6699c5122274da33c7faa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -110,9 +110,6 @@ install-arch: build-arch
        cp debian/openvswitch-switch.template debian/openvswitch-switch/usr/share/openvswitch/switch/default.template
        dh_install -s
        env TERMINFO=debian/openvswitch-switchui/usr/share/terminfo tic -x extras/ezio/ezio3.ti
-       if test -e ext/utilities/dump-desc; then \
-               install -m755 ext/utilities/dump-desc debian/openvswitch-switch/usr/share/openvswitch; \
-       fi
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep

diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec
index 4a68e2f77af5b86d6e95bed1618b91bf90c826a9..381619854ff013ed5c4971c71222a39b453dacd2 100644 (file)
--- a/xenserver/vswitch-xen.spec
+++ b/xenserver/vswitch-xen.spec
@@ -23,7 +23,7 @@ URL: http://www.vswitch.org/
 Version: %{vswitch_version}
 License: GPL3
 Release: 1
-Source: openvswitch+ext-%{vswitch_version}.tar.gz
+Source: openvswitch-%{vswitch_version}.tar.gz
 Buildroot: /tmp/vswitch-xen-rpm
 
 %description
@@ -32,7 +32,7 @@ support for the OpenFlow protocol for remote per-flow control of
 traffic.
 
 %prep
-%setup -q -n openvswitch+ext-%{vswitch_version}
+%setup -q -n openvswitch-%{vswitch_version}
 
 %build
 ./configure --prefix=%{_prefix} --localstatedir=%{_localstatedir} --with-l26=/lib/modules/%{xen_version}/build --enable-ssl %{build_number}