X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fopenvswitch-xen.spec;h=da9ed1f240d8d110dc73f149fb85e69e80bad40e;hb=870b54e7c7ce23660e6db4999e58d9e6ac2ea618;hp=9d686ce478eece6bec53e626025548bf4aacafde;hpb=007948177581f3b3dad188221593d0e4bdca6ba0;p=sliver-openvswitch.git diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index 9d686ce47..da9ed1f24 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 @@ -86,9 +88,12 @@ install -m 644 xenserver/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 -m 644 xenserver/etc_xensource_bugtool_system-configuration.xml \ + $RPM_BUILD_ROOT/etc/xensource/bugtool/system-configuration.xml +install -d -m 755 $RPM_BUILD_ROOT/etc/xensource/bugtool/system-configuration +install -m 644 xenserver/etc_xensource_bugtool_system-configuration_openvswitch.xml \ + $RPM_BUILD_ROOT/etc/xensource/bugtool/system-configuration/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 \ @@ -105,8 +110,6 @@ 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 \ @@ -119,10 +122,8 @@ install xenserver/uuid.py $RPM_BUILD_ROOT/usr/share/openvswitch/python # Get rid of stuff we don't want to make RPM happy. rm \ $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/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 @@ -242,8 +243,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 @@ -321,6 +328,8 @@ exit 0 /etc/xapi.d/plugins/openvswitch-cfg-update /etc/xensource/bugtool/network-status/openvswitch.xml /etc/xensource/bugtool/kernel-info/openvswitch.xml +/etc/xensource/bugtool/system-configuration.xml +/etc/xensource/bugtool/system-configuration/openvswitch.xml /etc/logrotate.d/openvswitch /etc/profile.d/openvswitch.sh /usr/share/openvswitch/python/ovs/__init__.py @@ -354,6 +363,8 @@ exit 0 /usr/share/openvswitch/scripts/sysconfig.template /usr/share/openvswitch/scripts/xen-bugtool-tc-class-show /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 @@ -373,6 +384,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