X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fopenvswitch-xen.spec;h=20f309b56327dbb09b1099ae2f739470a0fa6305;hb=efbf4896385cca076de2329a950d0d162dfb68cc;hp=ab2134e20d3762146188d8a97b61b8a27501102e;hpb=fbca1e20e84bc34537f0a3db073195f6783fb373;p=sliver-openvswitch.git diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index ab2134e20..20f309b56 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -1,6 +1,6 @@ # Spec file for Open vSwitch. -# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc. +# Copyright (C) 2009, 2010, 2011, 2012 Nicira Networks, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -8,22 +8,24 @@ # 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 +# 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 version %{openvswitch_version}-%{xen_version} +%define xen_version %{kernel_version}%{kernel_flavor} # bump this when breaking compatibility with userspace %define module_abi_version 0 -# extract kernel type (xen or kdump) -%define binsuffix -%(echo '%{xen_version}' | sed -r 's/^.*[0-9]+//') -# kernel version string w/o kernel type -%define kernel_version %(echo '%{xen_version}' | sed -r 's/[a-z]+$//') # build-supplemental-pack.sh requires this naming for kernel module packages -%define module_package modules%{binsuffix}-%{kernel_version} +%define module_package modules-%{kernel_flavor}-%{kernel_version} Name: openvswitch Summary: Open vSwitch daemon/database/utilities @@ -47,8 +49,8 @@ traffic. Summary: Open vSwitch kernel module Group: System Environment/Kernel License: GPLv2 -Provides: %{name}-modules = %{kernel_version}, openvswitch_mod.ko.%{module_abi_version} -Requires: kernel%{binsuffix} = %{kernel_version} +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 @@ -58,7 +60,7 @@ Open vSwitch Linux kernel module compiled against kernel version %setup -q -n openvswitch-%{openvswitch_version} %build -./configure --prefix=/usr --sysconfdir=/etc --localstatedir=%{_localstatedir} --with-l26=/lib/modules/%{xen_version}/build --enable-ssl %{build_number} +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=%{_localstatedir} --with-linux=/lib/modules/%{xen_version}/build --enable-ssl %{build_number} make %{_smp_mflags} %install @@ -80,12 +82,7 @@ install -m 755 xenserver/etc_profile.d_openvswitch.sh \ install -d -m 755 $RPM_BUILD_ROOT/etc/xapi.d/plugins install -m 755 xenserver/etc_xapi.d_plugins_openvswitch-cfg-update \ $RPM_BUILD_ROOT/etc/xapi.d/plugins/openvswitch-cfg-update -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/usr/share/openvswitch/scripts -install -m 644 vswitchd/vswitch.ovsschema \ - $RPM_BUILD_ROOT/usr/share/openvswitch/vswitch.ovsschema install -m 755 xenserver/opt_xensource_libexec_interface-reconfigure \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/interface-reconfigure install -m 644 xenserver/opt_xensource_libexec_InterfaceReconfigure.py \ @@ -100,28 +97,30 @@ install -m 755 xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovs-xapi-sync install -m 755 xenserver/usr_share_openvswitch_scripts_sysconfig.template \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/sysconfig.template -install -m 755 xenserver/usr_share_openvswitch_scripts_xen-bugtool-tc-class-show \ - $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/xen-bugtool-tc-class-show -install -m 755 utilities/ovs-save \ - $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovs-save install -d -m 755 $RPM_BUILD_ROOT/usr/lib/xsconsole/plugins-base install -m 644 \ 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 xenserver/uuid.py $RPM_BUILD_ROOT/usr/share/openvswitch/python +install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/extra/openvswitch +find datapath/linux -name *.ko -exec install -m 755 \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/extra/openvswitch \; +install python/compat/uuid.py $RPM_BUILD_ROOT/usr/share/openvswitch/python +install python/compat/argparse.py $RPM_BUILD_ROOT/usr/share/openvswitch/python + +install -d -m 755 $RPM_BUILD_ROOT/etc/xensource/bugtool +mv $RPM_BUILD_ROOT/usr/share/openvswitch/bugtool-plugins/* $RPM_BUILD_ROOT/etc/xensource/bugtool # Get rid of stuff we don't want to make RPM happy. rm \ + $RPM_BUILD_ROOT/usr/bin/ovs-benchmark \ + $RPM_BUILD_ROOT/usr/sbin/ovs-bugtool \ $RPM_BUILD_ROOT/usr/bin/ovs-controller \ - $RPM_BUILD_ROOT/usr/bin/ovs-discover \ - $RPM_BUILD_ROOT/usr/bin/ovs-openflowd \ $RPM_BUILD_ROOT/usr/bin/ovs-pki \ + $RPM_BUILD_ROOT/usr/bin/ovs-test \ + $RPM_BUILD_ROOT/usr/share/man/man8/ovs-test.8 \ + $RPM_BUILD_ROOT/usr/share/man/man1/ovs-benchmark.1 \ + $RPM_BUILD_ROOT/usr/share/man/man8/ovs-bugtool.8 \ $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-openflowd.8 \ $RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8 install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch @@ -130,28 +129,73 @@ install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch 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 +# A list of Citrix XenServer scripts that we might need to replace +# with our own versions. +scripts=" + /etc/xensource/scripts/vif + /opt/xensource/libexec/InterfaceReconfigure.py + /opt/xensource/libexec/InterfaceReconfigureBridge.py + /opt/xensource/libexec/InterfaceReconfigureVswitch.py + /opt/xensource/libexec/interface-reconfigure" + +# Calculate into $md5sums a comma-separated set of md5sums of the +# Citrix XenServer scripts that we might need to replace. We might be +# upgrading an older version of the package that moved the files out +# of the way, so we need to look for the files in those out-of-the-way +# locations first. +md5sums= +for script in $scripts; do + b=$(basename "$script") + if test -e /usr/lib/openvswitch/xs-saved/"$b"; then + f=/usr/lib/openvswitch/xs-saved/"$b" + elif test -e /usr/lib/openvswitch/xs-original/"$b"; then + f=/usr/lib/openvswitch/xs-original/"$b" + elif test -e "$script" && test ! -h "$script"; then + f=$script + else + printf "\n$script: not found\n" + f=/dev/null fi -fi + md5sums="$md5sums,$(md5sum $f | awk '{print $1}')" +done +md5sums=${md5sums#,} + +# Now check the md5sums against the known sets of md5sums: +# +# - If they are known to be a version of XenServer scripts that we should +# replace, we replace them (by putting $scripts into $replace_files). +# +# - Otherwise, we guess that it's better not to replace them, because the +# improvements that our versions of the scripts provide are minimal, so +# it's better to avoid possibly breaking any changes made upstream by +# Citrix. +case $md5sums in + cf09a68d9f8b434e79a4c83b01a3bb4b,395866df1b0b20c12c4dd2f7de0ecdb4,9d493545ae81463239d3162cbc798852,862d0939b441de9264a900628e950fe9,21f85db25599d7f026cd489385d58aa6) + keep_files= + replace_files=$scripts + printf "\nVerified host scripts from XenServer 6.0.0.\n" + ;; + + c5f48246577a17cf1b971fb5ce4e920b,2e2c912f86f9c536c89adc34ff3c2b2b,28d3ff72d72bdec4f37d70699f5edb76,67e1d0af16fc1ddf10009c5c063ad2ba,24bae6906d182ba47668174f8e480cc6) + keep_files= + replace_files=$scripts + printf "\nVerified host scripts from XenServer 5.6-FP1.\n" + ;; + + *) + keep_files=$scripts + replace_files= + cat </dev/null 2>&1; then :; else cat >>/etc/sysctl.conf < /dev/null fi @@ -208,13 +252,7 @@ fi # Replace XenServer files by our versions. mkdir -p /usr/lib/openvswitch/xs-saved \ || printf "Could not create script backup directory.\n" -for f in \ - /opt/xensource/libexec/interface-reconfigure \ - /opt/xensource/libexec/InterfaceReconfigure.py \ - /opt/xensource/libexec/InterfaceReconfigureBridge.py \ - /opt/xensource/libexec/InterfaceReconfigureVswitch.py \ - /etc/xensource/scripts/vif -do +for f in $replace_files; do s=$(basename "$f") t=$(readlink "$f") if [ -f "$f" ] && [ "$t" != "/usr/share/openvswitch/scripts/$s" ]; then @@ -229,10 +267,7 @@ done # provided by OVS. Any time a replacement script is removed from OVS, # it should be added here to ensure correct reversion from old versions of # OVS that don't clean up dangling symlinks during the uninstall phase. -for orig in \ - /usr/sbin/brctl \ - /usr/sbin/xen-bugtool -do +for orig in /usr/sbin/brctl /usr/sbin/xen-bugtool $keep_files; do saved=/usr/lib/openvswitch/xs-saved/$(basename "$orig") [ -e "$saved" ] && mv -f "$saved" "$orig" done @@ -246,28 +281,45 @@ for s in openvswitch openvswitch-xapi-update; do 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 = 1 for install + # Configure system to use Open vSwitch + /opt/xensource/bin/xe-switch-network-backend vswitch +else # $1 = 2 for upgrade + + 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 -if [ "$1" = "1" ]; then # $1 = 2 for upgrade - 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" -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." printf "\n\n" fi -%post %{module_package} +%posttrans %{module_package} # Ensure that modprobe will find our modules. +# +# This has to be in %posttrans instead of %post because older versions +# installed modules into a different directory and "rpm -U" runs the +# new version's %post before removing the old version's files, so if +# we use %post then depmod may find the old versions that are about to +# be removed. depmod %{xen_version} %preun -if [ "$1" = "0" ]; then # $1 = 1 for upgrade +if [ "$1" = "0" ]; then # $1 = 0 for uninstall + # Configure system to use bridge + /opt/xensource/bin/xe-switch-network-backend bridge + + # The "openvswitch" service should have been removed from + # "xe-switch-network-backend bridge". for s in openvswitch openvswitch-xapi-update; do - chkconfig --del $s || printf "Could not remove $s init script." + if chkconfig --list $s >/dev/null 2>&1; then + chkconfig --del $s || printf "Could not remove $s init script." + fi done fi @@ -303,7 +355,7 @@ do fi done -if [ "$1" = "0" ]; then # $1 = 1 for upgrade +if [ "$1" = "0" ]; then # $1 = 0 for uninstall rm -f /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.pyc \ /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.pyo @@ -318,50 +370,22 @@ if [ "$1" = "0" ]; then # $1 = 1 for upgrade rm -f /etc/openvswitch/conf.db rm -f /etc/sysconfig/openvswitch rm -f /etc/openvswitch/vswitchd.cacert - rm -f /var/xapi/network.dbcache # Remove saved XenServer scripts directory, but only if it's empty rmdir -p /usr/lib/openvswitch/xs-saved 2>/dev/null - - # Configure system to use bridge - echo bridge > /etc/xensource/network.conf - - printf "\nYou MUST reboot the server now to complete the change to\n" - printf "standard Xen networking. Attempts to modify networking on the\n" - printf "server or any hosted VM will fail until after the reboot and\n" - printf "could leave the server in a state requiring manual recovery.\n\n" fi +exit 0 + %files %defattr(-,root,root) /etc/init.d/openvswitch /etc/init.d/openvswitch-xapi-update /etc/xapi.d/plugins/openvswitch-cfg-update -/etc/xensource/bugtool/network-status/openvswitch.xml +/etc/xensource/bugtool/* /etc/logrotate.d/openvswitch /etc/profile.d/openvswitch.sh -/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/python/ovs/db/data.py -/usr/share/openvswitch/python/ovs/db/error.py -/usr/share/openvswitch/python/ovs/db/idl.py -/usr/share/openvswitch/python/ovs/db/parser.py -/usr/share/openvswitch/python/ovs/db/schema.py -/usr/share/openvswitch/python/ovs/db/types.py -/usr/share/openvswitch/python/ovs/dirs.py -/usr/share/openvswitch/python/ovs/fatal_signal.py -/usr/share/openvswitch/python/ovs/json.py -/usr/share/openvswitch/python/ovs/jsonrpc.py -/usr/share/openvswitch/python/ovs/ovsuuid.py -/usr/share/openvswitch/python/ovs/poller.py -/usr/share/openvswitch/python/ovs/process.py -/usr/share/openvswitch/python/ovs/reconnect.py -/usr/share/openvswitch/python/ovs/socket_util.py -/usr/share/openvswitch/python/ovs/stream.py -/usr/share/openvswitch/python/ovs/timeval.py -/usr/share/openvswitch/python/ovs/util.py -/usr/share/openvswitch/python/uuid.py +/usr/share/openvswitch/python/ /usr/share/openvswitch/scripts/ovs-xapi-sync /usr/share/openvswitch/scripts/interface-reconfigure /usr/share/openvswitch/scripts/InterfaceReconfigure.py @@ -369,14 +393,18 @@ fi /usr/share/openvswitch/scripts/InterfaceReconfigureVswitch.py /usr/share/openvswitch/scripts/vif /usr/share/openvswitch/scripts/sysconfig.template -/usr/share/openvswitch/scripts/xen-bugtool-tc-class-show +/usr/share/openvswitch/scripts/ovs-bugtool-* /usr/share/openvswitch/scripts/ovs-save +/usr/share/openvswitch/scripts/ovs-ctl +/usr/share/openvswitch/scripts/ovs-lib /usr/share/openvswitch/vswitch.ovsschema +/usr/sbin/ovs-vlan-bug-workaround /usr/sbin/ovs-vswitchd /usr/sbin/ovsdb-server /usr/bin/ovs-appctl /usr/bin/ovs-dpctl /usr/bin/ovs-ofctl +/usr/bin/ovs-parse-leaks /usr/bin/ovs-pcap /usr/bin/ovs-tcpundump /usr/bin/ovs-vlan-test @@ -389,11 +417,13 @@ fi /usr/share/man/man1/ovsdb-tool.1.gz /usr/share/man/man5/ovs-vswitchd.conf.db.5.gz /usr/share/man/man8/ovs-appctl.8.gz +/usr/share/man/man8/ovs-ctl.8.gz /usr/share/man/man8/ovs-dpctl.8.gz /usr/share/man/man8/ovs-ofctl.8.gz /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 @@ -407,5 +437,5 @@ fi %exclude /usr/share/openvswitch/python/ovs/db/*.py[co] %files %{module_package} -/lib/modules/%{xen_version}/kernel/extra/openvswitch/openvswitch_mod.ko -%exclude /lib/modules/%{xen_version}/kernel/extra/openvswitch/brcompat_mod.ko +/lib/modules/%{xen_version}/extra/openvswitch/openvswitch_mod.ko +%exclude /lib/modules/%{xen_version}/extra/openvswitch/brcompat_mod.ko