rhel: Support RHEL 7.8 kernel module rpm build.

Add support for RHEL7.8 GA release with kernel 3.10.0-1127.

VMware-BZ: #2582834
Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
Signed-off-by: William Tu <u9012063@gmail.com>

diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in
index c94f2f5358a7ccfbe0edf4ea39b1bcf9749f9811..15eec6d4c0afafbc6938dccf2d0a8db04dbc5433 100644 (file)
--- a/rhel/openvswitch-kmod-fedora.spec.in
+++ b/rhel/openvswitch-kmod-fedora.spec.in
@@ -17,7 +17,8 @@
 #   - 3.10.0 major revision 693  (RHEL 7.4)
 #   - 3.10.0 major revision 957  (RHEL 7.6)
 #   - 3.10.0 major revision 1062 (RHEL 7.7)
-#   - 3.10.0 major revision 1101 (RHEL 7.8)
+#   - 3.10.0 major revision 1101 (RHEL 7.8 Beta)
+#   - 3.10.0 major revision 1127 (RHEL 7.8 GA)
 # By default, build against the current running kernel version
 #%define kernel 3.1.5-1.fc16.x86_64
 #define kernel %{kernel_source}
@@ -97,7 +98,7 @@ 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" ]; }; then
+       [ "$major_rev" = "1101" ] || [ "$major_rev" = "1127" ] ; }; then
     # For RHEL 7.2, 7.4, 7.6, 7.7, and 7.8
     if [ -x "%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh" ]; then
         %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh

diff --git a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh
index a9b5cdd817da554f036a675bf34e3128b7b7d3cd..93d48710125382407eabeda8933e38ba8ed89832 100644 (file)
--- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh
+++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh
@@ -19,7 +19,8 @@
 #   - 3.10.0 major revision 693  (RHEL 7.4)
 #   - 3.10.0 major revision 957  (RHEL 7.6)
 #   - 3.10.0 major revision 1062 (RHEL 7.7)
-#   - 3.10.0 major revision 1101 (RHEL 7.8)
+#   - 3.10.0 major revision 1101 (RHEL 7.8 Beta)
+#   - 3.10.0 major revision 1127 (RHEL 7.8 GA)
 #   - 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
@@ -108,6 +109,12 @@ if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then
         ver_offset=4
         installed_ver="$minor_rev"
     elif [ "$major_rev" = "1101" ]; then
+#        echo "rhel78"
+        comp_ver=10
+        ver_offset=4
+        installed_ver="$minor_rev"
+    fi
+    elif [ "$major_rev" = "1127" ]; then
 #        echo "rhel78"
         comp_ver=10
         ver_offset=4