From 06e8eed60f587cead3734ea07feb1b70cca06d81 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 14 May 2009 14:06:08 -0700 Subject: [PATCH] Get rid of vswitchext entirely. --- .gitignore | 2 -- .gitmodules | 3 --- Makefile.am | 4 ---- acinclude.m4 | 32 --------------------------- boot.sh | 40 +--------------------------------- configure.ac | 2 -- debian/automake.mk | 2 +- debian/{control.in => control} | 12 ++++++++++ debian/rules | 3 --- xenserver/vswitch-xen.spec | 4 ++-- 10 files changed, 16 insertions(+), 88 deletions(-) delete mode 100644 .gitmodules rename debian/{control.in => control} (91%) diff --git a/.gitignore b/.gitignore index 4f38c485..480615ac 100644 --- 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 index 57d67d1f..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "ext"] - path = ext - url = ../openflowext diff --git a/Makefile.am b/Makefile.am index 95d67ff2..b3c98c8a 100644 --- 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 3c587805..43c4f826 100644 --- 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 33228e0b..05dd3599 100755 --- 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 < 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 d5cb0ad8..c8962607 100644 --- 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 ef0b0cb6..813987e7 100644 --- 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.in b/debian/control similarity index 91% rename from debian/control.in rename to debian/control index e344b9fe..770f11b7 100644 --- a/debian/control.in +++ b/debian/control @@ -129,3 +129,15 @@ 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/rules b/debian/rules index 8475ee74..695d61f4 100755 --- 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 4a68e2f7..38161985 100644 --- 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} -- 2.30.2