Skip to content

Commit

Permalink
rhel7: Fix rpm install failure.
Browse files Browse the repository at this point in the history
When trying to install the kernel module rpm built for RHEL7,
the install failed with following conflicts:

  # rpm -i kmod-openvswitch-2.3.1-1.el7.x86_64.rpm
    file /lib/modules/3.10.0-123.8.1.el7.x86_64/modules.devname
    from install of kmod-openvswitch-2.3.1-1.el7.x86_64 conflicts
    with file from package kernel-3.10.0-123.8.1.el7.x86_64

    file /lib/modules/3.10.0-123.8.1.el7.x86_64/modules.softdep
    from install of kmod-openvswitch-2.3.1-1.el7.x86_64 conflicts
    with file from package kernel-3.10.0-123.8.1.el7.x86_64

Similar issue has already been reported and solved here:

    https://bugzilla.redhat.com/show_bug.cgi?id=1003267

This commit applies the solution in the link to ovs.

Signed-off-by: Alex Wang <alexw@nicira.com>
Acked-by: Gurucharan Shetty <gshetty@nicira.com>
  • Loading branch information
yew011 committed Oct 9, 2014
1 parent d8cecf5 commit ba119c1
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions rhel/openvswitch-kmod-rhel6.spec.in
Expand Up @@ -61,6 +61,9 @@ 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

# Cleanup unnecessary kernel-generated module dependency files.
find $INSTALL_MOD_PATH/lib/modules -iname 'modules.*' -exec rm {} \;
done
install -d %{buildroot}%{_sysconfdir}/depmod.d/
install -m 644 %{oname}.conf %{buildroot}%{_sysconfdir}/depmod.d/
Expand Down

0 comments on commit ba119c1

Please sign in to comment.