From patchwork Tue Nov 17 23:26: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: 1401893 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.138; helo=whitealder.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=AX6ry+UZ; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CbMX16Bpdz9sPB for ; Wed, 18 Nov 2020 10:26:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 377A086673; Tue, 17 Nov 2020 23:26: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 hLQbOFgPbk6D; Tue, 17 Nov 2020 23:26:23 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id E9B1084AE3; Tue, 17 Nov 2020 23:26:22 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id C8A27C0800; Tue, 17 Nov 2020 23:26:22 +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 613DAC07FF for ; Tue, 17 Nov 2020 23:26:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4DD3684CE0 for ; Tue, 17 Nov 2020 23:26:22 +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 4quKAbp-38sh for ; Tue, 17 Nov 2020 23:26:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by whitealder.osuosl.org (Postfix) with ESMTPS id BEE2084AE3 for ; Tue, 17 Nov 2020 23:26:21 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id i8so178242pfk.10 for ; Tue, 17 Nov 2020 15:26:21 -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=VrkSjkR1KKCy0KOAEDHhUg89IR3JzF7cJzeDi9v9uXo=; b=AX6ry+UZtjXMNmI5yS1sUvi8M3Yv+FGe+oJhv/k1SX9kVdf/Cojc41dXyy8rCw5kmK 6yfwrln6QIUAk+1eVs1023tODt2TAJleOsi2R0/dMjNK7tW8yI1jiaHZ9RLlcTGHuvbp A1oiif4NwB03ZvxM/AT07YR4CAwFmhh7eSLXChRskZ7LAKVGIVnwhhSINKFvHnv10k1q aCdgaqsH2HSZVTQDMJJr/wfBtqP1AhORkIv4uY8AsKR74bVLzufHVI7JMWQ/ga8qjN1P GmNIL+tPJoyzePETUrqHvUWHy2TwP4pmkW6BQsZATJ6njONqRFzCLvEuBcsX2MAkvwDD HtSA== 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=VrkSjkR1KKCy0KOAEDHhUg89IR3JzF7cJzeDi9v9uXo=; b=hTY8tqKLxJNAUSS0Rdhg0Z8chh2WzxHUcIiU91EarlErOp1iorwFRkLXSY4Sb6Nu8B H9Nom86kl22rMrZPo8bw9xh339KoqQaFXu1hV2dH7ZTPWEdxKoLFhW9tnwMP55o+VSPx bJSCN3C4ysqF7PGDQpq2nbhKQV5bEbhiElzeRtHuhSwMur0vapk5Tj3bo2m5QvcuEvVq D6EIJcWqM1uYYy/BkME4+MFJydSYTl9HUvewDgn35DJfZP2doMVjA5sXXbyXN6ec/8RH jPxbdXJyO/ic1v45Squl1UEmcmpxRg99XZ6NxhIS9xGwfJpPGNJQkmCjfEwBsiuTfrBE iq5Q== X-Gm-Message-State: AOAM531qvNLydHyHSTtw2aPk7Htp3/DIPP44hteQfjrN/vUjHOkbKjYy 5+PSflUVIcet2Q/NErkuviZbVGmnkdR4ng== X-Google-Smtp-Source: ABdhPJygEMhJt5mpffOgzZfaXcoDIN4y7ZXB9iEABYfzBoMAFb8WZ6aIOQqVUu7cljJAA7Pzf8PxmA== X-Received: by 2002:a62:8857:0:b029:18b:cf28:9bbe with SMTP id l84-20020a6288570000b029018bcf289bbemr1709520pfd.45.1605655581000; Tue, 17 Nov 2020 15:26:21 -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 m68sm19628965pga.46.2020.11.17.15.26.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 15:26:20 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Tue, 17 Nov 2020 15:26:13 -0800 Message-Id: <20201117232613.26258-1-gvrose8192@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [ovs-dev] [PATCH V2] 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" Add support for RHEL7.9 GA release with kernel 3.10.0-1160 Signed-off-by: Greg Rose Reviewed-by: Yifeng Sun --- V2 - Correct the author --- 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..ff190064f 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 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 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