| Message ID | 20201117232613.26258-1-gvrose8192@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,V2] Update scripts to support RHEL 7.9 | expand |
LGTM. Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com> On Tue, Nov 17, 2020 at 3:26 PM Greg Rose <gvrose8192@gmail.com> wrote: > Add support for RHEL7.9 GA release with kernel 3.10.0-1160 > > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > > --- > V2 - Correct the author > --- > rhel/openvswitch-kmod-fedora.spec.in | 6 ++++-- > rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 6 ++++++ > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/ > openvswitch-kmod-fedora.spec.in > index 15eec6d4c..ff190064f 100644 > --- a/rhel/openvswitch-kmod-fedora.spec.in > +++ b/rhel/openvswitch-kmod-fedora.spec.in > @@ -19,6 +19,7 @@ > # - 3.10.0 major revision 1062 (RHEL 7.7) > # - 3.10.0 major revision 1101 (RHEL 7.8 Beta) > # - 3.10.0 major revision 1127 (RHEL 7.8 GA) > +# - 3.10.0 major revision 1160 (RHEL 7.9 GA) > # By default, build against the current running kernel version > #%define kernel 3.1.5-1.fc16.x86_64 > #define kernel %{kernel_source} > @@ -98,8 +99,9 @@ if grep -qs "suse" /etc/os-release; then > elif [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ] && > { [ "$major_rev" = "327" ] || [ "$major_rev" = "693" ] || \ > [ "$major_rev" = "957" ] || [ "$major_rev" == "1062" ] || \ > - [ "$major_rev" = "1101" ] || [ "$major_rev" = "1127" ] ; }; then > - # For RHEL 7.2, 7.4, 7.6, 7.7, and 7.8 > + [ "$major_rev" = "1101" ] || [ "$major_rev" = "1127" ] || \ > + [ "$major_rev" = "1160" ] ; }; then > + # For RHEL 7.2, 7.4, 7.6, 7.7, 7.8 and 7.9 > if [ -x "%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh" ]; then > %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh > fi > diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > index c70e135cd..9bf25a46b 100644 > --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh > @@ -21,6 +21,7 @@ > # - 3.10.0 major revision 1062 (RHEL 7.7) > # - 3.10.0 major revision 1101 (RHEL 7.8 Beta) > # - 3.10.0 major revision 1127 (RHEL 7.8 GA) > +# - 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). > # It is packaged in the openvswitch kmod RPM and run in the post-install > @@ -118,6 +119,11 @@ if [ "$mainline_major" = "3" ] && [ "$mainline_minor" > = "10" ]; then > comp_ver=10 > ver_offset=4 > installed_ver="$minor_rev" > + elif [ "$major_rev" = "1160" ]; then > +# echo "rhel79" > + comp_ver=10 > + ver_offset=4 > + installed_ver="$minor_rev" > fi > elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "4" ]; then > if [ "$mainline_patch" -ge "73" ]; then > -- > 2.17.1 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev >
diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in index 15eec6d4c..ff190064f 100644 --- a/rhel/openvswitch-kmod-fedora.spec.in +++ b/rhel/openvswitch-kmod-fedora.spec.in @@ -19,6 +19,7 @@ # - 3.10.0 major revision 1062 (RHEL 7.7) # - 3.10.0 major revision 1101 (RHEL 7.8 Beta) # - 3.10.0 major revision 1127 (RHEL 7.8 GA) +# - 3.10.0 major revision 1160 (RHEL 7.9 GA) # By default, build against the current running kernel version #%define kernel 3.1.5-1.fc16.x86_64 #define kernel %{kernel_source} @@ -98,8 +99,9 @@ if grep -qs "suse" /etc/os-release; then elif [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ] && { [ "$major_rev" = "327" ] || [ "$major_rev" = "693" ] || \ [ "$major_rev" = "957" ] || [ "$major_rev" == "1062" ] || \ - [ "$major_rev" = "1101" ] || [ "$major_rev" = "1127" ] ; }; then - # For RHEL 7.2, 7.4, 7.6, 7.7, and 7.8 + [ "$major_rev" = "1101" ] || [ "$major_rev" = "1127" ] || \ + [ "$major_rev" = "1160" ] ; }; then + # For RHEL 7.2, 7.4, 7.6, 7.7, 7.8 and 7.9 if [ -x "%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh" ]; then %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh fi diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh index c70e135cd..9bf25a46b 100644 --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh @@ -21,6 +21,7 @@ # - 3.10.0 major revision 1062 (RHEL 7.7) # - 3.10.0 major revision 1101 (RHEL 7.8 Beta) # - 3.10.0 major revision 1127 (RHEL 7.8 GA) +# - 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). # It is packaged in the openvswitch kmod RPM and run in the post-install @@ -118,6 +119,11 @@ if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then comp_ver=10 ver_offset=4 installed_ver="$minor_rev" + elif [ "$major_rev" = "1160" ]; then +# echo "rhel79" + comp_ver=10 + ver_offset=4 + installed_ver="$minor_rev" fi elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "4" ]; then if [ "$mainline_patch" -ge "73" ]; then
Add support for RHEL7.9 GA release with kernel 3.10.0-1160 Signed-off-by: Greg Rose <gvrose8192@gmail.com> --- V2 - Correct the author --- rhel/openvswitch-kmod-fedora.spec.in | 6 ++++-- rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-)