aboutsummaryrefslogtreecommitdiff
path: root/debian
AgeCommit message (Collapse)Author
2012-03-19debian: Avoid unit test failure when doing "unofficial" builds.Ben Pfaff
The configure option --with-build-number=0 is interpreted differently in different places. The configure script itself accepts 0 as an actual build number and puts '#define BUILDNR "+build0"' into config.h. The code in python/automake.mk treats 0 as "no build number" and puts 'BUILDNR = ""' into version.py. This commit avoids the problem by not passing 0 as a build number. Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-03-19debian: Bump standards-version to 3.9.3.Thomas Goirand
No other changes necessary. Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: Thomas Goirand <zigo@debian.org> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-03-19debian: Remove some useless files from the dkms pacakge.Thomas Goirand
This commit removes useless files from the dkms package that caused lintian warnings. (Many of the other files in the dkms package are also useless but do not cause lintian warnings so they are less important.) Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: Thomas Goirand <zigo@debian.org> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-03-19debian: Clean .pyc files in "clean" target.Thomas Goirand
Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: Thomas Goirand <zigo@debian.org> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-03-19debian: Remove po-debconf build dependency.Thomas Goirand
Open vSwitch no longer uses Debconf at all, for some time now. Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: Thomas Goirand <zigo@debian.org> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-03-19debian: Build-depend on python-all to pull in all Python versions.Thomas Goirand
Open vSwitch should support all Python versions in the distribution. This is the way to do it. Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: Thomas Goirand <zigo@debian.org> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-03-19debian: Add missing ${python:Depends} to openvswitch-test package.Thomas Goirand
Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: Thomas Goirand <zigo@debian.org> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-03-19debian: Improve long descriptions so as to better describe the packages.Thomas Goirand
Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: Thomas Goirand <zigo@debian.org> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-03-19debian: Bump debhelper compat level to 8 and make build-depends consistent.Thomas Goirand
Reviewed-by: Simon Horman <horms@verge.net.au> Signed-off-by: Thomas Goirand <zigo@debian.org> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-03-08ovs-monitor-ipsec: Detect correctly IPSEC configuration changesAnsis Atteka
If Open vSwitch has IPSEC tunnel (with certificates) and Interface table was updated, then ovs-monitor-ipsec daemon would incorrectly remove and readd all existing IPSEC tunnels. The root cause for this issue was that "peer_cert_file" key was present in interfaces dictionary, but it was missing in new_interfaces dictionary. v2: Do not fail buildtests Signed-off-by: Ansis Atteka <aatteka@nicira.com> Reported-by: Niklas Andersson <nandersson@nicira.com>
2012-03-08Revert "ovs-monitor-ipsec: Detect correctly IPSEC configuration changes"Ansis Atteka
This reverts commit 5e2a9988bb7853cad67a36e869d532d9d2f4533a. Signed-off-by: Ansis Atteka <aatteka@nicira.com>
2012-03-08ovs-monitor-ipsec: Detect correctly IPSEC configuration changesAnsis Atteka
If Open vSwitch has IPSEC tunnel (with certificates) and Interface table was updated, then ovs-monitor-ipsec daemon would incorrectly remove and readd all existing IPSEC tunnels. The root cause for this issue was that "peer_cert_file" key was present in interfaces dictionary, but it was missing in new_interfaces dictionary. Signed-off-by: Ansis Atteka <aatteka@nicira.com> Reported-by: Niklas Andersson <nandersson@nicira.com>
2012-02-28debian: Fix exit status of openvswitch-switch init script "status" command.Ben Pfaff
The init script ends with an explicit "exit 0" so nonzero exit codes from "ovs-ctl status" were being lost. Bug #9714. Reported-by: Paul Ingram <paul@nicira.com> CC: Sujatha Shetty <sshetty@nicira.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-02-15debian: Update changelog for 1.4.0-2 uploadSimon Horman
Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-02-14debian: Use provided kernel source dir instead of host kernel version.Ben Pfaff
DKMS passes in an explicit variable for the kernel source directory, so we should use that instead of `uname -r`. CC: 659685@bugs.debian.org Reported-by: Thomas Goirand <thomas@goirand.fr> Tested-by: Simon Horman <horms@verge.net.au> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-02-14debian: Do not run "make" if "configure" fails during DKMS build.Ben Pfaff
There is no point in trying to run "make" if "configure" failed. The "make" will fail too and the log will be harder to read. CC: Thomas Goirand <zigo@debian.org> CC: Simon Horman <horms@verge.net.au> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-02-13debian: Look in /lib/modules instead of /usr/src for DKMS kernel sources.Ben Pfaff
DKMS packages usually look in /lib/modules for kernel sources, since that is the "standard" location, but our packages was looking directly in /usr/src. This fixes the problem. Reported-by: Alban Browaeys <prahal@yahoo.com> Tested-by: Alban Browaeys <prahal@yahoo.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-02-13debian: Fix dependencies for openvswitch-datapath-dkms package.Ben Pfaff
The OVS kernel module, like other kernel modules, does not need a working userspace build environment, but the OVS "configure" script and makefiles don't support a kernel-only build, so "configure" fails if libc6-dev is not installed. It would be better to change the "configure" script and makefiles to handle this special case, but that was more work than I initially expected it to be. Bug #8606. Reported-by: Edwin Chiu <echiu@nicira.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-02-06debian: Don't install Python modules for obsolete Python versions.Ben Pfaff
Python 2.4 is obsolete, not present in Debian squeeze or sid, so don't install Python modules for it. It would be better to just put the files directly into /usr/share/pyshared/ovs/, instead of in site-packages for some specific Python version, but this causes problems for builds on squeeze, as documented in commit bc3aa0bf5 (debian: Make python-openvswitch packaging work with squeeze dh_python2.): The dh_python2 helper in Debian squeeze has a limitation that is not mentioned anywhere, as far as I can tell: Python files must be in /usr/lib/python#.#/site-packages to be installed. The version in Debian wheezy does not have the same limitation. This meant that building the Debian packages on squeeze silently produced a broken python-openvswitch package, whereas building the same thing on wheezy built a working package. This fixes the problem by putting the .py files where squeeze expects them. It works on wheezy too. A before-and-after "debdiff" shows that the only significant effect of this commit is to drop python2.4 symlinks. CC: horms@debian.org Reported-by: Luca Falavigna <ftpmaster@debian.org> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-02-03debian: Add dependency on ${misc:Depends} to openvswitch-testSimon Horman
This is necessary as openvswitch-test makes use of debhelper. As reported by lintian. Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-01-31debian: Add comment about upstream Linux 3.3 support in "changelog".v1.4.0Justin Pettit
Signed-off-by: Justin Pettit <jpettit@nicira.com>
2012-01-30Set dates for 1.4.0 release.Justin Pettit
2012-01-24debian: Delete log files correctly when packages are purged.Ben Pfaff
Debian Policy 10.8 says "Log files should be removed when the package is purged (but not when it is only removed)," but the Open vSwitch packages didn't properly implement this: - The openvswitch-brcompat and openvswitch-pki packages didn't delete their log files at purge time. - The openvswitch-switch package deleted all of the log files at purge time, even those owned by openvswitch-brcompat or openvswitch-pki. This commit fixes both problems. CC: 656448@bugs.debian.org Reported-by: Andreas Beckmann <debian@abeckmann.de> Signed-off-by: Ben Pfaff <blp@nicira.com>
2012-01-02Debian: Depend on python (>= 2.7) | python-argparseSimon Horman
Depend on python (>= 2.7) | python-argparse instead of python-argparse to avoid pulling in python2.6 See: http://bugs.debian.org/653645 Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Ben Pfaff <blp@nicira.com>
2011-12-20Add release date for 1.3.0.Ben Pfaff
This made it into branch-1.3 but not master. Signed-off-by: Ben Pfaff <blp@nicira.com>
2011-12-12debian: Consistently use American spelling of "license" in copyright.in.Ben Pfaff
Consistent spelling may make searches easier. Reported-by: Justin Pettit <jpettit@nicira.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
2011-12-12debian: Correct licensing information for user/kernel shared header files.Ben Pfaff
The intent is to license all shared user/kernel header files under both GPLv2 and Apache v2. The license statement here said GPLv3 instead of GPLv2, so this commit fixes that problem. Also, include/openvswitch used to be where all the shared user/kernel header files were located, but this is no longer true, and now there is a userspace-only header file also in include/openvswitch, so this commit now lists all of the user/kernel header files explicitly. Signed-off-by: Ben Pfaff <blp@nicira.com>
2011-12-12debian: Add sFlow license information and text to copyright.in.Ben Pfaff
sFlow licensing information was omitted from debian/copyright due to an oversight. This commit adds it. Reported-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Ben Pfaff <blp@nicira.com>
2011-12-09bugtool: move plugins data from /etc/openvswitch to /usr/share/openvswitchChris Wright
This is in repsonse to the following rpmlint warnings: W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/system-configuration/openvswitch.xml W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/system-logs/openvswitch.xml W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/system-configuration.xml W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/network-status/openvswitch.xml W: non-conffile-in-etc /etc/openvswitch/bugtool-plugins/kernel-info/openvswitch.xml The xenserver specfile still places them in /etc/xensource/bugtool since that's a distro policy. Of course, the rpmlint warnings are as well, however, this seems like a more logical place for the bugtool plugins. Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Ben Pfaff <blp@nicira.com>
2011-12-09utilites: rename ovs-lib.sh to ovs-libChris Wright
Rename this helper script to simply ovs-lib, since it's primarily a library of helper functions. Signed-off-by: Chris Wright <chrisw@sous-sol.org> Signed-off-by: Ben Pfaff <blp@nicira.com>
2011-11-30Declare the version as "1.4.0".Justin Pettit
2011-11-18ovs-test: A new tool that allows to diagnose connectivity and performance issuesAnsis Atteka
This tool will be a replacement for the current ovs-vlan-test utility. Besides from connectivity issues it will also be able to detect performance related issues in Open vSwitch setups. Currently it uses UDP and TCP protocols for stressing. Issue #6976
2011-11-10debian: Strip epoch from version number used in directory names.Ben Pfaff
This doesn't fix a visible bug, since there's no epoch in the Open vSwitch version used in Debian, but some Nicira internal build scripts were inserting an epoch so it was visible in our builds. Reported-by: Edwin Chiu <echiu@nicira.com>
2011-11-04debian: Fix build failure installing ovs-vswitchd.conf.db(5) manpage.Ben Pfaff
ovs-vswitchd.conf.db is distributed so it's in the source directory not the build directory. This fixes a Debian package build failure introduced by commit 9840bdbd "debian: Install ovs-vswitchd.conf.db(5) manpage." I did test that commit but the build failure didn't show up in my environment (probably I had a stray file left over from development).
2011-11-04debian: Install ovs-vswitchd.conf.db(5) manpage.Ben Pfaff
This manpage wasn't getting installed. This fixes it. The --language=C option to dh_installman is necessary to keep that script from thinking that the ".db" suffix indicates a translation into the "db" language (which doesn't actually exist) and therefore installing it into the wrong directory with the .db suffix stripped. Bug #8138. Reported-by: Ethan Jackson <ethan@nicira.com>
2011-11-01packaging: dpkg --purge command fails on Ubuntu 11.04Ansis Atteka
The problem is that postrm script is unable to remove contents of /var/log/openvswitch/ directory in case if it contains any other directories. Steps to reproduce on Ubuntu 11.04: 1. apt-get install openvswitch-switch 2. dpkg --purge openvswitch-switch 3. observe that purge failed, because of an empty "cores" directory inside /var/log/openvswitch/
2011-10-27Fix manpage-check on RHEL 5.Ben Pfaff
The version of groff on RHEL 5 doesn't include the .SY, .OP, or .YS macros that ovs-benchmark.1 uses, so the manpage-check target fails on that platform. This commit adds the groff definitions of those macros to a file and includes it into ovs-benchmark.1. I tested that this allows RHEL 5 to pass manpage-check.
2011-10-25Declare the version as "1.3.0".Justin Pettit
2011-10-25debian: Start ovs-monitor-ipsec after ovsdb running.Justin Pettit
ovs-monitor-ipsec uses the OVS database to get configuration, so don't bother starting the daemon until it's up. Debian recently switched to using the LSB fields in the header of init scripts to allow dependency-based boots. This is described in the following page: http://wiki.debian.org/LSBInitScripts/DependencyBasedBoot This commit makes use of those fields to get the ordering we want.
2011-10-06ovs-monitor-ipsec: Fix use_ssl_cert option implementation.Ben Pfaff
I skipped writing a unit test for this feature on the first go-around, and of course that meant it didn't work. Bug #7693. Reported-by: Michael Hu <mhu@nicira.com>
2011-10-05debian: ovs-monitor-ipsec requires root_prefix option.Ethan Jackson
Before this patch, if the root_prefix option is left unset ovs-monitor-ipsec will crash.
2011-10-05debian: Make ovs-monitor-ipsec executable.Ethan Jackson
Commit b153e667 "python: Upgrade daemon module to argparse." removed the execute bit. This was incorrect.
2011-10-05debian: Fully convert ovs-monitor-ipsec to vlog.Ethan Jackson
Commit 201bf205 "ovs-monitor-ipsec: Convert to vlog." only partially updated ovs-monitor-ipsec to the new vlog module. This commit completes the process.
2011-10-05debian: ovs-monitor-ipsec has a stale init script.Ethan Jackson
The ovs-monitor-ipsec init script used the old "pidfile-name" instead of the new "pidfile" option. This should cause it to fail when starting. This patch also causes ovs-monitor-ipsec to create a log file.
2011-10-05debian: Package the installed Python files, not those from the source tree.Ben Pfaff
The only difference between the Python files that are installed and the Python files found in the source tree is in the ovs.dirs module, but this is a very important difference: we want the directories used to be the ones configured in (e.g. /usr/share/openvswitch), not the only used by default by the source tree's dirs.py (e.g. /usr/local/share/openvswitch). I verified with "dpkg-deb -x" and "diff -ur" that in fact this is the only change that this commit makes. This bug has been in place since at least commit 1d273d6d8 "debian: Rename openvswitch-python to python-openvswitch" from over a year ago, but until now the packaged Python files didn't actually use any directories that differed between the two versions of dirs.py, so only now has the problem manifested. This problem prevented ovs-monitor-ipsec from finding the OVSDB schema file. Reported-by: Ethan Jackson <ethan@nicira.com>
2011-10-03debian: Make python-openvswitch packaging work with squeeze dh_python2.Ben Pfaff
The dh_python2 helper in Debian squeeze has a limitation that is not mentioned anywhere, as far as I can tell: Python files must be in /usr/lib/python#.#/site-packages to be installed. The version in Debian wheezy does not have the same limitation. This meant that building the Debian packages on squeeze silently produced a broken python-openvswitch package, whereas building the same thing on wheezy built a working package. This fixes the problem by putting the .py files where squeeze expects them. It works on wheezy too. Bug #7510. Reported-by: Michael Hu <mhu@nicira.com> Tested-by: Simon Horman <horms@verge.net.au>
2011-09-29bugtool: Collect "lacp/show" and "cfm/show" information.Justin Pettit
Feature #7496
2011-09-27ovs-monitor-ipsec: Convert to vlog.Ethan Jackson
2011-09-27python: Upgrade daemon module to argparse.Ethan Jackson
This patch also updates it's callers.
2011-09-27python: Backport argparse to older platforms.Ethan Jackson
Argparse has some convenient advantages over optparse including the ability to handle optional arguments to flags. It also supports parsing arguments as well as options. This patch copies argparse.py from Python 2.7 into a newly created compat directory. It made some very minor syntactic updates in the process. Platforms which have a Python version too old to include argparse by default will have this compat version installed as a workaround.