From patchwork Thu Sep 20 19:19:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Xu X-Patchwork-Id: 972680 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.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.b="A1GN2nrK"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42GRQ45rbtz9sML for ; Fri, 21 Sep 2018 05:20:12 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E20FE13C1; Thu, 20 Sep 2018 19:19:45 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id B9CDA13A8 for ; Thu, 20 Sep 2018 19:19:44 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 6AB7742D for ; Thu, 20 Sep 2018 19:19:44 +0000 (UTC) Received: by mail-pg1-f193.google.com with SMTP id s15-v6so4879620pgv.8 for ; Thu, 20 Sep 2018 12:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bIAknKJrE+DFzOmLGUsaTaCmMe6uyC0DOk1qK8Yb+tQ=; b=A1GN2nrKB4H7I9WzrSJnuUOa2QEpkMbBN1Ay9rGHP0kmgUzJgAp5GhYqW2/Khxzi3W 8llMLCMYsEB9qwbP9LDdNOOgD2C2nPdD4cqi/YeXBOvcSH0EyRTf2cfq+1ysWragSAUU eJLjhGXiGDEaZ4uqrBkUPtOHN1p75fgEzki/2VYWosBPR5ZI2HyQ77Miv2n1Odotmtow u+2Bw+LKQXy7AVaeEO8hqzTNW5GmabJGZLOO1FbV4SfSwJ+dRidKXaQXS/GjKRoiq8lW RrZ9KBszQgNc/l17Eklb/aJhznbA9MIF+eOd9by2pEtjQJIiNsH9Nzc7c/556tEU9nMw QzsQ== 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:in-reply-to :references; bh=bIAknKJrE+DFzOmLGUsaTaCmMe6uyC0DOk1qK8Yb+tQ=; b=KrAbaEfsHtwqSAQGlLmiTeiNVXmqEM831OqLVdxcAQSBlksPfr9pu9O72+HrD7a4xi l52ZaGKgFfJ5EeEx7g3jjBowQ94zKqFYy4aNZQEsN9iVPzNt7+Qk3Qp+cm0hOOhV9iei 7pWov2yWDShYgA99gS/1WvumRE0p1j2cbpanNvgX8Yl04OQfSN2sLzvNudige3ZcUK9k L6s4nwYBVebXEPaVgyQDDdOmwqqz2T3c6NW/6Gv3erwBtYph6Fpi6+G3qRPoE6M77JAu xbMadOycwgwCKcyCKYc7TuwvuaBYE4mNv2ym4wV/j6iyYGvt4FoeNkBYRyI/A//0dw1j 5ilA== X-Gm-Message-State: APzg51BsSY8042cEQnfoOdE3uBZxebtvBAeTR8H+n9YN3smCZu3BPriL JhoAkg11MC9i7fAqWOqh2jfyJSAU X-Google-Smtp-Source: ANB0VdY99s/p/nOOVoL34AdxMIg+wdQPLZnsGZqQ0/DnGlijXY84Tx0MIvF1KRHaTTFpNsHfItLSOw== X-Received: by 2002:a62:1815:: with SMTP id 21-v6mr42285985pfy.227.1537471183774; Thu, 20 Sep 2018 12:19:43 -0700 (PDT) Received: from rhel72-vm1-local.eng.vmware.com. ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id 142-v6sm185459pgg.54.2018.09.20.12.19.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Sep 2018 12:19:43 -0700 (PDT) From: Martin Xu To: dev@openvswitch.org Date: Thu, 20 Sep 2018 12:19:30 -0700 Message-Id: <1537471170-35289-2-git-send-email-martinxu9.ovs@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1537471170-35289-1-git-send-email-martinxu9.ovs@gmail.com> References: <1537471170-35289-1-git-send-email-martinxu9.ovs@gmail.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Flavio Leitner Subject: [ovs-dev] [PATCH v1 2/2] rhel: fix wrong condition check for ovs-kmod-manage.sh, fedora X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org In post-install in kmod fedora spec file, the variables storing different parts of kernel version numbers are renamed. The condition check to run ovs-kmod-manage.sh for RHEL 7.2 and 7.4 uses the older variables. Fixes c3570519ecaf (rhel: add 4.4 kernel in kmod build with mulitple versions, fedora) Signed-off-by: Martin Xu CC: Greg Rose CC: Flavio Leitner --- rhel/openvswitch-kmod-fedora.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in index 464d537..8d54fd7 100644 --- a/rhel/openvswitch-kmod-fedora.spec.in +++ b/rhel/openvswitch-kmod-fedora.spec.in @@ -86,7 +86,7 @@ IFS='.\|-' read mainline_major mainline_minor mainline_patch major_rev \ # echo mainline_major=$mainline_major mainline_minor=$mainline_minor \ # mainline_patch=$mainline_patch major_rev=$major_rev minor_rev=$minor_rev if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then - if [ "$installed_major" = "327" ] || [ "$installed_major" = "693" ]; then + if [ "$major_rev" = "327" ] || [ "$major_rev" = "693" ]; then # For RHEL 7.2 and 7.4 if [ -x "%{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh" ]; then %{_datadir}/openvswitch/scripts/ovs-kmod-manage.sh