X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=xenserver%2Fvswitch-xen.spec;h=27a2d9bd1dddcce4dcd08f4e0d8761748e1625a5;hb=141f49423d7433b2a82b0de2d101f2dc6e6dbac9;hp=7f1ed40913c66d77afce72a5b31591011905cae6;hpb=eaa3c7e88b315d1d018b702ed3b9bea768a966c5;p=openvswitch diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec index 7f1ed409..27a2d9bd 100644 --- a/xenserver/vswitch-xen.spec +++ b/xenserver/vswitch-xen.spec @@ -44,7 +44,7 @@ traffic. %setup -q -n openvswitch-%{vswitch_version} %build -./configure --prefix=/usr --localstatedir=%{_localstatedir} --with-l26=/lib/modules/%{xen_version}/build --enable-ssl %{build_number} +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=%{_localstatedir} --with-l26=/lib/modules/%{xen_version}/build --enable-ssl %{build_number} make %{_smp_mflags} %install @@ -67,12 +67,16 @@ 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/usr/share/vswitch/scripts +install -m 644 vswitchd/vswitch-idl.ovsschema \ + $RPM_BUILD_ROOT/usr/share/vswitch/vswitch-idl.ovsschema install -m 755 xenserver/opt_xensource_libexec_interface-reconfigure \ $RPM_BUILD_ROOT/usr/share/vswitch/scripts/interface-reconfigure install -m 755 xenserver/etc_xensource_scripts_vif \ $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/usr/share/vswitch/scripts/xen-bugtool install -m 755 xenserver/usr_sbin_brctl \ @@ -83,8 +87,8 @@ install -m 644 \ xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \ $RPM_BUILD_ROOT/usr/share/vswitch/scripts/XSFeatureVSwitch.py -install -d -m 755 $RPM_BUILD_ROOT/root/vswitch/kernel_modules -find datapath/linux-2.6 -name *.ko -exec install -m 755 \{\} $RPM_BUILD_ROOT/root/vswitch/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 \ @@ -100,7 +104,7 @@ rm \ $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/root/vswitch/kernel_modules/veth_mod.ko +rm -f $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/vswitch/veth_mod.ko rm -r \ $RPM_BUILD_ROOT/usr/share/openvswitch/commands @@ -155,7 +159,7 @@ if test ! -e /var/lib/openvswitch/dbcache; then printf "Re-creating xapi database cache... " fi - if /usr/share/vswitch/scripts/interface-reconfigure init-dbcache; then + if /usr/share/vswitch/scripts/interface-reconfigure rewrite; then printf "done.\n" else printf "FAILED\n" @@ -166,6 +170,9 @@ if test ! -e /var/lib/openvswitch/dbcache; then fi fi +# Ensure that modprobe will find our modules. +depmod %{xen_version} + if grep -F net.ipv4.conf.all.arp_filter /etc/sysctl.conf >/dev/null 2>&1; then :; else cat >>/etc/sysctl.conf < /dev/null +fi # Create default or update existing /etc/sysconfig/vswitch. SYSCONFIG=/etc/sysconfig/vswitch @@ -279,9 +294,10 @@ if [ "$1" = "0" ]; then # $1 = 1 for upgrade done # Remove all configuration files - rm -f /etc/ovs-vswitchd.conf + rm -f /etc/ovs-vswitchd.conf.db rm -f /etc/sysconfig/vswitch rm -f /etc/ovs-vswitchd.cacert + rm -f /var/lib/openvswitch/dbcache printf "\nYou MUST reboot the server now to complete the change to\n" printf "standard Xen networking. Attempts to modify networking on the\n" @@ -297,9 +313,13 @@ fi /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 +/lib/modules/%{xen_version}/kernel/net/vswitch/openvswitch_mod.ko +/lib/modules/%{xen_version}/kernel/net/vswitch/brcompat_mod.ko +%if %(echo '%{xen_version}'|awk -F"." '{if ($3>=18) print 1; else print 0;}') +/lib/modules/%{xen_version}/kernel/net/vswitch/ip_gre_mod.ko +%endif /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 @@ -313,17 +333,23 @@ fi # include them. /usr/share/vswitch/scripts/XSFeatureVSwitch.pyc /usr/share/vswitch/scripts/XSFeatureVSwitch.pyo +/usr/share/vswitch/vswitch-idl.ovsschema /usr/sbin/ovs-brcompatd /usr/sbin/ovs-vswitchd +/usr/sbin/ovsdb-server /usr/bin/ovs-appctl -/usr/bin/ovs-cfg-mod /usr/bin/ovs-dpctl /usr/bin/ovs-ofctl -/usr/share/man/man5/ovs-vswitchd.conf.5.gz +/usr/bin/ovs-vsctl +/usr/bin/ovsdb-client +/usr/bin/ovsdb-tool +/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/man8/ovs-appctl.8.gz /usr/share/man/man8/ovs-brcompatd.8.gz -/usr/share/man/man8/ovs-cfg-mod.8.gz /usr/share/man/man8/ovs-dpctl.8.gz /usr/share/man/man8/ovs-ofctl.8.gz +/usr/share/man/man8/ovs-vsctl.8.gz /usr/share/man/man8/ovs-vswitchd.8.gz /var/lib/openvswitch