From 97658708f8479f5316010a9bcc845f753cc6e38f Mon Sep 17 00:00:00 2001 From: Sajjad Lateef Date: Mon, 16 May 2011 17:24:20 -0700 Subject: [PATCH] xenserver: modify module spec file Based on feedback from Citrix about building for multiple kernels, the spec file has been modified to take three arguments on the command line: kernel_name, kernel_version and kernel_flavor. The kernel_flavor is either xen or kdump. The kernel_name is the Name value embedded in the kernel rpm and the kernel_version is Version-Release values embedded in the kernel rpm. The xen_version is calculated. The INSTALL document has been updated to reflect these changes. Signed-off-by: Sajjad Lateef (cherry picked from commit b11e4aa7e92854612a4d139b8a620d036a5d41a2) --- INSTALL.XenServer | 30 +++++++++++++++++++++++------- xenserver/openvswitch-xen.spec | 18 ++++++++++++------ 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/INSTALL.XenServer b/INSTALL.XenServer index 9d9012b86..35d2cc66f 100644 --- a/INSTALL.XenServer +++ b/INSTALL.XenServer @@ -23,12 +23,16 @@ Once you have a distribution tarball, copy it into /usr/src/redhat/SOURCES inside the VM. Then execute the following: VERSION= - XENKERNEL= + KERNEL_NAME= + KERNEL_VERSION= + KERNEL_FLAVOR= cd /tmp tar xfz /usr/src/redhat/SOURCES/openvswitch-$VERSION.tar.gz rpmbuild \ -D "openvswitch_version $VERSION" \ - -D "xen_version $XENKERNEL" \ + -D "kernel_name $KERNEL_NAME" \ + -D "kernel_version $KERNEL_VERSION" \ + -D "kernel_flavor $KERNEL_FLAVOR" \ -bb openvswitch-$VERSION/xenserver/openvswitch-xen.spec where: @@ -36,13 +40,25 @@ where: is the version number that appears in the name of the Open vSwitch tarball, e.g. 0.90.0. - is the version number of the Xen kernel, - e.g. 2.6.32.12-0.7.1.xs5.6.100.307.170586xen. This version number - appears as the name of a directory in /lib/modules inside the VM. - It always ends in "xen". + is the name of the Xen Kernel, + e.g. kernel-xen or kernel-NAME-xen. By convention, the name + starts with "kernel-" and ends with "-xen". + This can be obtained by executing + 'rpm -q --queryformat "%{Name}" kernel.*xen' + with the "kernel-" stripped out using sed 's/kernel-//' + e.g. kernel-NAME-xen => NAME-xen + + is the output of: + rpm -q --queryformat "%{Version}-%{Release}" kernel.*xen-devel + e.g. 2.6.32.12-0.7.1.xs5.6.100.323.170596 + + is either "xen" or "kdump". + The "xen" flavor is the main running kernel flavor and the "kdump" flavor is + the crashdump kernel flavor. Commonly, one would specify "xen" here. Three RPMs will be output into /usr/src/redhat/RPMS/i386, whose names begin -with "openvswitch", "openvswitch-modules-xen", and "openvswitch-debuginfo". +with "openvswitch", "openvswitch-modules-xen" (if building for kernel_flavor=xen), +and "openvswitch-debuginfo". Installing Open vSwitch for XenServer ------------------------------------- diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index 9d686ce47..821b28968 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -8,12 +8,18 @@ # 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 @@ -23,7 +29,7 @@ # 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 +53,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 -- 2.43.0