# without warranty of any kind.
# When building, the rpmbuild command line should define
-# openvswitch_version, xen_version, and build_number using -D arguments.
+# openvswitch_version, kernel_name, kernel_version, kernel_flavor,
+# and build_number using -D arguments.
# for example:
#
-# rpmbuild -D "openvswitch_version 0.8.9~1+build123" -D "xen_version 2.6.18-128.1.1.el5.xs5.1.0.483.1000xen" -D "build_number --with-build-number=123" -bb /usr/src/redhat/SPECS/openvswitch-xen.spec
-#
-%define version %{openvswitch_version}-%{xen_version}
+# rpmbuild -D "openvswitch_version 1.1.0+build123"
+# -D "kernel_name NAME-xen"
+# -D "kernel_version 2.6.32.12-0.7.1.xs5.6.100.323.170596"
+# -D "kernel_flavor xen"
+# -D "build_number --with-build-number=123"
+# -bb /usr/src/redhat/SPECS/openvswitch-xen.spec
+
+%define xen_version %{kernel_version}%{kernel_flavor}
+
+# bump this when breaking compatibility with userspace
+%define module_abi_version 0
+
+# build-supplemental-pack.sh requires this naming for kernel module packages
+%define module_package modules-%{kernel_flavor}-%{kernel_version}
Name: openvswitch
-Summary: Virtual switch
+Summary: Open vSwitch daemon/database/utilities
Group: System Environment/Daemons
URL: http://www.openvswitch.org/
Vendor: Nicira Networks, Inc.
Version: %{openvswitch_version}
-# The entire source code is ASL 2.0 except datapath/ which is GPLv2
-License: ASL 2.0 and GPLv2
+License: ASL 2.0
Release: 1
Source: openvswitch-%{openvswitch_version}.tar.gz
Buildroot: /tmp/openvswitch-xen-rpm
-Requires: kernel-xen = %(echo '%{xen_version}' | sed 's/xen$//')
+Requires: openvswitch_mod.ko.%{module_abi_version}
%description
Open vSwitch provides standard network bridging functions augmented with
support for the OpenFlow protocol for remote per-flow control of
traffic.
+%package %{module_package}
+Summary: Open vSwitch kernel module
+Group: System Environment/Kernel
+License: GPLv2
+Provides: %{name}-modules-%{kernel_flavor} = %{kernel_version}, openvswitch_mod.ko.%{module_abi_version}
+Requires: kernel-%{kernel_name} = %{kernel_version}
+
+%description %{module_package}
+Open vSwitch Linux kernel module compiled against kernel version
+%{xen_version}.
+
%prep
%setup -q -n openvswitch-%{openvswitch_version}
install -d -m 755 $RPM_BUILD_ROOT/etc/xensource/bugtool/network-status
install -m 644 xenserver/etc_xensource_bugtool_network-status_openvswitch.xml \
$RPM_BUILD_ROOT/etc/xensource/bugtool/network-status/openvswitch.xml
+install -d -m 755 $RPM_BUILD_ROOT/etc/xensource/bugtool/kernel-info
+install -m 644 xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml \
+ $RPM_BUILD_ROOT/etc/xensource/bugtool/kernel-info/openvswitch.xml
install -d -m 755 $RPM_BUILD_ROOT/usr/share/openvswitch/scripts
install -m 644 vswitchd/vswitch.ovsschema \
$RPM_BUILD_ROOT/usr/share/openvswitch/vswitch.ovsschema
xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \
$RPM_BUILD_ROOT/usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.py
-install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/extra/openvswitch
-find datapath/linux-2.6 -name *.ko -exec install -m 755 \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/extra/openvswitch \;
+install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/extra/openvswitch
+find datapath/linux-2.6 -name *.ko -exec install -m 755 \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/extra/openvswitch \;
install xenserver/uuid.py $RPM_BUILD_ROOT/usr/share/openvswitch/python
# Get rid of stuff we don't want to make RPM happy.
rm \
$RPM_BUILD_ROOT/usr/bin/ovs-controller \
- $RPM_BUILD_ROOT/usr/bin/ovs-discover \
- $RPM_BUILD_ROOT/usr/bin/ovs-kill \
$RPM_BUILD_ROOT/usr/bin/ovs-openflowd \
$RPM_BUILD_ROOT/usr/bin/ovs-pki \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-controller.8 \
- $RPM_BUILD_ROOT/usr/share/man/man8/ovs-discover.8 \
- $RPM_BUILD_ROOT/usr/share/man/man8/ovs-kill.8 \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-openflowd.8 \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8
rm -rf $RPM_BUILD_ROOT
%post
-# Do not run the first block if we are in the XenServer installer
-if runlevel >/dev/null 2>&1; then
- if test ! -e /var/xapi/network.dbcache; then
- if test "$1" = 1; then
- printf "Creating xapi database cache... "
- else
- printf "warning: Open vSwitch is being re-installed or upgraded,\n"
- printf " but the xapi database cache is missing.\n"
- printf "Re-creating xapi database cache... "
- fi
-
- if /usr/share/openvswitch/scripts/interface-reconfigure rewrite; then
- printf "done.\n"
- else
- printf "FAILED\n"
- printf "Open vSwitch can only be installed on a XenServer that\n"
- printf "has connectivity to xapi on the pool master. Please\n"
- printf "fix connectivity to the pool master, then try again.\n"
- exit 1
- fi
- fi
-fi
-
-# Ensure that modprobe will find our modules.
-depmod %{xen_version}
-
if grep -F net.ipv4.conf.all.arp_filter /etc/sysctl.conf >/dev/null 2>&1; then :; else
cat >>/etc/sysctl.conf <<EOF
# This works around an issue in xhad, which binds to a particular
chkconfig $s on || printf "Could not enable $s init script."
done
-# Configure system to use Open vSwitch
-echo vswitch > /etc/xensource/network.conf
-
if [ "$1" = "1" ]; then # $1 = 2 for upgrade
+ # Configure system to use Open vSwitch
+ echo vswitch > /etc/xensource/network.conf
+
printf "\nYou MUST reboot the server NOW to complete the change to\n"
printf "Open vSwitch. Attempts to modify networking on the server\n"
printf "or any hosted VM will fail until after the reboot and could\n"
- printf "leave the server in an state requiring manual recovery.\n\n"
+ printf "leave the server in a state requiring manual recovery.\n\n"
else
- printf "\nTo use the new Open vSwitch install, you should reboot the\n"
- printf "server now. Failure to do so may result in incorrect operation."
+
+ mode=$(cat /etc/xensource/network.conf)
+ if [ "$mode" != "vswitch" ] && [ "$mode" != "openvswitch" ]; then
+ printf "\nThe server is not configured to run Open vSwitch. To run in\n"
+ printf "vswitch mode, you must run the following command:\n\n"
+ printf "\txe-switch-network-backend vswitch"
+ else
+ printf "\nTo use the new Open vSwitch install, you should reboot the\n"
+ printf "server now. Failure to do so may result in incorrect operation."
+ fi
+
printf "\n\n"
fi
+%post %{module_package}
+# Ensure that modprobe will find our modules.
+depmod %{xen_version}
+
%preun
if [ "$1" = "0" ]; then # $1 = 1 for upgrade
for s in openvswitch openvswitch-xapi-update; do
done
fi
-
%postun
# Restore original XenServer scripts if the OVS equivalent no longer exists.
# This works both in the upgrade and erase cases.
/etc/init.d/openvswitch-xapi-update
/etc/xapi.d/plugins/openvswitch-cfg-update
/etc/xensource/bugtool/network-status/openvswitch.xml
+/etc/xensource/bugtool/kernel-info/openvswitch.xml
/etc/logrotate.d/openvswitch
/etc/profile.d/openvswitch.sh
-/lib/modules/%{xen_version}/kernel/extra/openvswitch/openvswitch_mod.ko
/usr/share/openvswitch/python/ovs/__init__.py
/usr/share/openvswitch/python/ovs/daemon.py
/usr/share/openvswitch/python/ovs/db/__init__.py
/usr/share/openvswitch/scripts/xen-bugtool-tc-class-show
/usr/share/openvswitch/scripts/ovs-save
/usr/share/openvswitch/vswitch.ovsschema
+/usr/sbin/ovs-vlan-bug-workaround
/usr/sbin/ovs-vswitchd
/usr/sbin/ovsdb-server
/usr/bin/ovs-appctl
/usr/share/man/man8/ovs-parse-leaks.8.gz
/usr/share/man/man1/ovs-pcap.1.gz
/usr/share/man/man1/ovs-tcpundump.1.gz
+/usr/share/man/man8/ovs-vlan-bug-workaround.8.gz
/usr/share/man/man8/ovs-vlan-test.8.gz
/usr/share/man/man8/ovs-vsctl.8.gz
/usr/share/man/man8/ovs-vswitchd.8.gz
/var/lib/openvswitch
-%exclude /lib/modules/%{xen_version}/kernel/extra/openvswitch/brcompat_mod.ko
%exclude /usr/lib/xsconsole/plugins-base/*.py[co]
%exclude /usr/sbin/ovs-brcompatd
%exclude /usr/share/man/man8/ovs-brcompatd.8.gz
%exclude /usr/share/openvswitch/python/*.py[co]
%exclude /usr/share/openvswitch/python/ovs/*.py[co]
%exclude /usr/share/openvswitch/python/ovs/db/*.py[co]
+
+%files %{module_package}
+/lib/modules/%{xen_version}/extra/openvswitch/openvswitch_mod.ko
+%exclude /lib/modules/%{xen_version}/extra/openvswitch/brcompat_mod.ko
git://git.onelab.eu / sliver-openvswitch.git / blobdiff