[ovs-dev] [PATCH] xenserver: Use .../extra not .../kernel/extra for kernel modules.

Ben Pfaff blp at nicira.com
Tue May 3 17:51:44 UTC 2011

On XenServer, depmod.conf causes modules in /lib/modules/$(uname -r)/extra
to take priority over standard modules.  Unfortunately, we were installing
our modules in /lib/modules/$(uname -r)/kernel/extra, which isn't special.
This commit fixes the problem.

Signed-off-by: Ben Pfaff <blp at nicira.com>
Reported-by: Bob Ball <bob.ball at citrix.com>
 AUTHORS                        |    1 +
 xenserver/openvswitch-xen.spec |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 38ca142..ba30f50 100644
@@ -44,6 +44,7 @@ Aaron M. Ucko           ucko at debian.org
 Aaron Rosen             arosen at clemson.edu
 Alex Yip                alex at nicira.com
 Alexey I. Froloff       raorn at altlinux.org
+Bob Ball                bob.ball at citrix.com
 Brad Hall               brad at nicira.com
 Brandon Heller          brandonh at stanford.edu
 Bryan Fulton            bryan at nicira.com
diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec
index c428fc6..b7b987e 100644
--- a/xenserver/openvswitch-xen.spec
+++ b/xenserver/openvswitch-xen.spec
@@ -112,8 +112,8 @@ install -m 644 \
         xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \
-install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/extra/openvswitch
-find datapath/linux-2.6 -name *.ko -exec install -m 755  \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/extra/openvswitch \;
+install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/extra/openvswitch
+find datapath/linux-2.6 -name *.ko -exec install -m 755  \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/extra/openvswitch \;
 install xenserver/uuid.py $RPM_BUILD_ROOT/usr/share/openvswitch/python
 # Get rid of stuff we don't want to make RPM happy.
@@ -397,5 +397,5 @@ fi
 %exclude /usr/share/openvswitch/python/ovs/db/*.py[co]
 %files %{module_package}
-%exclude /lib/modules/%{xen_version}/kernel/extra/openvswitch/brcompat_mod.ko
+%exclude /lib/modules/%{xen_version}/extra/openvswitch/brcompat_mod.ko

More information about the dev mailing list