| Message ID | 1567104961-28729-1-git-send-email-gvrose8192@gmail.com |
|---|---|
| State | Accepted |
| Commit | e64c2c1ea67de94f198ba8a094f5cb37e4cd1179 |
| Headers | show |
| Series | [ovs-dev] rhel: Fix ovs-kmod-manage.sh to work with RHEL 7.3 | expand |
Looks good to me, thanks. Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com> On Thu, Aug 29, 2019 at 11:57 AM Greg Rose <gvrose8192@gmail.com> wrote: > > Add case for RHEL 7.3. This also fixes commit 22abff2 where I forgot to > update the comp_ver variable for RHEL 7.5 and while I was in there I > updated comp_ver for the RHEL 7.4 case as well. > > Fixes: 22abff2 ("rhel: Add case for RHEL 7.5 major version to...") > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > --- > rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > index 51756ec..c5b1d2d 100644 > --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > @@ -80,14 +80,19 @@ if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then > comp_ver=36 > ver_offset=4 > installed_ver="$minor_rev" > + elif [ "$major_rev" = "514" ]; then > +# echo "rhel73" > + comp_ver=26 > + ver_offset=4 > + installed_ver="$minor_rev" > elif [ "$major_rev" = "693" ]; then > # echo "rhel74" > - comp_ver=11 > + comp_ver=21 > ver_offset=4 > installed_ver="$minor_rev" > elif [ "$major_rev" = "862" ]; then > # echo "rhel75" > - comp_ver=11 > + comp_ver=20 > ver_offset=4 > installed_ver="$minor_rev" > elif [ "$major_rev" = "957" ]; then > -- > 1.8.3.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Thanks, Greg (and Yifeng). Applied to master, branch-2.12, branch-2.11. On Thu, Aug 29, 2019 at 12:06:38PM -0700, Yifeng Sun wrote: > Looks good to me, thanks. > > Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com> > > On Thu, Aug 29, 2019 at 11:57 AM Greg Rose <gvrose8192@gmail.com> wrote: > > > > Add case for RHEL 7.3. This also fixes commit 22abff2 where I forgot to > > update the comp_ver variable for RHEL 7.5 and while I was in there I > > updated comp_ver for the RHEL 7.4 case as well. > > > > Fixes: 22abff2 ("rhel: Add case for RHEL 7.5 major version to...") > > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > > --- > > rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 9 +++++++-- > > 1 file changed, 7 insertions(+), 2 deletions(-) > > > > diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > > index 51756ec..c5b1d2d 100644 > > --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > > +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > > @@ -80,14 +80,19 @@ if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then > > comp_ver=36 > > ver_offset=4 > > installed_ver="$minor_rev" > > + elif [ "$major_rev" = "514" ]; then > > +# echo "rhel73" > > + comp_ver=26 > > + ver_offset=4 > > + installed_ver="$minor_rev" > > elif [ "$major_rev" = "693" ]; then > > # echo "rhel74" > > - comp_ver=11 > > + comp_ver=21 > > ver_offset=4 > > installed_ver="$minor_rev" > > elif [ "$major_rev" = "862" ]; then > > # echo "rhel75" > > - comp_ver=11 > > + comp_ver=20 > > ver_offset=4 > > installed_ver="$minor_rev" > > elif [ "$major_rev" = "957" ]; then > > -- > > 1.8.3.1 > > > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org > > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh index 51756ec..c5b1d2d 100644 --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh @@ -80,14 +80,19 @@ if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then comp_ver=36 ver_offset=4 installed_ver="$minor_rev" + elif [ "$major_rev" = "514" ]; then +# echo "rhel73" + comp_ver=26 + ver_offset=4 + installed_ver="$minor_rev" elif [ "$major_rev" = "693" ]; then # echo "rhel74" - comp_ver=11 + comp_ver=21 ver_offset=4 installed_ver="$minor_rev" elif [ "$major_rev" = "862" ]; then # echo "rhel75" - comp_ver=11 + comp_ver=20 ver_offset=4 installed_ver="$minor_rev" elif [ "$major_rev" = "957" ]; then
Add case for RHEL 7.3. This also fixes commit 22abff2 where I forgot to update the comp_ver variable for RHEL 7.5 and while I was in there I updated comp_ver for the RHEL 7.4 case as well. Fixes: 22abff2 ("rhel: Add case for RHEL 7.5 major version to...") Signed-off-by: Greg Rose <gvrose8192@gmail.com> --- rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)