X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fopenvswitch-xen.spec;h=f5c123165fcdb4a9d875199e39c6f37bfa612e95;hb=299915eadc559f12d145945436289931a74621b8;hp=9d686ce478eece6bec53e626025548bf4aacafde;hpb=007948177581f3b3dad188221593d0e4bdca6ba0;p=sliver-openvswitch.git diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index 9d686ce47..f5c123165 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -8,22 +8,24 @@ # without warranty of any kind. # When building, the rpmbuild command line should define -# openvswitch_version, xen_version, and build_number using -D arguments. +# openvswitch_version, kernel_name, kernel_version, kernel_flavor, +# and build_number using -D arguments. # for example: # -# rpmbuild -D "openvswitch_version 0.8.9~1+build123" -D "xen_version 2.6.18-128.1.1.el5.xs5.1.0.483.1000xen" -D "build_number --with-build-number=123" -bb /usr/src/redhat/SPECS/openvswitch-xen.spec +# 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 -%define version %{openvswitch_version}-%{xen_version} +%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%{binsuffix}-%{kernel_version} +%define module_package modules-%{kernel_flavor}-%{kernel_version} Name: openvswitch Summary: Open vSwitch daemon/database/utilities @@ -47,8 +49,8 @@ traffic. Summary: Open vSwitch kernel module Group: System Environment/Kernel License: GPLv2 -Provides: %{name}-modules = %{kernel_version}, openvswitch_mod.ko.%{module_abi_version} -Requires: kernel%{binsuffix} = %{kernel_version} +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 @@ -58,7 +60,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 @@ -80,15 +82,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 \ @@ -103,26 +97,28 @@ 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/etc/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/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 @@ -150,11 +146,11 @@ if test ! -e /etc/openvswitch/conf.db; then install -d -m 755 -o root -g root /etc/openvswitch # Create ovs-vswitchd config database - ovsdb-tool -vANY:console:emer create /etc/openvswitch/conf.db \ + ovsdb-tool -vANY:console:off create /etc/openvswitch/conf.db \ /usr/share/openvswitch/vswitch.ovsschema # Create initial table in config database - ovsdb-tool -vANY:console:emer transact /etc/openvswitch/conf.db \ + ovsdb-tool -vANY:console:off transact /etc/openvswitch/conf.db \ '[{"op": "insert", "table": "Open_vSwitch", "row": {}}]' \ > /dev/null fi @@ -242,8 +238,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 @@ -319,32 +321,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 @@ -352,8 +332,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.sh /usr/share/openvswitch/vswitch.ovsschema /usr/sbin/ovs-vlan-bug-workaround /usr/sbin/ovs-vswitchd @@ -361,6 +343,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 @@ -373,6 +356,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