diff options
author | Edwin Chiu <echiu@vmware.com> | 2015-03-10 11:36:43 -0700 |
---|---|---|
committer | Alex Wang <alexw@nicira.com> | 2015-03-10 15:36:06 -0700 |
commit | 5748c7e9a51748c93bfc511662462be415664a8b (patch) | |
tree | 6b6cc53514dd4af70b92d6cd384333d4a4a5b787 /xenserver | |
parent | 973edd6eafb05d7a27c99b6efb7e410e96d8cb96 (diff) | |
download | openvswitch-5748c7e9a51748c93bfc511662462be415664a8b.tar.gz |
xenserver: Fix build spec for XenServer 6.5.
The latest XenServer 6.5 uses a new way for kernel version naming.
Therein, the kernel flavor could not be found anymore. Also, the
directory name in 'lib/modules/' becomes a shortened version of
kernel version. e.g.:
[root@localhost ~]# ls /lib/modules/
3.10.0+2
As a workaround, this commit modifies the spec file to make
%{kernel_flavor} optional and %{xen_version} definable by users.
In the long run, I'd like to spend time refining the spec file.
Signed-off-by: Edwin Chiu <echiu@vmware.com>
Signed-off-by: Alex Wang <alexw@nicira.com>
Diffstat (limited to 'xenserver')
-rw-r--r-- | xenserver/openvswitch-xen.spec.in | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/xenserver/openvswitch-xen.spec.in b/xenserver/openvswitch-xen.spec.in index 31ff1bff4..3bae86a51 100644 --- a/xenserver/openvswitch-xen.spec.in +++ b/xenserver/openvswitch-xen.spec.in @@ -7,9 +7,9 @@ # notice and this notice are preserved. This file is offered as-is, # without warranty of any kind. -# When building, the rpmbuild command line should define -# openvswitch_version, kernel_name, kernel_version, and kernel_flavor -# using -D arguments. +# For XenServer version < 6.5, when building, the rpmbuild command line +# should define openvswitch_version, kernel_name, kernel_version and +# kernel_flavor using -D arguments. # for example: # # rpmbuild -D "openvswitch_version 1.1.0+build123" @@ -18,6 +18,16 @@ # -D "kernel_flavor xen" # -bb /usr/src/redhat/SPECS/openvswitch-xen.spec # +# For XenServer version >= 6.5, replace kernel_flavor with xen_version which +# should be the `uname -r` output. +# for example: +# +# rpmbuild -D "openvswitch_version 2.3.0+build123" +# -D "kernel_name NAME-xen" +# -D "kernel_version 3.10.41-323.380416" +# -D "xen_version 3.10.0+2" +# -bb /usr/src/redhat/SPECS/openvswitch-xen.spec +# # If tests have to be skipped while building, specify the '--without check' # option. For example: # rpmbuild -bb --without check xenserver/openvswitch-xen.spec @@ -33,13 +43,15 @@ %define kernel_flavor xen %endif +%if %{?xen_version:0}%{!?xen_version:1} %define xen_version %{kernel_version}%{kernel_flavor} +%endif # bump this when breaking compatibility with userspace %define module_abi_version 0 # build-supplemental-pack.sh requires this naming for kernel module packages -%define module_package modules-%{kernel_flavor}-%{kernel_version} +%define module_package modules%{?kernel_flavor:-%{kernel_flavor}}-%{kernel_version} %bcond_without check @@ -65,12 +77,12 @@ traffic. Summary: Open vSwitch kernel module Group: System Environment/Kernel License: GPLv2 -Provides: %{name}-modules-%{kernel_flavor} = %{kernel_version}, openvswitch.ko.%{module_abi_version} -Requires: kernel-%{kernel_name} = %{kernel_version} +Provides: %{name}-modules%{?kernel_flavor:-%{kernel_flavor}} = %{kernel_version}, openvswitch.ko.%{module_abi_version} +Requires: kernel%{?kernel_flavor:-%{kernel_flavor}} = %{kernel_version} %description %{module_package} Open vSwitch Linux kernel module compiled against kernel version -%{xen_version}. +%{kernel_version}%{?kernel_flavor:%{kernel_flavor}}. %prep %setup -q -n openvswitch-%{openvswitch_version} |