From patchwork Tue Nov 17 21:32:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1401872 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=KyiFETzf; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CbK0W2dWdz9sRR for ; Wed, 18 Nov 2020 08:32:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id F3D9C85462; Tue, 17 Nov 2020 21:32:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7Jh2Aq2c420T; Tue, 17 Nov 2020 21:32:25 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4198485424; Tue, 17 Nov 2020 21:32:25 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 27298C07FF; Tue, 17 Nov 2020 21:32:25 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 16F67C07FF for ; Tue, 17 Nov 2020 21:32:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0AACC86673 for ; Tue, 17 Nov 2020 21:32:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8uFaKPkXLSYW for ; Tue, 17 Nov 2020 21:32:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id F15C686672 for ; Tue, 17 Nov 2020 21:32:22 +0000 (UTC) Received: by mail-pj1-f68.google.com with SMTP id w20so1273855pjh.1 for ; Tue, 17 Nov 2020 13:32:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=qbAAb9fYl8gqoOLc99X6Gj8l7kRHt6s+Gy7fLxuug8E=; b=KyiFETzf7x7fafqkjRGHsCxNWAFR/D/GVJVNsvEbKo7pvvDe77Ah9j1TZAdXIv7dRa KRBD4br2l1wp+in4xrjn54iGInsDC/1VGwJXMyUunPDcQu27vbEoypqlIiS8yWiKQNCm xVjh9P7QhRW66Kn8QGRiGfh6Y1Kw4QuGYszW7YzBAZ3le5E1/IMIB6kU2rXQM3/OSfFA +40/MggGm8AxBz4rcjszkqH9cRqne45wQH7uE6aAtH6Ql6C22TJpVe9BQ9getLQvwNSg rLDiIKcvUvaz2uMyfdXj2bOBQRqkY0SGboChq7iPKK7RgjZ/Y81wWJ6Xp8aqpJf2v4zH u9uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qbAAb9fYl8gqoOLc99X6Gj8l7kRHt6s+Gy7fLxuug8E=; b=LI7RPjHYRwXipee5G4J8M2ikfvkmujXDSXuciUYmMx6kiKIT/42s8vEZYX7s1mj+zr +xfuGuL9R0OYGAA+ynwCES7EExevljJUGOH/nVPUfw9ucJYrHjnP14LUDq4RI3TG/f4r +INXka2Uh0t1ZI6WBMC3Jb5YGbuo7PDWNGm0qqpDydX4Pf+bTptEnne/KpTrCg/L1Uuo 7D4fWH3WEo1X8kk01odTf6q+vXEWXRnJhwSp/gQ0kSv64WLv1nK+aa+0AqGFS7vim4cC vSamZcZgspM6Ek0g5m34DH5r4uP1C8g7bwbL3Q2u/z9ew/ohdEFGAiZB+zW/IUvAU63f 9oYQ== X-Gm-Message-State: AOAM5318mhzVLAJzKTyeGbeflkApE33qz5oHRfCwcAHIp+TroUQ5+rYa yVaaXGRHCpvQR+o18yVOEfzbBmPjwjCLvw== X-Google-Smtp-Source: ABdhPJyWe8nIU4/FqtzUKFFsYIlxZsUVOmfOVyYl43dGDkDL2RUka0lIXVgynMFSatg7a8Y7soyy0g== X-Received: by 2002:a17:90a:2ec8:: with SMTP id h8mr1003904pjs.51.1605648742311; Tue, 17 Nov 2020 13:32:22 -0800 (PST) Received: from VMware-box.domain (97-115-103-98.ptld.qwest.net. [97.115.103.98]) by smtp.googlemail.com with ESMTPSA id e17sm22184810pfm.155.2020.11.17.13.32.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 13:32:21 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Tue, 17 Nov 2020 13:32:13 -0800 Message-Id: <20201117213213.25639-1-gvrose8192@gmail.com> X-Mailer: git-send-email 2.17.1 Cc: Greg Rose Subject: [ovs-dev] [PATCH] Update scripts to support RHEL 7.9 X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Greg Rose Add support for RHEL7.9 GA release with kernel 3.10.0-1160 Signed-off-by: Greg Rose Signed-off-by: Greg Rose > --- 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