| Message ID | 20210823163322.18621-1-gvrose8192@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev] rhel: Fix dual kernel rpm install for RHEL 8.4 | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
LGTM, thanks Greg. Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com> On Mon, Aug 23, 2021 at 9:33 AM Greg Rose <gvrose8192@gmail.com> wrote: > RHEL 8.4 is the first of the RHEL 8.x kernels that has broken ABI so > it requires the same sort of fix as we did for several RHEL 7.x kernel > that needed two kernel rpms to work for all minor revisions of the > baseline kernel module. > > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > --- > rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > index 22bebaa58..01d31a216 100644 > --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > @@ -24,6 +24,7 @@ > # - 3.10.0 major revision 1160 (RHEL 7.9) > # - 4.4.x, x >= 73 (SLES 12 SP3) > # - 4.12.x, x >= 14 (SLES 12 SP4). > +# - 4.18.x major revision 305 (RHEL 8.4) > # It is packaged in the openvswitch kmod RPM and run in the post-install > # scripts. > # > @@ -139,6 +140,13 @@ elif [ "$mainline_major" = "4" ] && [ > "$mainline_minor" = "12" ]; then > ver_offset=2 > installed_ver="$mainline_patch" > fi > +elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "18" ]; then > + if [ "$major_rev" = "305" ]; then > + echo "rhel84" > + comp_ver=9 > + ver_offset=4 > + installed_ver="$minor_rev" > + fi > fi > > if [ X"$ver_offset" = X ]; then > -- > 2.17.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On 8/25/2021 11:42 AM, Yifeng Sun wrote: > LGTM, thanks Greg. > > Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com> Thanks Yifeng! - Greg > > On Mon, Aug 23, 2021 at 9:33 AM Greg Rose <gvrose8192@gmail.com> wrote: > >> RHEL 8.4 is the first of the RHEL 8.x kernels that has broken ABI so >> it requires the same sort of fix as we did for several RHEL 7.x kernel >> that needed two kernel rpms to work for all minor revisions of the >> baseline kernel module. >> >> Signed-off-by: Greg Rose <gvrose8192@gmail.com> >> --- >> rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh >> b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh >> index 22bebaa58..01d31a216 100644 >> --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh >> +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh >> @@ -24,6 +24,7 @@ >> # - 3.10.0 major revision 1160 (RHEL 7.9) >> # - 4.4.x, x >= 73 (SLES 12 SP3) >> # - 4.12.x, x >= 14 (SLES 12 SP4). >> +# - 4.18.x major revision 305 (RHEL 8.4) >> # It is packaged in the openvswitch kmod RPM and run in the post-install >> # scripts. >> # >> @@ -139,6 +140,13 @@ elif [ "$mainline_major" = "4" ] && [ >> "$mainline_minor" = "12" ]; then >> ver_offset=2 >> installed_ver="$mainline_patch" >> fi >> +elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "18" ]; then >> + if [ "$major_rev" = "305" ]; then >> + echo "rhel84" >> + comp_ver=9 >> + ver_offset=4 >> + installed_ver="$minor_rev" >> + fi >> fi >> >> if [ X"$ver_offset" = X ]; then >> -- >> 2.17.1 >> >> _______________________________________________ >> dev mailing list >> dev@openvswitch.org >> https://mail.openvswitch.org/mailman/listinfo/ovs-dev >> >
On Wed, Aug 25, 2021 at 3:08 PM Gregory Rose <gvrose8192@gmail.com> wrote: > > > > On 8/25/2021 11:42 AM, Yifeng Sun wrote: > > LGTM, thanks Greg. > > > > Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com> > Thanks, I pushed to master. William
Thanks William! On 9/3/2021 8:43 PM, William Tu wrote: > On Wed, Aug 25, 2021 at 3:08 PM Gregory Rose <gvrose8192@gmail.com> wrote: >> >> >> >> On 8/25/2021 11:42 AM, Yifeng Sun wrote: >>> LGTM, thanks Greg. >>> >>> Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com> >> > Thanks, I pushed to master. > William >
On Mon, Aug 23, 2021 at 6:33 PM Greg Rose <gvrose8192@gmail.com> wrote: > > RHEL 8.4 is the first of the RHEL 8.x kernels that has broken ABI so > it requires the same sort of fix as we did for several RHEL 7.x kernel > that needed two kernel rpms to work for all minor revisions of the > baseline kernel module. > > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > --- > rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > index 22bebaa58..01d31a216 100644 > --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > @@ -24,6 +24,7 @@ > # - 3.10.0 major revision 1160 (RHEL 7.9) > # - 4.4.x, x >= 73 (SLES 12 SP3) > # - 4.12.x, x >= 14 (SLES 12 SP4). > +# - 4.18.x major revision 305 (RHEL 8.4) > # It is packaged in the openvswitch kmod RPM and run in the post-install > # scripts. > # > @@ -139,6 +140,13 @@ elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "12" ]; then > ver_offset=2 > installed_ver="$mainline_patch" > fi > +elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "18" ]; then > + if [ "$major_rev" = "305" ]; then > + echo "rhel84" Are you sure you need that echo since it's commented on the other entries and it seems only used for debugging / development? > + comp_ver=9 > + ver_offset=4 > + installed_ver="$minor_rev" > + fi > fi > > if [ X"$ver_offset" = X ]; then > -- > 2.17.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
On 9/8/2021 9:05 AM, Timothy Redaelli wrote: > On Mon, Aug 23, 2021 at 6:33 PM Greg Rose <gvrose8192@gmail.com> wrote: >> >> RHEL 8.4 is the first of the RHEL 8.x kernels that has broken ABI so >> it requires the same sort of fix as we did for several RHEL 7.x kernel >> that needed two kernel rpms to work for all minor revisions of the >> baseline kernel module. >> >> Signed-off-by: Greg Rose <gvrose8192@gmail.com> >> --- >> rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 8 ++++++++ >> 1 file changed, 8 insertions(+) >> >> diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh >> index 22bebaa58..01d31a216 100644 >> --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh >> +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh >> @@ -24,6 +24,7 @@ >> # - 3.10.0 major revision 1160 (RHEL 7.9) >> # - 4.4.x, x >= 73 (SLES 12 SP3) >> # - 4.12.x, x >= 14 (SLES 12 SP4). >> +# - 4.18.x major revision 305 (RHEL 8.4) >> # It is packaged in the openvswitch kmod RPM and run in the post-install >> # scripts. >> # >> @@ -139,6 +140,13 @@ elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "12" ]; then >> ver_offset=2 >> installed_ver="$mainline_patch" >> fi >> +elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "18" ]; then >> + if [ "$major_rev" = "305" ]; then >> + echo "rhel84" > > Are you sure you need that echo since it's commented on the other > entries and it seems only used for debugging / development? Oops. My bad. I'll send another quickie patch to comment it out. Thanks for pointing that out! - Greg > >> + comp_ver=9 >> + ver_offset=4 >> + installed_ver="$minor_rev" >> + fi >> fi >> >> if [ X"$ver_offset" = X ]; then >> -- >> 2.17.1 >> >> _______________________________________________ >> 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 22bebaa58..01d31a216 100644 --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh @@ -24,6 +24,7 @@ # - 3.10.0 major revision 1160 (RHEL 7.9) # - 4.4.x, x >= 73 (SLES 12 SP3) # - 4.12.x, x >= 14 (SLES 12 SP4). +# - 4.18.x major revision 305 (RHEL 8.4) # It is packaged in the openvswitch kmod RPM and run in the post-install # scripts. # @@ -139,6 +140,13 @@ elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "12" ]; then ver_offset=2 installed_ver="$mainline_patch" fi +elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "18" ]; then + if [ "$major_rev" = "305" ]; then + echo "rhel84" + comp_ver=9 + ver_offset=4 + installed_ver="$minor_rev" + fi fi if [ X"$ver_offset" = X ]; then
RHEL 8.4 is the first of the RHEL 8.x kernels that has broken ABI so it requires the same sort of fix as we did for several RHEL 7.x kernel that needed two kernel rpms to work for all minor revisions of the baseline kernel module. Signed-off-by: Greg Rose <gvrose8192@gmail.com> --- rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 8 ++++++++ 1 file changed, 8 insertions(+)