| Message ID | 1566939989-26799-1-git-send-email-gvrose8192@gmail.com |
|---|---|
| State | Accepted |
| Commit | 22abff20647ced3e3634e73b8388fa1abfb3a94a |
| Headers | show |
| Series | [ovs-dev] rhel: Add case for RHEL 7.5 major version to kmod manage script | expand |
On Tue, 27 Aug 2019 at 14:06, Greg Rose <gvrose8192@gmail.com> wrote: > A Centos 7.5 kernel with an unencountered set of minor build numbers > caused an upgrade bug. Adding the case for the rhel 7.5 kmod management > script fixes the problem. > > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > --- > rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > index 2cd8e5c..51756ec 100644 > --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > @@ -85,6 +85,11 @@ if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = > "10" ]; then > comp_ver=11 > ver_offset=4 > installed_ver="$minor_rev" > + elif [ "$major_rev" = "862" ]; then > +# echo "rhel75" > + comp_ver=11 > + ver_offset=4 > + installed_ver="$minor_rev" > elif [ "$major_rev" = "957" ]; then > # echo "rhel76" > comp_ver=10 > Looks good to me. > -- > 1.8.3.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com> On Tue, Aug 27, 2019 at 2:06 PM Greg Rose <gvrose8192@gmail.com> wrote: > > A Centos 7.5 kernel with an unencountered set of minor build numbers > caused an upgrade bug. Adding the case for the rhel 7.5 kmod management > script fixes the problem. > > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > --- > rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > index 2cd8e5c..51756ec 100644 > --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > @@ -85,6 +85,11 @@ if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then > comp_ver=11 > ver_offset=4 > installed_ver="$minor_rev" > + elif [ "$major_rev" = "862" ]; then > +# echo "rhel75" > + comp_ver=11 > + ver_offset=4 > + installed_ver="$minor_rev" > elif [ "$major_rev" = "957" ]; then > # echo "rhel76" > comp_ver=10 > -- > 1.8.3.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
I applied this to master and 2.12. I got a conflict for 2.11. If you need this for 2.11, can you please rebase? On Tue, 27 Aug 2019 at 14:12, Yifeng Sun <pkusunyifeng@gmail.com> wrote: > Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com> > > On Tue, Aug 27, 2019 at 2:06 PM Greg Rose <gvrose8192@gmail.com> wrote: > > > > A Centos 7.5 kernel with an unencountered set of minor build numbers > > caused an upgrade bug. Adding the case for the rhel 7.5 kmod management > > script fixes the problem. > > > > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > > --- > > rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > > index 2cd8e5c..51756ec 100644 > > --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > > +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > > @@ -85,6 +85,11 @@ if [ "$mainline_major" = "3" ] && [ "$mainline_minor" > = "10" ]; then > > comp_ver=11 > > ver_offset=4 > > installed_ver="$minor_rev" > > + elif [ "$major_rev" = "862" ]; then > > +# echo "rhel75" > > + comp_ver=11 > > + ver_offset=4 > > + installed_ver="$minor_rev" > > elif [ "$major_rev" = "957" ]; then > > # echo "rhel76" > > comp_ver=10 > > -- > > 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 >
On 8/28/2019 10:07 AM, Guru Shetty wrote: > I applied this to master and 2.12. I got a conflict for 2.11. If you > need this for 2.11, can you please rebase? Yes, it needs to go back to 2.10 where we introduce the %posttrans scriptlet in rhel/openvswitch-kmod-fedora.spec.in I'll send rebased patches for both of those branches. Thanks! - Greg > > On Tue, 27 Aug 2019 at 14:12, Yifeng Sun <pkusunyifeng@gmail.com > <mailto:pkusunyifeng@gmail.com>> wrote: > > Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com > <mailto:pkusunyifeng@gmail.com>> > > On Tue, Aug 27, 2019 at 2:06 PM Greg Rose <gvrose8192@gmail.com > <mailto:gvrose8192@gmail.com>> wrote: > > > > A Centos 7.5 kernel with an unencountered set of minor build numbers > > caused an upgrade bug. Adding the case for the rhel 7.5 kmod > management > > script fixes the problem. > > > > Signed-off-by: Greg Rose <gvrose8192@gmail.com > <mailto:gvrose8192@gmail.com>> > > --- > > rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git > a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > > index 2cd8e5c..51756ec 100644 > > --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > > +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > > @@ -85,6 +85,11 @@ if [ "$mainline_major" = "3" ] && [ > "$mainline_minor" = "10" ]; then > > comp_ver=11 > > ver_offset=4 > > installed_ver="$minor_rev" > > + elif [ "$major_rev" = "862" ]; then > > +# echo "rhel75" > > + comp_ver=11 > > + ver_offset=4 > > + installed_ver="$minor_rev" > > elif [ "$major_rev" = "957" ]; then > > # echo "rhel76" > > comp_ver=10 > > -- > > 1.8.3.1 > > > > _______________________________________________ > > dev mailing list > > dev@openvswitch.org <mailto:dev@openvswitch.org> > > https://mail.openvswitch.org/mailman/listinfo/ovs-dev > _______________________________________________ > dev mailing list > dev@openvswitch.org <mailto:dev@openvswitch.org> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On 8/28/2019 10:16 AM, Gregory Rose wrote: > > > On 8/28/2019 10:07 AM, Guru Shetty wrote: >> I applied this to master and 2.12. I got a conflict for 2.11. If you >> need this for 2.11, can you please rebase? > > Yes, it needs to go back to 2.10 where we introduce the %posttrans > scriptlet in rhel/openvswitch-kmod-fedora.spec.in I sent a patch for branch 2.11. After looking more closely there is no need for the patch in 2.10. Thanks, - Greg
On Wed, 28 Aug 2019 at 10:42, Gregory Rose <gvrose8192@gmail.com> wrote: > > > On 8/28/2019 10:16 AM, Gregory Rose wrote: > > > > > > On 8/28/2019 10:07 AM, Guru Shetty wrote: > >> I applied this to master and 2.12. I got a conflict for 2.11. If you > >> need this for 2.11, can you please rebase? > > > > Yes, it needs to go back to 2.10 where we introduce the %posttrans > > scriptlet in rhel/openvswitch-kmod-fedora.spec.in > > I sent a patch for branch 2.11. After looking more closely there is no > need for the patch in 2.10. > Done. Applied to 2.11. Thanks for rebase! > > Thanks, > > - Greg > >
diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh index 2cd8e5c..51756ec 100644 --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh @@ -85,6 +85,11 @@ if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then comp_ver=11 ver_offset=4 installed_ver="$minor_rev" + elif [ "$major_rev" = "862" ]; then +# echo "rhel75" + comp_ver=11 + ver_offset=4 + installed_ver="$minor_rev" elif [ "$major_rev" = "957" ]; then # echo "rhel76" comp_ver=10
A Centos 7.5 kernel with an unencountered set of minor build numbers caused an upgrade bug. Adding the case for the rhel 7.5 kmod management script fixes the problem. Signed-off-by: Greg Rose <gvrose8192@gmail.com> --- rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 5 +++++ 1 file changed, 5 insertions(+)