rhel: add ability to build kmod packages for arbitrary kernel version/variant(s)

Usage:

rpmbuild --rebuild \
  -D 'kversion KERNEL_VERSION' \
  -D 'kflavors FLAVORS TO BUILD' \
  openvswitch-kmod-VERSION-RELEASE.src.rpm

Signed-off-by: Alexey I. Froloff <raorn@altlinux.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/INSTALL.RHEL b/INSTALL.RHEL
index 35589484026a57f2dd95c7f6fa51f7529e9d87b3..b4523835b8e104e9b8c79c6da06da5de47716210 100644 (file)
--- a/INSTALL.RHEL
+++ b/INSTALL.RHEL
@@ -53,7 +53,16 @@ RHEL.  On RHEL 5, the default RPM source directory is
 
        rpmbuild -bb rhel/openvswitch-kmod-rhel6.spec
 
-    This produces an "kmod-openvswitch" RPM.
+    You might have to specify a kernel version and/or variants, e.g.:
+
+       rpmbuild -bb \
+               -D "kversion 2.6.32-131.6.1.el6.x86_64" \
+               -D "kflavors default debug kdump" \
+               rhel/openvswitch-kmod-rhel6.spec
+
+    This produces an "kmod-openvswitch" RPM for each kernel variant,
+    in this example: "kmod-openvswitch", "kmod-openvswitch-debug", and
+    "kmod-openvswitch-kdump".
 
 Reporting Bugs
 --------------

diff --git a/rhel/openvswitch-kmod-rhel6.spec.in b/rhel/openvswitch-kmod-rhel6.spec.in
index 3a1102d8642b77aa4cfe53fbee85ca2649f8b6d6..443ddc53fd9d4ffb1762964b33a7476bd81c1de1 100644 (file)
--- a/rhel/openvswitch-kmod-rhel6.spec.in
+++ b/rhel/openvswitch-kmod-rhel6.spec.in
@@ -26,11 +26,15 @@ 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}
 
-# Build only for standard kernel variant(s)
-%kernel_module_package -n %{oname} default
+# Use -D 'kflavors default debug kdump' to build packages for
+# specified kernel variants.
+%{!?kflavors:%define kflavors default}
+
+%kernel_module_package -n %{oname} %kflavors
 
 %description
 Open vSwitch Linux kernel module.