X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xenserver%2Fopenvswitch-xen.spec;h=90fee2ab08cf63b035a736aacd9464388e7ffdd4;hb=fba473391b92b6f2ce33a0acd68920941cb47b03;hp=5e7175ddde5308032f19475855da8287f7435bb8;hpb=bacd209169cc3a6e71b69109212670838e236f6f;p=openvswitch diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index 5e7175dd..90fee2ab 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -73,13 +73,14 @@ 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_refresh-network-uuids \ - $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/refresh-network-uuids +install -m 755 xenserver/usr_share_openvswitch_scripts_ovs-external-ids \ + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovs-external-ids +install -m 755 xenserver/usr_share_openvswitch_scripts_refresh-xs-network-uuids \ + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/refresh-xs-network-uuids install -m 755 xenserver/usr_sbin_xen-bugtool \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/xen-bugtool install -m 755 xenserver/usr_sbin_brctl \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/brctl -install -m 755 xenserver/ovs-xenserverd $RPM_BUILD_ROOT/usr/sbin/ 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 @@ -89,6 +90,7 @@ install -m 644 \ 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 # Get rid of stuff we don't want to make RPM happy. rm \ @@ -97,8 +99,6 @@ rm \ $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/bin/ovs-wdt \ - $RPM_BUILD_ROOT/usr/sbin/ovs-monitor \ $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 \ @@ -160,12 +160,12 @@ EOF fi fi -# On XenServer 5.5.0, we need refresh-network-uuids to run whenever +# On XenServer 5.5.0, we need refresh-xs-network-uuids to run whenever # XAPI starts or restarts. (On XenServer 5.6.0, XAPI calls the # "update" method of the vswitch-cfg-update plugin whenever it starts # or restarts, so this is no longer necessary.) if test "$PRODUCT_VERSION" = "5.5.0"; then - RNU=/usr/share/openvswitch/scripts/refresh-network-uuids + RNU=/usr/share/openvswitch/scripts/refresh-xs-network-uuids XSS=/opt/xensource/libexec/xapi-startup-script if test -e $XSS && (test ! -L $XSS || test "`readlink $XSS`" != $RNU); then echo "$XSS is already in use, refusing to overwrite" @@ -173,8 +173,15 @@ if test "$PRODUCT_VERSION" = "5.5.0"; then fi rm -f $XSS ln -s $RNU $XSS + + # If /etc/xensource/network.conf doesn't exist (it was added in 5.6.0), + # then interface-reconfigure will be unhappy when we run it below. + if test ! -e /etc/xensource/network.conf; then + echo bridge > /etc/xensource/network.conf + fi fi + if test ! -e /var/xapi/network.dbcache; then if test "$1" = 1; then printf "Creating xapi database cache... " @@ -339,8 +346,13 @@ if [ "$1" = "0" ]; then # $1 = 1 for upgrade rm -f /etc/openvswitch/vswitchd.cacert rm -f /var/xapi/network.dbcache - # Configure system to use bridge - echo bridge > /etc/xensource/network.conf + if test "$PRODUCT_VERSION" != "5.5.0"; then + # Configure system to use bridge + echo bridge > /etc/xensource/network.conf + else + # Get rid of network.conf entirely, to make the system pristine. + rm -f /etc/xensource/network.conf + fi printf "\nYou MUST reboot the server now to complete the change to\n" printf "standard Xen networking. Attempts to modify networking on the\n" @@ -358,7 +370,30 @@ fi /etc/profile.d/openvswitch.sh /lib/modules/%{xen_version}/kernel/extra/openvswitch/openvswitch_mod.ko /lib/modules/%{xen_version}/kernel/extra/openvswitch/brcompat_mod.ko -/usr/share/openvswitch/scripts/refresh-network-uuids +/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/scripts/ovs-external-ids +/usr/share/openvswitch/scripts/refresh-xs-network-uuids /usr/share/openvswitch/scripts/interface-reconfigure /usr/share/openvswitch/scripts/InterfaceReconfigure.py /usr/share/openvswitch/scripts/InterfaceReconfigureBridge.py @@ -370,7 +405,6 @@ fi /usr/share/openvswitch/vswitch.ovsschema /usr/sbin/ovs-brcompatd /usr/sbin/ovs-vswitchd -/usr/sbin/ovs-xenserverd /usr/sbin/ovsdb-server /usr/bin/ovs-appctl /usr/bin/ovs-dpctl @@ -387,11 +421,12 @@ fi /usr/share/man/man8/ovs-brcompatd.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/man8/ovs-vsctl.8.gz /usr/share/man/man8/ovs-vswitchd.8.gz -/usr/share/man/man8/ovs-xenserverd.8.gz /var/lib/openvswitch -%exclude /usr/lib/xsconsole/plugins-base/*.pyc -%exclude /usr/lib/xsconsole/plugins-base/*.pyo -%exclude /usr/share/openvswitch/scripts/*.pyc -%exclude /usr/share/openvswitch/scripts/*.pyo +%exclude /usr/lib/xsconsole/plugins-base/*.py[co] +%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]