From patchwork Thu Dec 5 01:10:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi-Hung Wei X-Patchwork-Id: 1204424 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.136; helo=silver.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.b="Q+J06IcW"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Syct3Vdqz9sP6 for ; Thu, 5 Dec 2019 12:22:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E33D124C80; Thu, 5 Dec 2019 01:22:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id M4gSiS9tPV3s; Thu, 5 Dec 2019 01:22:19 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 7AC3223244; Thu, 5 Dec 2019 01:22:19 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 72FCFC18DD; Thu, 5 Dec 2019 01:22:19 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 833FBC077D for ; Thu, 5 Dec 2019 01:22:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7F3B023244 for ; Thu, 5 Dec 2019 01:22:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id try489abYfR3 for ; Thu, 5 Dec 2019 01:22:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by silver.osuosl.org (Postfix) with ESMTPS id 5A4C924BE8 for ; Thu, 5 Dec 2019 01:22:17 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id 2so734276pfg.12 for ; Wed, 04 Dec 2019 17:22:17 -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=cQPJl0HULH3It7RpNGnzUclHZ/VibfqxRzHglTGAHFo=; b=Q+J06IcWUYWqlGLUCRFSMN+A8TgEhwDfaRkcHopgmYcq4DBaq8it9KmM7oWviKpdES 0OOZTbrYG+J1sM2PJLik9bZ4eajQEVuLbdiKuAlfdYhdnh8xEVGzoW+BimCBQXLVPcLD GtTKt7OTn2SGY9kUdS4zNHkyW/CDVO3fyiM3sz+LN0gEYuI64mmCyFolJ8mXhA6I6+mb wS56liMWsFIgMJ0JnuKuLQe5yHgf4k4cdi88rXM+gPkl+u3nn8xBmC1X4n9pkhl0NNDp 3xb7Yk/jH6a4/umWesPfrhTIrtvrA8s1bExWMmYeYfcRRmKgIi6gvWG8/Lghln1L9WCM fkFA== 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=cQPJl0HULH3It7RpNGnzUclHZ/VibfqxRzHglTGAHFo=; b=stdEmFGOvLkzU0Py1XEAVUcYkv/9agLoq5nHKQCHN4mZuhINQkVBXiOdBHtERenodP odAgXoxzu67m5OYD9zg0rx1yDWA3mJxSJexsz1rG88vrFTUwu1e9tMHyOJc9agTn7OAx Z4xGB7fDTGNCzv++gvIZIBOPrndtc5mdTDWKoMWli5MfxYcEKveb1oN2vJzNfU9TON8w sFXQAsV/3VCJM8H1T94sUpI1OD5n0mEu7o/gpEOdspYlLjduxN1UQjceQ2lfaygDsc36 IvoOSEx1++4l3KqjyauHF1gxpIc4SzrmlkmKlQotOSA2i3UrE4IP1ZeDdV5fkH0A7nzy T0lA== X-Gm-Message-State: APjAAAX2Lk4LNXHQUjcXMcpA3DtqVZcHkJYAG7qFi1zpnvOzYn5lH1EG wbF8fYQ3flTNP3tk1HRW4fSL5D5D X-Google-Smtp-Source: APXvYqxYIrIg7QwkpKL3XoLnNWivXWV91LUBwjeARycZqCr1wm2LevfY6q/kZe8x+YNKPJz/G4o8CQ== X-Received: by 2002:a63:2949:: with SMTP id p70mr6707082pgp.191.1575508936360; Wed, 04 Dec 2019 17:22:16 -0800 (PST) Received: from Husky.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id 17sm9710686pfv.142.2019.12.04.17.22.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Dec 2019 17:22:15 -0800 (PST) From: Yi-Hung Wei To: dev@openvswitch.org Date: Wed, 4 Dec 2019 17:10:27 -0800 Message-Id: <1575508227-18828-1-git-send-email-yihung.wei@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [ovs-dev] [PATCH] rhel: Support RHEL 7.8 kernel module rpm build 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" This patch supports RHEL 7.8 kernel module rpm package building. $ make rpm-fedora-kmod \ RPMBUILD_OPT='-D "kversion 3.10.0-1101.el7.x86_64"' Signed-off-by: Yi-Hung Wei Reviewed-by: Yifeng Sun --- rhel/openvswitch-kmod-fedora.spec.in | 14 +++++++++----- rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh | 6 ++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/rhel/openvswitch-kmod-fedora.spec.in b/rhel/openvswitch-kmod-fedora.spec.in index fbb8366990f1..c94f2f5358a7 100644 --- a/rhel/openvswitch-kmod-fedora.spec.in +++ b/rhel/openvswitch-kmod-fedora.spec.in @@ -12,9 +12,12 @@ # 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 1062 (RHEL 7.7), -# major revision 957 (RHEL 7.6), major revision 693 (RHEL 7.4) and -# major revision 327 (RHEL 7.2). +# This only works for 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 1062 (RHEL 7.7) +# - 3.10.0 major revision 1101 (RHEL 7.8) # By default, build against the current running kernel version #%define kernel 3.1.5-1.fc16.x86_64 #define kernel %{kernel_source} @@ -93,8 +96,9 @@ 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" ] || [ "$major_rev" == "1062" ]; }; then - # For RHEL 7.2, 7.4, 7.6 and 7.7 + [ "$major_rev" = "957" ] || [ "$major_rev" == "1062" ] || \ + [ "$major_rev" = "1101" ]; }; then + # For RHEL 7.2, 7.4, 7.6, 7.7, and 7.8 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 a252b391ecba..a9b5cdd817da 100644 --- a/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh +++ b/rhel/usr_share_openvswitch_scripts_ovs-kmod-manage.sh @@ -19,6 +19,7 @@ # - 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) +# - 3.10.0 major revision 1101 (RHEL 7.8) # - 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 @@ -106,6 +107,11 @@ if [ "$mainline_major" = "3" ] && [ "$mainline_minor" = "10" ]; then comp_ver=10 ver_offset=4 installed_ver="$minor_rev" + elif [ "$major_rev" = "1101" ]; then +# echo "rhel78" + 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