[ovs-dev] [PATCH] xenserver: Put kernel modules in "extra" directory

Justin Pettit jpettit at nicira.com
Thu Apr 8 01:23:28 UTC 2010


Whoops.  Didn't mean to send this one out again...

--Justin


On Apr 7, 2010, at 6:22 PM, Justin Pettit wrote:

> This change cleans up a couple of items.  First, it makes sure that our
> newly installed kernel modules are picked up instead of any ones that
> shipped with XenServer.  Second, it prevents having to do the install
> with "--nodeps".
> ---
> xenserver/openvswitch-xen.spec |   12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec
> index 5e1bc35..635cc54 100644
> --- a/xenserver/openvswitch-xen.spec
> +++ b/xenserver/openvswitch-xen.spec
> @@ -86,8 +86,8 @@ install -m 644 \
>         xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \
>                $RPM_BUILD_ROOT/usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.py
> 
> -install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/openvswitch
> -find datapath/linux-2.6 -name *.ko -exec install -m 755  \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/openvswitch \;
> +install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/extra
> +find datapath/linux-2.6 -name *.ko -exec install -m 755  \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/extra \;
> 
> # Get rid of stuff we don't want to make RPM happy.
> rm \
> @@ -103,7 +103,7 @@ rm \
>     $RPM_BUILD_ROOT/usr/share/man/man8/ovs-kill.8 \
>     $RPM_BUILD_ROOT/usr/share/man/man8/ovs-openflowd.8 \
>     $RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8
> -rm -f $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/openvswitch/veth_mod.ko
> +rm -f $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/extra/veth_mod.ko
> 
> install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch
> 
> @@ -332,10 +332,10 @@ fi
> /etc/xapi.d/plugins/openvswitch-cfg-update
> /etc/logrotate.d/openvswitch
> /etc/profile.d/openvswitch.sh
> -/lib/modules/%{xen_version}/kernel/net/openvswitch/openvswitch_mod.ko
> -/lib/modules/%{xen_version}/kernel/net/openvswitch/brcompat_mod.ko
> +/lib/modules/%{xen_version}/kernel/extra/openvswitch_mod.ko
> +/lib/modules/%{xen_version}/kernel/extra/brcompat_mod.ko
> %if %(echo '%{xen_version}'|awk -F"." '{if ($3>=18) print 1; else print 0;}')
> -/lib/modules/%{xen_version}/kernel/net/openvswitch/ip_gre_mod.ko
> +/lib/modules/%{xen_version}/kernel/extra/ip_gre_mod.ko
> %endif
> /usr/share/openvswitch/scripts/refresh-network-uuids
> /usr/share/openvswitch/scripts/interface-reconfigure
> -- 
> 1.7.0.3
> 
> 
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev_openvswitch.org





More information about the dev mailing list