Update scripts to support RHEL 7.9

Add support for RHEL7.9 GA release with kernel 3.10.0-1160

Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Reviewed-by: Yifeng Sun <pkusunyifeng@gmail.com>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>

diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in
index 15eec6d4c0afafbc6938dccf2d0a8db04dbc5433..ff190064f92878f9aaca6e658a429bbbd9a8f256 100644 (file)
--- 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 c70e135cd5ef8bcf6b9d297f95d644703ca7ec2f..9bf25a46b590616ab8b298d56d008e2fab54b6c3 100644 (file)
--- 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