diff mbox series

[ovs-dev] Update scripts to support RHEL 7.9

Message ID 20201117213213.25639-1-gvrose8192@gmail.com
State Superseded
Headers show
Series [ovs-dev] Update scripts to support RHEL 7.9 | expand

Commit Message

Gregory Rose Nov. 17, 2020, 9:32 p.m. UTC 
From: Greg Rose <roseg@vmware.com>

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

Signed-off-by: Greg Rose <gvrose8192@gmail.com>
---
 rhel/openvswitch-kmod-fedora.spec.in                  | 6 ++++--
 rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

Comments

0-day Robot Nov. 17, 2020, 9:59 p.m. UTC | #1 
Bleep bloop.  Greetings Greg Rose, I am a robot and I have tried out your patch.
Thanks for your contribution.

I encountered some error that I wasn't expecting.  See the details below.


checkpatch:
ERROR: Author Greg Rose <roseg@vmware.com> needs to sign off.
WARNING: Unexpected sign-offs from developers who are not authors or co-authors or committers: Greg Rose <gvrose8192@gmail.com>
Lines checked: 64, Warnings: 1, Errors: 1


Please check this out.  If you feel there has been an error, please email aconole@redhat.com

Thanks,
0-day Robot
Gregory Rose Nov. 17, 2020, 11:21 p.m. UTC | #2 
On 11/17/2020 1:59 PM, 0-day Robot wrote:
> Bleep bloop.  Greetings Greg Rose, I am a robot and I have tried out your patch.
> Thanks for your contribution.
> 
> I encountered some error that I wasn't expecting.  See the details below.
> 
> 
> checkpatch:
> ERROR: Author Greg Rose <roseg@vmware.com> needs to sign off.
> WARNING: Unexpected sign-offs from developers who are not authors or co-authors or committers: Greg Rose <gvrose8192@gmail.com>
> Lines checked: 64, Warnings: 1, Errors: 1
> 
> 
> Please check this out.  If you feel there has been an error, please email aconole@redhat.com
> 
> Thanks,
> 0-day Robot
> 

Goodness, I generated this patch on a different machine than usual.
I guess that's why it's saying it's from my work email address.

I'll resend V2 with correct author.

- Greg
Guru Shetty Nov. 18, 2020, 10:31 p.m. UTC | #3 
On Tue, 17 Nov 2020 at 13:32, Greg Rose <gvrose8192@gmail.com> wrote:

> From: Greg Rose <roseg@vmware.com>
>
> Add support for RHEL7.9 GA release with kernel 3.10.0-1160
>
> Signed-off-by: Greg Rose <gvrose8192@gmail.com>
> ---
>
Thank you. I applied this to master.


>  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..bdaeadbba 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 xxxx (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
>
Gregory Rose Nov. 18, 2020, 10:33 p.m. UTC | #4 
Thanks again Guru!

From: Guru Shetty <guru.ovn@gmail.com>
Sent: Wednesday, November 18, 2020 2:32 PM
To: Greg Rose <gvrose8192@gmail.com>
Cc: ovs dev <dev@openvswitch.org>; Gregory Rose <roseg@vmware.com>
Subject: Re: [ovs-dev] [PATCH] Update scripts to support RHEL 7.9



On Tue, 17 Nov 2020 at 13:32, Greg Rose <gvrose8192@gmail.com<mailto:gvrose8192@gmail.com>> wrote:
From: Greg Rose <roseg@vmware.com<mailto:roseg@vmware.com>>

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

Signed-off-by: Greg Rose <gvrose8192@gmail.com<mailto:gvrose8192@gmail.com>>
---
Thank you. I applied this to master.

 rhel/openvswitch-kmod-fedora.spec.in<https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fopenvswitch-kmod-fedora.spec.in%2F&data=04%7C01%7Croseg%40vmware.com%7C53abbcd0696446f3975f08d88c11bb19%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C1%7C637413355075150695%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=u9gw00k%2F%2F2dck27CTJ4T6MLkfYDTtGUnpDEh%2FK%2Bni8I%3D&reserved=0>                  | 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<https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fopenvswitch-kmod-fedora.spec.in%2F&data=04%7C01%7Croseg%40vmware.com%7C53abbcd0696446f3975f08d88c11bb19%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C1%7C637413355075150695%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=u9gw00k%2F%2F2dck27CTJ4T6MLkfYDTtGUnpDEh%2FK%2Bni8I%3D&reserved=0> b/rhel/openvswitch-kmod-fedora.spec.in<https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fopenvswitch-kmod-fedora.spec.in%2F&data=04%7C01%7Croseg%40vmware.com%7C53abbcd0696446f3975f08d88c11bb19%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C1%7C637413355075160685%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=A6GL7bg4y7qpmfIbIOoAMY9I8GGQH5osS2Ai7mVYp7k%3D&reserved=0>
index 15eec6d4c..bdaeadbba 100644
--- a/rhel/openvswitch-kmod-fedora.spec.in<https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fopenvswitch-kmod-fedora.spec.in%2F&data=04%7C01%7Croseg%40vmware.com%7C53abbcd0696446f3975f08d88c11bb19%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C1%7C637413355075160685%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=A6GL7bg4y7qpmfIbIOoAMY9I8GGQH5osS2Ai7mVYp7k%3D&reserved=0>
+++ b/rhel/openvswitch-kmod-fedora.spec.in<https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fopenvswitch-kmod-fedora.spec.in%2F&data=04%7C01%7Croseg%40vmware.com%7C53abbcd0696446f3975f08d88c11bb19%7Cb39138ca3cee4b4aa4d6cd83d9dd62f0%7C0%7C1%7C637413355075170682%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=m3QmdbuDAoRe8qHtiFgTXEEUYZpqyq%2Fmq%2BsFDJS98hk%3D&reserved=0>
@@ -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 xxxx (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
diff mbox series

Patch

diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in
index 15eec6d4c..bdaeadbba 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 xxxx (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