X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=rhel%2Fopenvswitch-kmod-rhel6.spec.in;h=443ddc53fd9d4ffb1762964b33a7476bd81c1de1;hb=f15c86394230974d0535c0f5913cc959f3d920f3;hp=5aa92bdc55624262028ae8b4aba9720e8ce5a862;hpb=c434706a374bd44d1274e7bdbee40067a6620b61;p=openvswitch

diff --git a/rhel/openvswitch-kmod-rhel6.spec.in b/rhel/openvswitch-kmod-rhel6.spec.in
index 5aa92bdc..443ddc53 100644
--- a/rhel/openvswitch-kmod-rhel6.spec.in
+++ b/rhel/openvswitch-kmod-rhel6.spec.in
@@ -8,7 +8,9 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without warranty of any kind.
 
-Name:           openvswitch
+%define oname openvswitch
+
+Name:           %{oname}-kmod
 Version:        @VERSION@
 Release:        1%{?dist}
 Summary:        Open vSwitch kernel module
@@ -16,7 +18,7 @@ Summary:        Open vSwitch kernel module
 Group:          System/Kernel
 License:        GPLv2
 URL:            http://openvswitch.org/
-Source0:        %{name}-%{version}.tar.gz
+Source0:        %{oname}-%{version}.tar.gz
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  %kernel_module_package_buildreqs
 
@@ -24,32 +26,36 @@ BuildRequires:  %kernel_module_package_buildreqs
 # conflicts with the openvswitch-debuginfo package for OVS userspace).
 %undefine _enable_debug_packages
 
-# Uncomment to build "debug" packages
-#kernel_module_package default debug
+# Use -D 'kversion 2.6.32-131.6.1.el6.x86_64' to build package
+# for specified kernel version.
+%{?kversion:%define kernel_version %kversion}
+
+# Use -D 'kflavors default debug kdump' to build packages for
+# specified kernel variants.
+%{!?kflavors:%define kflavors default}
 
-# Build only for standard kernel variant(s)
-%kernel_module_package default
+%kernel_module_package -n %{oname} %kflavors
 
 %description
 Open vSwitch Linux kernel module.
 
 %prep
 
-%setup
+%setup -n %{oname}-%{version}
 
 %build
 for flavor in %flavors_to_build; do
 	mkdir _$flavor
-	(cd _$flavor && ../configure --with-l26="%{kernel_source $flavor}")
-	%{__make} -C _$flavor/datapath/linux-2.6 %{?_smp_mflags}
+	(cd _$flavor && ../configure --with-linux="%{kernel_source $flavor}")
+	%{__make} -C _$flavor/datapath/linux %{?_smp_mflags}
 done
 
 %install
 export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
-export INSTALL_MOD_DIR=extra/%{name}
+export INSTALL_MOD_DIR=extra/%{oname}
 for flavor in %flavors_to_build ; do
          make -C %{kernel_source $flavor} modules_install \
-                 M=$PWD/_$flavor/datapath/linux-2.6
+                 M=$PWD/_$flavor/datapath/linux
 done
 
 %clean