From patchwork Fri Oct 11 21:49:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifeng Sun X-Patchwork-Id: 1175592 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="hEoyvLMh"; 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 46qhc14xJwz9sP4 for ; Sat, 12 Oct 2019 08:56:17 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 7714B1BC6; Fri, 11 Oct 2019 21:56:14 +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 EC4941BBF for ; Fri, 11 Oct 2019 21:49:23 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 54E9D14D for ; Fri, 11 Oct 2019 21:49:21 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id q12so6828380pff.9 for ; Fri, 11 Oct 2019 14:49:21 -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; bh=jx/Ms+ABF0AiEdS0KEvWxAI3A9Bf2jIakdsLy7zuDwQ=; b=hEoyvLMhbBEG+tEoSJSvlUq+mjtMeo0HBmUk8KTzsGp30FQhSxZ3dzwhhc15i81hZP Zy8XTqv42wXQQ88TCr12+/24jbBbRiWmUZM5io/6p7I16p69IQzkuOjPlBDGvQ4vd5Su Z9Ikx6/0ry13xa84vUpeuHzdzGkZyHvXLXPtHiuo2QlJ954OSTXehStHcxvZPasW9Ppb Ml7r5xBS6bLvTeu4aUOKij4bSknE3Bt3EA+bB4xdfE1F13fSCVNHODpXv3F2sSToB6Mu 3ZrLrEFwNDTG0pQxIRzGWVx9MNTf0Gqw0u/X+rBF3E2XQXK9PJxoY/o0rgzASL+ErRPu 6PRQ== 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=jx/Ms+ABF0AiEdS0KEvWxAI3A9Bf2jIakdsLy7zuDwQ=; b=WxBBh7kJJTxj/j3/MP+fGhZxV/LGfxGTbdKj6+9MN5suF9pzt0vPlAxYDmdZnsagaX skGvpTZoBLWGw/16p20zMS1jdq++2zkzD9F/DAeUgUDMzF6WWDDdpj5aSCcttdjUyIEt vbJeX+zIlZXcQ9DxDj/ZEzgclVMPwcRSWfiVNNIpKzn13Zn+IdBGGXugFPLbkAWQGemV k/UFxXMhBPlwe/ocfWaA5/dkfgphisZL8acb1fVqRjNoGhuaFmkPY1DYA4jcMiXB4nM6 fs4n2Q1dNtX2Xg993R56j1qlv/ej46WdUYC9kv4z6jLlruNh2e3i4bSXLM3ikswHISmK LtBQ== X-Gm-Message-State: APjAAAUH+0DamuC/9KLckMP2l6RsbULPojaRc+hq+Mw+cixCKCMmTQ7t kJRD5EVu6piGQU3t4rK+5aGlrpMHEDY= X-Google-Smtp-Source: APXvYqwrzb2O2UlTfMAAjlR/eoVh7o9j/PZYSmSKuFk2vHY9jLNGkjouG4xI/6KZVnfLP1CPDy1HxA== X-Received: by 2002:a63:cf0b:: with SMTP id j11mr6611767pgg.240.1570830560344; Fri, 11 Oct 2019 14:49:20 -0700 (PDT) Received: from kern417.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id t13sm8999176pfh.12.2019.10.11.14.49.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Oct 2019 14:49:19 -0700 (PDT) From: Yifeng Sun To: dev@openvswitch.org Date: Fri, 11 Oct 2019 14:49:14 -0700 Message-Id: <1570830554-9336-1-git-send-email-pkusunyifeng@gmail.com> X-Mailer: git-send-email 2.7.4 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 Subject: [ovs-dev] [PATCH] rhel: Support RHEL7.7 build and packaging 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 This patch provides essential fixes for OVS to support RHEL7.7's new kernel. make rpm-fedora-kmod \ RPMBUILD_OPT='-D "kversion 3.10.0-1062.1.2.el7.x86_64"' Signed-off-by: Yifeng Sun Tested-by: Greg Rose Reviewed-by: Greg Rose --- rhel/openvswitch-kmod-fedora.spec.in | 9 +++++---- rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 14 ++++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in index b3588982ef7a..fbb8366990f1 100644 --- a/rhel/openvswitch-kmod-fedora.spec.in +++ b/rhel/openvswitch-kmod-fedora.spec.in @@ -12,8 +12,9 @@ # Use the kversion macro such as # RPMBUILD_OPT='-D "kversion 3.10.0-693.1.1.el7.x86_64 3.10.0-693.17.1.el7.x86_64"' # to build package for mulitple kernel versions in the same package -# This only works for kernel 3.10.0 major revision 957 (RHEL 7.6), -# major revision 693 (RHEL 7.4) and major revision 327 (RHEL 7.2). +# This only works for kernel 3.10.0 major revision 1062 (RHEL 7.7), +# major revision 957 (RHEL 7.6), major revision 693 (RHEL 7.4) and +# major revision 327 (RHEL 7.2). # By default, build against the current running kernel version #%define kernel 3.1.5-1.fc16.x86_64 #define kernel %{kernel_source} @@ -92,8 +93,8 @@ if grep -qs "suse" /etc/os-release; then fi elif [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ] && { [ "$major_rev" = "327" ] || [ "$major_rev" = "693" ] || \ - [ "$major_rev" = "957" ]; }; then - # For RHEL 7.2, 7.4 and 7.6 + [ "$major_rev" = "957" ] || [ "$major_rev" == "1062" ]; }; then + # For RHEL 7.2, 7.4, 7.6 and 7.7 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 693fb0b744b3..a643b55ff0f8 100644 --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh @@ -15,9 +15,10 @@ # limitations under the License. # This script is intended to be used on the following kernels. -# - 3.10.0 major revision 327 (RHEL 7.2) -# - 3.10.0 major revision 693 (RHEL 7.4) -# - 3.10.0 major revision 957 (RHEL 7.6) +# - 3.10.0 major revision 327 (RHEL 7.2) +# - 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) # - 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 @@ -100,6 +101,11 @@ if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then comp_ver=10 ver_offset=4 installed_ver="$minor_rev" + elif [ "$major_rev" = "1062" ]; then +# echo "rhel77" + 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 @@ -111,7 +117,7 @@ elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "4" ]; then elif [ "$mainline_major" = "4" ] && [ "$mainline_minor" = "12" ]; then if [ "$mainline_patch" -ge "14" ]; then # echo "sles12sp4" - comp_ver=14 + comp_ver=1 ver_offset=2 installed_ver="$mainline_patch" fi