From: Ben Pfaff Date: Fri, 3 Feb 2012 21:34:45 +0000 (-0800) Subject: xenserver: Simplify RPM build instructions. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b0070063774b65fc881343e5dd74c4eb8eb0e50;p=openvswitch xenserver: Simplify RPM build instructions. I got tired of trying to follow them properly myself. Signed-off-by: Ben Pfaff --- diff --git a/INSTALL.XenServer b/INSTALL.XenServer index 827a8400..02c9a66f 100644 --- a/INSTALL.XenServer +++ b/INSTALL.XenServer @@ -10,30 +10,51 @@ These instructions have been tested with XenServer 5.6 FP1. Building Open vSwitch for XenServer ----------------------------------- -The recommended build environment to build RPMs for Citrix XenServer -is the DDK VM available from Citrix. If you are building from an Open -vSwitch distribution tarball, this VM has all the tools that you will -need. If you are building from an Open vSwitch Git tree, then you -will need to first create a distribution tarball elsewhere, by running -"./boot.sh; ./configure; make dist" in the Git tree, because the DDK -VM does not include Autoconf or Automake that are required to -bootstrap the Open vSwitch distribution. - -Once you have a distribution tarball, copy it into -/usr/src/redhat/SOURCES inside the VM. Then execute the following: +You may build from an Open vSwitch distribution tarball or from an +Open vSwitch Git tree. The recommended build environment to build +RPMs for Citrix XenServer is the DDK VM available from Citrix. + +1. If you are building from an Open vSwitch Git tree, then you will + need to first create a distribution tarball by running "./boot.sh; + ./configure; make dist" in the Git tree. You cannot run this in + the DDK VM, because it lacks tools that are necessary to bootstrap + the Open vSwitch distribution. Instead, you must run this on a + machine that has the tools listed in INSTALL.Linux as prerequisites + for building from a Git tree. + +2. Copy the distribution tarball into /usr/src/redhat/SOURCES inside + the DDK VM. + +3. In the DDK VM, unpack the distribution tarball into a temporary + directory and "cd" into the root of the distribution tarball. + +4. To build Open vSwitch userspace, run: + + rpmbuild -bb xenserver/openvswitch-xen.spec + + This produces three RPMs in /usr/src/redhat/RPMS/i386: + "openvswitch", "openvswitch-modules-xen", and + "openvswitch-debuginfo". + +Build Parameters +---------------- + +openvswitch-xen.spec needs to know a number of pieces of information +about the XenServer kernel. Usually, it can figure these out for +itself, but if it does not do it correctly then you can specify them +yourself as parameters to the build. Thus, the final "rpmbuild" step +above can be elaborated as: VERSION= KERNEL_NAME= KERNEL_VERSION= KERNEL_FLAVOR= - cd /tmp - tar xfz /usr/src/redhat/SOURCES/openvswitch-$VERSION.tar.gz rpmbuild \ -D "openvswitch_version $VERSION" \ -D "kernel_name $KERNEL_NAME" \ -D "kernel_version $KERNEL_VERSION" \ -D "kernel_flavor $KERNEL_FLAVOR" \ - -bb openvswitch-$VERSION/xenserver/openvswitch-xen.spec + -bb xenserver/openvswitch-xen.spec where: @@ -52,10 +73,6 @@ where: The "xen" flavor is the main running kernel flavor and the "kdump" flavor is the crashdump kernel flavor. Commonly, one would specify "xen" here. -Three RPMs will be output into /usr/src/redhat/RPMS/i386, whose names begin -with "openvswitch", "openvswitch-modules-xen" (if building for kernel_flavor=xen), -and "openvswitch-debuginfo". - Installing Open vSwitch for XenServer ------------------------------------- diff --git a/rhel/automake.mk b/rhel/automake.mk index 36825410..87c4552c 100644 --- a/rhel/automake.mk +++ b/rhel/automake.mk @@ -1,4 +1,4 @@ -# 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 @@ -21,16 +21,16 @@ EXTRA_DIST += \ rhel/openvswitch.spec.in \ rhel/usr_share_openvswitch_scripts_sysconfig.template -update_spec = \ +update_rhel_spec = \ ($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \ < $(srcdir)/rhel/$(@F).in > $(@F).tmp || exit 1; \ if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi $(srcdir)/rhel/openvswitch-kmod-rhel5.spec: rhel/openvswitch-kmod-rhel5.spec.in $(top_builddir)/config.status - $(update_spec) + $(update_rhel_spec) $(srcdir)/rhel/openvswitch-kmod-rhel6.spec: rhel/openvswitch-kmod-rhel6.spec.in $(top_builddir)/config.status - $(update_spec) + $(update_rhel_spec) $(srcdir)/rhel/openvswitch.spec: rhel/openvswitch.spec.in $(top_builddir)/config.status - $(update_spec) + $(update_rhel_spec) diff --git a/xenserver/automake.mk b/xenserver/automake.mk index 02fc65f3..c443bddd 100644 --- a/xenserver/automake.mk +++ b/xenserver/automake.mk @@ -1,4 +1,4 @@ -# 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 @@ -17,6 +17,7 @@ EXTRA_DIST += \ xenserver/etc_xapi.d_plugins_openvswitch-cfg-update \ xenserver/etc_xensource_scripts_vif \ xenserver/openvswitch-xen.spec \ + xenserver/openvswitch-xen.spec.in \ xenserver/opt_xensource_libexec_InterfaceReconfigure.py \ xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py \ xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py \ @@ -24,3 +25,8 @@ EXTRA_DIST += \ xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \ xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync \ xenserver/usr_share_openvswitch_scripts_sysconfig.template + +$(srcdir)/xenserver/openvswitch-xen.spec: xenserver/openvswitch-xen.spec.in $(top_builddir)/config.status + ($(ro_shell) && sed -e 's,[@]VERSION[@],$(VERSION),g') \ + < $(srcdir)/xenserver/$(@F).in > $(@F).tmp || exit 1; \ + if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index 29c3c1f9..4fbb425e 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -19,6 +19,17 @@ # -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 diff --git a/xenserver/openvswitch-xen.spec.in b/xenserver/openvswitch-xen.spec.in new file mode 100644 index 00000000..7ab5af8d --- /dev/null +++ b/xenserver/openvswitch-xen.spec.in @@ -0,0 +1,452 @@ +# Spec file for Open vSwitch. + +# 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 +# notice and this notice are preserved. This file is offered as-is, +# without warranty of any kind. + +# When building, the rpmbuild command line should define +# openvswitch_version, kernel_name, kernel_version, kernel_flavor, +# and build_number using -D arguments. +# for example: +# +# 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 + +%if %{?openvswitch_version:0}%{!?openvswitch_version:1} +%define openvswitch_version @VERSION@ +%endif + +%if %{?kernel_name:0}%{!?kernel_name:1} +%define kernel %(rpm -qa 'kernel*xen-devel' | head -1) +%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 + +# build-supplemental-pack.sh requires this naming for kernel module packages +%define module_package modules-%{kernel_flavor}-%{kernel_version} + +Name: openvswitch +Summary: Open vSwitch daemon/database/utilities +Group: System Environment/Daemons +URL: http://www.openvswitch.org/ +Vendor: Nicira Networks, Inc. +Version: %{openvswitch_version} + +License: ASL 2.0 +Release: 1 +Source: openvswitch-%{openvswitch_version}.tar.gz +Buildroot: /tmp/openvswitch-xen-rpm +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} + +%build +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=%{_localstatedir} --with-linux=/lib/modules/%{xen_version}/build --enable-ssl %{?build_number} +make %{_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +install -d -m 755 $RPM_BUILD_ROOT/etc +install -d -m 755 $RPM_BUILD_ROOT/etc/init.d +install -m 755 xenserver/etc_init.d_openvswitch \ + $RPM_BUILD_ROOT/etc/init.d/openvswitch +install -m 755 xenserver/etc_init.d_openvswitch-xapi-update \ + $RPM_BUILD_ROOT/etc/init.d/openvswitch-xapi-update +install -d -m 755 $RPM_BUILD_ROOT/etc/sysconfig +install -d -m 755 $RPM_BUILD_ROOT/etc/logrotate.d +install -m 755 xenserver/etc_logrotate.d_openvswitch \ + $RPM_BUILD_ROOT/etc/logrotate.d/openvswitch +install -d -m 755 $RPM_BUILD_ROOT/etc/profile.d +install -m 755 xenserver/etc_profile.d_openvswitch.sh \ + $RPM_BUILD_ROOT/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/usr/share/openvswitch/scripts +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 \ + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/InterfaceReconfigure.py +install -m 644 xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py \ + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/InterfaceReconfigureBridge.py +install -m 644 xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py \ + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/InterfaceReconfigureVswitch.py +install -m 755 xenserver/etc_xensource_scripts_vif \ + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/vif +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 -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 -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-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-pki.8 + +install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch + +%clean +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 + +# Create default or update existing /etc/sysconfig/openvswitch. +SYSCONFIG=/etc/sysconfig/openvswitch +TEMPLATE=/usr/share/openvswitch/scripts/sysconfig.template +if [ ! -e $SYSCONFIG ]; then + cp $TEMPLATE $SYSCONFIG +else + for var in $(awk -F'[ :]' '/^# [_A-Z0-9]+:/{print $2}' $TEMPLATE) + do + if ! grep $var $SYSCONFIG >/dev/null 2>&1; then + echo >> $SYSCONFIG + sed -n "/$var:/,/$var=/p" $TEMPLATE >> $SYSCONFIG + fi + done +fi + +# Deliberately break %postun in broken OVS builds that revert original +# XenServer scripts during rpm -U by moving the directory where it thinks +# they are saved. +if [ -d /usr/lib/openvswitch/xs-original ]; then + mkdir -p /usr/lib/openvswitch/xs-saved + mv /usr/lib/openvswitch/xs-original/* /usr/lib/openvswitch/xs-saved/ && + rmdir /usr/lib/openvswitch/xs-original +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 $replace_files; do + s=$(basename "$f") + t=$(readlink "$f") + if [ -f "$f" ] && [ "$t" != "/usr/share/openvswitch/scripts/$s" ]; then + mv "$f" /usr/lib/openvswitch/xs-saved/ \ + || printf "Could not save original XenServer $s script\n" + ln -s "/usr/share/openvswitch/scripts/$s" "$f" \ + || printf "Could not link to Open vSwitch $s script\n" + fi +done + +# Clean up dangling symlinks to removed OVS replacement scripts no longer +# 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 $keep_files; do + saved=/usr/lib/openvswitch/xs-saved/$(basename "$orig") + [ -e "$saved" ] && mv -f "$saved" "$orig" +done + +# Ensure all required services are set to run +for s in openvswitch openvswitch-xapi-update; do + if chkconfig --list $s >/dev/null 2>&1; then + chkconfig --del $s || printf "Could not remove $s init script." + fi + chkconfig --add $s || printf "Could not add $s init script." + chkconfig $s on || printf "Could not enable $s init script." +done + +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 + + printf "\n\n" +fi + +%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 = 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 + if chkconfig --list $s >/dev/null 2>&1; then + chkconfig --del $s || printf "Could not remove $s init script." + fi + done +fi + +%postun +# Restore original XenServer scripts if the OVS equivalent no longer exists. +# This works both in the upgrade and erase cases. +# This lists every file that every version of OVS has ever replaced. Never +# remove old files that OVS no longer replaces, or upgrades from old versions +# will fail to restore the XS originals, leaving the system in a broken state. +# Also be sure to add removed script paths to the %post scriptlet above to +# prevent the same problem when upgrading from old versions of OVS that lack +# this restore-on-upgrade logic. +for f in \ + /etc/xensource/scripts/vif \ + /usr/sbin/brctl \ + /usr/sbin/xen-bugtool \ + /opt/xensource/libexec/interface-reconfigure \ + /opt/xensource/libexec/InterfaceReconfigure.py \ + /opt/xensource/libexec/InterfaceReconfigureBridge.py \ + /opt/xensource/libexec/InterfaceReconfigureVswitch.py +do + # Only revert dangling symlinks. + if [ -h "$f" ] && [ ! -e "$f" ]; then + s=$(basename "$f") + if [ ! -f "/usr/lib/openvswitch/xs-saved/$s" ]; then + printf "Original XenServer $s script not present in /usr/lib/openvswitch/xs-saved\n" >&2 + printf "Could not restore original XenServer script.\n" >&2 + else + (rm -f "$f" \ + && mv "/usr/lib/openvswitch/xs-saved/$s" "$f") \ + || printf "Could not restore original XenServer $s script.\n" >&2 + fi + fi +done + +if [ "$1" = "0" ]; then # $1 = 0 for uninstall + rm -f /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.pyc \ + /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.pyo + + rm -f /usr/share/openvswitch/scripts/InterfaceReconfigure.pyc \ + /usr/share/openvswitch/scripts/InterfaceReconfigure.pyo \ + /usr/share/openvswitch/scripts/InterfaceReconfigureBridge.pyc \ + /usr/share/openvswitch/scripts/InterfaceReconfigureBridge.pyo \ + /usr/share/openvswitch/scripts/InterfaceReconfigureVSwitch.pyc \ + /usr/share/openvswitch/scripts/InterfaceReconfigureVSwitch.pyo + + # Remove all configuration files + rm -f /etc/openvswitch/conf.db + rm -f /etc/sysconfig/openvswitch + rm -f /etc/openvswitch/vswitchd.cacert + + # Remove saved XenServer scripts directory, but only if it's empty + rmdir -p /usr/lib/openvswitch/xs-saved 2>/dev/null +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/* +/etc/logrotate.d/openvswitch +/etc/profile.d/openvswitch.sh +/usr/share/openvswitch/python/ +/usr/share/openvswitch/scripts/ovs-xapi-sync +/usr/share/openvswitch/scripts/interface-reconfigure +/usr/share/openvswitch/scripts/InterfaceReconfigure.py +/usr/share/openvswitch/scripts/InterfaceReconfigureBridge.py +/usr/share/openvswitch/scripts/InterfaceReconfigureVswitch.py +/usr/share/openvswitch/scripts/vif +/usr/share/openvswitch/scripts/sysconfig.template +/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 +/usr/bin/ovs-vsctl +/usr/bin/ovsdb-client +/usr/bin/ovsdb-tool +/usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.py +/usr/share/man/man1/ovsdb-client.1.gz +/usr/share/man/man1/ovsdb-server.1.gz +/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 +/var/lib/openvswitch +%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/scripts/*.py[co] +%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