summaryrefslogtreecommitdiff
path: root/rhel
diff options
context:
space:
mode:
authorWilliam Tu <u9012063@gmail.com>2020-06-17 08:38:40 -0700
committerWilliam Tu <u9012063@gmail.com>2020-06-18 09:12:34 -0700
commitfecb28051b357c636d7a5fed8ad5bb9add4f5b44 (patch)
treece99c6693f73b2f07261805c7ae572ff90be607d /rhel
parentf0aed51ca70f2f7ff38b292b6aaf34b27ebd9575 (diff)
downloadopenvswitch-fecb28051b357c636d7a5fed8ad5bb9add4f5b44.tar.gz
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>
Diffstat (limited to 'rhel')
-rw-r--r--rhel/openvswitch-kmod-fedora.spec.in5
-rw-r--r--rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh9
2 files changed, 11 insertions, 3 deletions
diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in
index c94f2f535..15eec6d4c 100644
--- 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 a9b5cdd81..93d487101 100644
--- 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
@@ -113,6 +114,12 @@ if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then
ver_offset=4
installed_ver="$minor_rev"
fi
+ elif [ "$major_rev" = "1127" ]; then
+# echo "rhel78"
+ 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
# echo "sles12sp3"