From: Ben Pfaff Date: Fri, 23 Oct 2009 00:43:28 +0000 (-0700) Subject: Merge "citrix" into "master". X-Git-Tag: v0.99.0~50 X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=3f355f47f8e7343e909ccfa854454d667baf3c38 Merge "citrix" into "master". This merge took a little bit of care due to two issues: - Crossport of "interface-reconfigure" fixes from master back to citrix that had happened and needed to be canceled out of the merge. - New script "refresh-xs-network-uuids" added on citrix branch that needed to be moved from /root/vswitch/scripts to /usr/share/vswitch/scripts. --- 3f355f47f8e7343e909ccfa854454d667baf3c38 diff --cc configure.ac index 400ea7869,edfe0f75b..c8eed7c97 --- a/configure.ac +++ b/configure.ac @@@ -12,8 -12,8 +12,8 @@@ # See the License for the specific language governing permissions and # limitations under the License. -AC_PREREQ(2.60) +AC_PREREQ(2.63) - AC_INIT(openvswitch, 0.90.5, ovs-bugs@openvswitch.org) + AC_INIT(openvswitch, 0.90.6, ovs-bugs@openvswitch.org) NX_BUILDNR AC_CONFIG_SRCDIR([datapath/datapath.c]) AC_CONFIG_MACRO_DIR([m4]) diff --cc xenserver/README index 276cd6c2a,5407aac9d..ff692fd3f --- a/xenserver/README +++ b/xenserver/README @@@ -50,6 -50,12 +50,12 @@@ files are needed by the controller. This is called by the "vif" script, which is run when virtual interfaces are added and removed. - root_vswitch_scripts_refresh-xs-network-uuids ++ usr_share_vswitch_scripts_refresh-xs-network-uuids + + Script to refresh bridge..xs-network-uuids keys, which + can get out-of-sync following a pool join. Running this script + is an alternative to rebooting the host. + root_vswitch_scripts_sysconfig.template Template for vswitch's /etc/sysconfig/vswitch configuration diff --cc xenserver/automake.mk index 327543419,4c9c0a979..221925cda --- a/xenserver/automake.mk +++ b/xenserver/automake.mk @@@ -17,6 -17,7 +17,7 @@@ EXTRA_DIST += xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \ xenserver/usr_sbin_brctl \ xenserver/usr_sbin_xen-bugtool \ + xenserver/usr_share_vswitch_scripts_sysconfig.template \ + xenserver/usr_share_vswitch_scripts_dump-vif-details \ ++ xenserver/usr_share_vswitch_scripts_refresh-xs-network-uuids \ xenserver/vswitch-xen.spec diff --cc xenserver/usr_share_vswitch_scripts_refresh-xs-network-uuids index 000000000,34fe1e7e9..34fe1e7e9 mode 000000,100755..100755 --- a/xenserver/usr_share_vswitch_scripts_refresh-xs-network-uuids +++ b/xenserver/usr_share_vswitch_scripts_refresh-xs-network-uuids diff --cc xenserver/vswitch-xen.spec index d9a18bd98,c79309d22..d8e32e48f --- a/xenserver/vswitch-xen.spec +++ b/xenserver/vswitch-xen.spec @@@ -66,45 -60,45 +66,47 @@@ install -m 755 xenserver/etc_profile.d_ install -d -m 755 $RPM_BUILD_ROOT/etc/xapi.d/plugins install -m 755 xenserver/etc_xapi.d_plugins_vswitch-cfg-update \ $RPM_BUILD_ROOT/etc/xapi.d/plugins/vswitch-cfg-update -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/scripts +install -d -m 755 $RPM_BUILD_ROOT/usr/share/vswitch/scripts install -m 755 xenserver/opt_xensource_libexec_interface-reconfigure \ - $RPM_BUILD_ROOT%{_prefix}/scripts/interface-reconfigure + $RPM_BUILD_ROOT/usr/share/vswitch/scripts/interface-reconfigure install -m 755 xenserver/etc_xensource_scripts_vif \ - $RPM_BUILD_ROOT%{_prefix}/scripts/vif -install -m 755 xenserver/root_vswitch_scripts_dump-vif-details \ - $RPM_BUILD_ROOT%{_prefix}/scripts/dump-vif-details -install -m 755 xenserver/root_vswitch_scripts_refresh-xs-network-uuids \ - $RPM_BUILD_ROOT%{_prefix}/scripts/refresh-xs-network-uuids + $RPM_BUILD_ROOT/usr/share/vswitch/scripts/vif +install -m 755 xenserver/usr_share_vswitch_scripts_dump-vif-details \ + $RPM_BUILD_ROOT/usr/share/vswitch/scripts/dump-vif-details ++install -m 755 xenserver/usr_share_vswitch_scripts_refresh-xs-network-uuids \ ++ $RPM_BUILD_ROOT/usr/share/vswitch/scripts/refresh-xs-network-uuids install -m 755 xenserver/usr_sbin_xen-bugtool \ - $RPM_BUILD_ROOT%{_prefix}/scripts/xen-bugtool + $RPM_BUILD_ROOT/usr/share/vswitch/scripts/xen-bugtool install -m 755 xenserver/usr_sbin_brctl \ - $RPM_BUILD_ROOT%{_prefix}/scripts/brctl -install -m 755 xenserver/root_vswitch_scripts_sysconfig.template \ - $RPM_BUILD_ROOT/root/vswitch/scripts/sysconfig.template + $RPM_BUILD_ROOT/usr/share/vswitch/scripts/brctl +install -m 755 xenserver/usr_share_vswitch_scripts_sysconfig.template \ + $RPM_BUILD_ROOT/usr/share/vswitch/scripts/sysconfig.template install -m 644 \ xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \ - $RPM_BUILD_ROOT%{_prefix}/scripts/XSFeatureVSwitch.py + $RPM_BUILD_ROOT/usr/share/vswitch/scripts/XSFeatureVSwitch.py -install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/kernel_modules -find datapath/linux-2.6 -name *.ko -exec install -m 755 \{\} $RPM_BUILD_ROOT%{_prefix}/kernel_modules/ \; +install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/vswitch +find datapath/linux-2.6 -name *.ko -exec install -m 755 \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/vswitch \; # Get rid of stuff we don't want to make RPM happy. -rm -rf \ - $RPM_BUILD_ROOT/root/vswitch/bin/ezio-term \ - $RPM_BUILD_ROOT/root/vswitch/bin/ovs-controller \ - $RPM_BUILD_ROOT/root/vswitch/bin/ovs-discover \ - $RPM_BUILD_ROOT/root/vswitch/bin/ovs-kill \ - $RPM_BUILD_ROOT/root/vswitch/bin/ovs-pki \ - $RPM_BUILD_ROOT/root/vswitch/bin/ovs-switchui \ - $RPM_BUILD_ROOT/root/vswitch/bin/ovs-wdt \ - $RPM_BUILD_ROOT/root/vswitch/bin/secchan \ - $RPM_BUILD_ROOT/root/vswitch/sbin/ovs-monitor \ - $RPM_BUILD_ROOT/root/vswitch/share/man/man8/ovs-controller.8 \ - $RPM_BUILD_ROOT/root/vswitch/share/man/man8/ovs-discover.8 \ - $RPM_BUILD_ROOT/root/vswitch/share/man/man8/ovs-kill.8 \ - $RPM_BUILD_ROOT/root/vswitch/share/man/man8/ovs-pki.8 \ - $RPM_BUILD_ROOT/root/vswitch/share/man/man8/secchan.8 \ - $RPM_BUILD_ROOT/root/vswitch/share/openvswitch +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/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 \ + $RPM_BUILD_ROOT/usr/share/man/man8/ovs-openflowd.8 \ + $RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8 +rm -f $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/vswitch/veth_mod.ko +rm -r \ + $RPM_BUILD_ROOT/usr/share/openvswitch/commands + +install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch %clean rm -rf $RPM_BUILD_ROOT @@@ -301,15 -300,17 +303,16 @@@ f /etc/xapi.d/plugins/vswitch-cfg-update /etc/logrotate.d/vswitch /etc/profile.d/vswitch.sh -/root/vswitch/kernel_modules/brcompat_mod.ko -/root/vswitch/kernel_modules/openvswitch_mod.ko -/root/vswitch/kernel_modules/veth_mod.ko -/root/vswitch/scripts/dump-vif-details -/root/vswitch/scripts/refresh-xs-network-uuids -/root/vswitch/scripts/interface-reconfigure -/root/vswitch/scripts/vif -/root/vswitch/scripts/xen-bugtool -/root/vswitch/scripts/XSFeatureVSwitch.py -/root/vswitch/scripts/brctl -/root/vswitch/scripts/sysconfig.template +/lib/modules/%{xen_version}/kernel/net/vswitch/openvswitch_mod.ko +/lib/modules/%{xen_version}/kernel/net/vswitch/brcompat_mod.ko +/usr/share/vswitch/scripts/dump-vif-details ++/usr/share/vswitch/scripts/refresh-xs-network-uuids +/usr/share/vswitch/scripts/interface-reconfigure +/usr/share/vswitch/scripts/vif +/usr/share/vswitch/scripts/xen-bugtool +/usr/share/vswitch/scripts/XSFeatureVSwitch.py +/usr/share/vswitch/scripts/brctl +/usr/share/vswitch/scripts/sysconfig.template # Following two files are generated automatically by rpm. We don't # really need them and they won't be used on the XenServer, but there # isn't an obvious place to get rid of them since they are generated