From ba119c1371f2579dc412855a46b533e442210f4d Mon Sep 17 00:00:00 2001 From: Alex Wang Date: Thu, 9 Oct 2014 00:02:07 -0700 Subject: [PATCH] rhel7: Fix rpm install failure. 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 Acked-by: Gurucharan Shetty --- rhel/openvswitch-kmod-rhel6.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rhel/openvswitch-kmod-rhel6.spec.in b/rhel/openvswitch-kmod-rhel6.spec.in index 6dbb3771ae6..5d46838a9ed 100644 --- a/rhel/openvswitch-kmod-rhel6.spec.in +++ b/rhel/openvswitch-kmod-rhel6.spec.in @@ -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/