X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fopenvswitch-xen.spec;h=4fbb425ea87a741177e42a8c9e8545f0a6ec202f;hb=9886b6620ea710a4a8afd0a88271e563a64e7ea2;hp=821b289681b0da001814558e750fa929088ee7ba;hpb=454b299181be4e614e1dbc19bc7929ae9bfef439;p=sliver-openvswitch.git diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index 821b28968..4fbb425ea 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 @@ -19,15 +19,22 @@ # -D "build_number --with-build-number=123" # -bb /usr/src/redhat/SPECS/openvswitch-xen.spec +%if %{?openvswitch_version:0}%{!?openvswitch_version:1} +%define openvswitch_version 1.5.90 +%endif + +%if %{?kernel_name:0}%{!?kernel_name:1} +%define kernel %(rpm -qa 'kernel*xen-devel') +%define kernel_name %(rpm -q --queryformat "%%{Name}" %{kernel} | sed 's/-devel//' | sed 's/kernel-//') +%define kernel_version %(rpm -q --queryformat "%%{Version}-%%{Release}" %{kernel}) +%define kernel_flavor xen +%endif + %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-%{kernel_flavor}-%{kernel_version} @@ -64,7 +71,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 @@ -86,15 +93,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/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 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 \ @@ -109,26 +108,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}/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 +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-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-openflowd.8 \ $RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8 install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch @@ -137,6 +140,74 @@ install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch rm -rf $RPM_BUILD_ROOT %post +# 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 + 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 @@ -192,13 +263,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 @@ -213,10 +278,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 @@ -248,8 +310,14 @@ else # $1 = 2 for upgrade 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 @@ -325,32 +393,10 @@ exit 0 /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/kernel-info/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 @@ -358,8 +404,10 @@ exit 0 /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 @@ -367,6 +415,7 @@ exit 0 /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 @@ -379,6 +428,7 @@ exit 0 /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