X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rhel%2Fopenvswitch-kmod-rhel6.spec.in;h=6dbb3771ae6f6bdc2fc9803a1452100d42ea5bac;hb=HEAD;hp=443ddc53fd9d4ffb1762964b33a7476bd81c1de1;hpb=6c9b8ee4d0cae3acde728945f3a222b62a643304;p=sliver-openvswitch.git

diff --git a/rhel/openvswitch-kmod-rhel6.spec.in b/rhel/openvswitch-kmod-rhel6.spec.in
index 443ddc53f..6dbb3771a 100644
--- a/rhel/openvswitch-kmod-rhel6.spec.in
+++ b/rhel/openvswitch-kmod-rhel6.spec.in
@@ -1,7 +1,7 @@
 # Spec file for Open vSwitch kernel modules on Red Hat Enterprise
 # Linux 6.
 
-# Copyright (C) 2011 Nicira Networks, Inc.
+# Copyright (C) 2011, 2012 Nicira, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -19,6 +19,7 @@ Group:          System/Kernel
 License:        GPLv2
 URL:            http://openvswitch.org/
 Source0:        %{oname}-%{version}.tar.gz
+Source1:        %{oname}-kmod.files
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  %kernel_module_package_buildreqs
 
@@ -34,7 +35,7 @@ BuildRequires:  %kernel_module_package_buildreqs
 # specified kernel variants.
 %{!?kflavors:%define kflavors default}
 
-%kernel_module_package -n %{oname} %kflavors
+%kernel_module_package -n %{oname} -f %{SOURCE1} %kflavors
 
 %description
 Open vSwitch Linux kernel module.
@@ -42,6 +43,10 @@ Open vSwitch Linux kernel module.
 %prep
 
 %setup -n %{oname}-%{version}
+cat > %{oname}.conf << EOF
+override %{oname} * extra/%{oname}
+override %{oname} * weak-updates/%{oname}
+EOF
 
 %build
 for flavor in %flavors_to_build; do
@@ -55,8 +60,10 @@ export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
 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
+                 M="`pwd`"/_$flavor/datapath/linux
 done
+install -d %{buildroot}%{_sysconfdir}/depmod.d/
+install -m 644 %{oname}.conf %{buildroot}%{_sysconfdir}/depmod.d/
 
 %clean
 rm -rf $RPM_BUILD_ROOT