[ovs-dev,v1,2/2] rhel: fix wrong condition check for ovs-kmod-manage.sh, fedora

Message ID 1537471170-35289-2-git-send-email-martinxu9.ovs@gmail.com
State New
Headers show
Series
  • [ovs-dev,v1,1/2] rhel: use _datadir as path prefix for ovs-kmod-manage.sh, fedora
Related show

Commit Message

Martin Xu Sept. 20, 2018, 7:19 p.m.
In post-install in kmod fedora spec file, the variables storing
different parts of kernel version numbers are renamed. The condition
check to run ovs-kmod-manage.sh for RHEL 7.2 and 7.4 uses the older
variables.

Fixes c3570519ecaf (rhel: add 4.4 kernel in kmod build with mulitple
versions, fedora)

Signed-off-by: Martin Xu <martinxu9.ovs@gmail.com>
CC: Greg Rose <gvrose8192@gmail.com>
CC: Flavio Leitner <fbl@sysclose.org>
---
 rhel/openvswitch-kmod-fedora.spec.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ben Pfaff Sept. 25, 2018, 10:25 p.m. | #1
On Thu, Sep 20, 2018 at 12:19:30PM -0700, Martin Xu wrote:
> In post-install in kmod fedora spec file, the variables storing
> different parts of kernel version numbers are renamed. The condition
> check to run ovs-kmod-manage.sh for RHEL 7.2 and 7.4 uses the older
> variables.
> 
> Fixes c3570519ecaf (rhel: add 4.4 kernel in kmod build with mulitple
> versions, fedora)
> 
> Signed-off-by: Martin Xu <martinxu9.ovs@gmail.com>
> CC: Greg Rose <gvrose8192@gmail.com>
> CC: Flavio Leitner <fbl@sysclose.org>

The list dropped some emails on Friday and I think it might have dropped
Flavio's review.  Flavio, did you ack both patches?

Thanks,

Ben.
Martin Xu Sept. 26, 2018, 5:19 p.m. | #2
Hi Ben,

Flavio acked this patch as well. I received the email with no problem.

Martin

On Tue, Sep 25, 2018 at 3:25 PM Ben Pfaff <blp@ovn.org> wrote:

> On Thu, Sep 20, 2018 at 12:19:30PM -0700, Martin Xu wrote:
> > In post-install in kmod fedora spec file, the variables storing
> > different parts of kernel version numbers are renamed. The condition
> > check to run ovs-kmod-manage.sh for RHEL 7.2 and 7.4 uses the older
> > variables.
> >
> > Fixes c3570519ecaf (rhel: add 4.4 kernel in kmod build with mulitple
> > versions, fedora)
> >
> > Signed-off-by: Martin Xu <martinxu9.ovs@gmail.com>
> > CC: Greg Rose <gvrose8192@gmail.com>
> > CC: Flavio Leitner <fbl@sysclose.org>
>
> The list dropped some emails on Friday and I think it might have dropped
> Flavio's review.  Flavio, did you ack both patches?
>
> Thanks,
>
> Ben.
>
Ben Pfaff Sept. 26, 2018, 8:30 p.m. | #3
Thanks, applied to master also.

On Wed, Sep 26, 2018 at 10:19:44AM -0700, Martin Xu wrote:
> Hi Ben,
> 
> Flavio acked this patch as well. I received the email with no problem.
> 
> Martin
> 
> On Tue, Sep 25, 2018 at 3:25 PM Ben Pfaff <blp@ovn.org> wrote:
> 
> > On Thu, Sep 20, 2018 at 12:19:30PM -0700, Martin Xu wrote:
> > > In post-install in kmod fedora spec file, the variables storing
> > > different parts of kernel version numbers are renamed. The condition
> > > check to run ovs-kmod-manage.sh for RHEL 7.2 and 7.4 uses the older
> > > variables.
> > >
> > > Fixes c3570519ecaf (rhel: add 4.4 kernel in kmod build with mulitple
> > > versions, fedora)
> > >
> > > Signed-off-by: Martin Xu <martinxu9.ovs@gmail.com>
> > > CC: Greg Rose <gvrose8192@gmail.com>
> > > CC: Flavio Leitner <fbl@sysclose.org>
> >
> > The list dropped some emails on Friday and I think it might have dropped
> > Flavio's review.  Flavio, did you ack both patches?
> >
> > Thanks,
> >
> > Ben.
> >

Patch

diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in
index 464d537..8d54fd7 100644
--- a/rhel/openvswitch-kmod-fedora.spec.in
+++ b/rhel/openvswitch-kmod-fedora.spec.in
@@ -86,7 +86,7 @@  IFS='.\|-' read mainline_major mainline_minor mainline_patch major_rev \
 # echo mainline_major=$mainline_major mainline_minor=$mainline_minor \
 # mainline_patch=$mainline_patch major_rev=$major_rev minor_rev=$minor_rev
 if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then
-    if [ "$installed_major" = "327" ] || [ "$installed_major" = "693" ]; then
+    if [ "$major_rev" = "327" ] || [ "$major_rev" = "693" ]; then
         # For RHEL 7.2 and 7.4
         if [ -x "%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh" ]; then
             %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh