From patchwork Thu Jul 12 17:35:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Xu X-Patchwork-Id: 943149 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="fFTZ1R+m"; 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 41RNQr4pc2z9rxs for ; Fri, 13 Jul 2018 03:36:35 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id A7C52DC5; Thu, 12 Jul 2018 17:36:31 +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 6D7CFDBC for ; Thu, 12 Jul 2018 17:36:30 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f181.google.com (mail-pf0-f181.google.com [209.85.192.181]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D2A40772 for ; Thu, 12 Jul 2018 17:36:29 +0000 (UTC) Received: by mail-pf0-f181.google.com with SMTP id l123-v6so20999287pfl.13 for ; Thu, 12 Jul 2018 10:36:29 -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=WKV4nqff5BDMJHD264vTLaCQco9nxwMXXza071eDxhY=; b=fFTZ1R+mVda2/3L85SUC2klIf7EtCJkvklPgnsTN188JXIbC/4WOCwo0L6OPm2pZiP NdWuMbCObpA4VHjOnKjVGb6D49mYFoQ6sY8qxYVsug6dymSZ7XP9uHiPXwwvzxLSQbP6 NSHhsqSF9+9AP7BZIJYfWTBkVKrFVdL5uNP/MpWqJhAAHjhtEECqCIvdiDJn/MpK5HY1 812R9CtOwmWpctDebrZY5TJfSSfYQCwmo+bg46wYcuusD+oHYJMM2hjVPzTXg1+L8mZG V8/x0OGr1Bp2rOQjbiotZua2GOJFvwPFVSnXNlJkZGGzkA0m5P9csHUopTf5zSdUCBI2 iLCQ== 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=WKV4nqff5BDMJHD264vTLaCQco9nxwMXXza071eDxhY=; b=tVzBPSd8Is3sfA16sQ3Gx9BKGhSVSHIEBkwro528gXsM3OfcJQiIdqNaBI+N2RcsYa q0loOBnWf/7rLivSj7TSra6NcUGzYMQXsQa4Vz/ZEITTZE5iLLaRO9aQjpH/GWL8BvU6 qohya5yIWgeUcbivsZ8z0XJ8SrBVOKGT8hw7CgVy0PFm+fnTfVCkSNMM2K2lXiwI2Uoz oqmj5RW1ukQKd7Jc27koeUtzJ+j8IiayTGf+KeRuwWbQD/EskCqGYwatupzv4T4uuFhR jrWDp1w2tVHL7V1bSAmZ3p0UWwWEWSv0hoXv8c/y2n9fK53QmuLSlUHY0SyuVXhUoz78 /Sng== X-Gm-Message-State: AOUpUlHjKXBUnD7jShigHx00BBBoQESI4H983ZR0WY0YRicVbnIMhizg iuRLsc4tfxXCC7eHdrpwa2zHLhg0 X-Google-Smtp-Source: AAOMgpcmiTU4D76TRJzzwZ5UZ6a1WJBN/o06Sx1bKeZ9zywFte44eXV05Jym7iJ2wSSq90FnqLyQww== X-Received: by 2002:a63:3083:: with SMTP id w125-v6mr2885666pgw.369.1531416989357; Thu, 12 Jul 2018 10:36:29 -0700 (PDT) Received: from martinx-a01.vmware.com.com ([208.91.2.1]) by smtp.gmail.com with ESMTPSA id j23-v6sm35500894pfi.137.2018.07.12.10.36.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jul 2018 10:36:28 -0700 (PDT) From: Martin Xu To: dev@openvswitch.org Date: Thu, 12 Jul 2018 10:35:54 -0700 Message-Id: <20180712173556.40703-1-martinxu9.ovs@gmail.com> X-Mailer: git-send-email 2.15.2 (Apple Git-101.1) 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 v3 1/3] rhel: rename openvswitch kmod rhel6 spec file 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 only affects rhel6 spec file. The rhel6 kmod spec file is renamed from openvswitch-kmod-rhel6.spec to kmod-openvswitch-rhel6.spec . This is to prepare for the next patches to support building multiple kernel versions in the main package. The rename makes the spec file consistent with the resulted kmod-openvswitch-.rpm, which is the real package with kernel module files. Signed-off-by: Martin Xu CC: Greg Rose CC: Ben Pfaff CC: Flavio Leitner CC: Aaron Conole --- Documentation/intro/install/rhel.rst | 7 +++---- poc/playbook-centos-builder.yml | 8 ++++---- rhel/.gitignore | 2 +- rhel/automake.mk | 6 +++--- ...nvswitch-kmod-rhel6.spec.in => kmod-openvswitch-rhel6.spec.in} | 0 5 files changed, 11 insertions(+), 12 deletions(-) rename rhel/{openvswitch-kmod-rhel6.spec.in => kmod-openvswitch-rhel6.spec.in} (100%) diff --git a/Documentation/intro/install/rhel.rst b/Documentation/intro/install/rhel.rst index f8b26069f..6f062e894 100644 --- a/Documentation/intro/install/rhel.rst +++ b/Documentation/intro/install/rhel.rst @@ -197,17 +197,16 @@ the unit tests, run:: Kernel Module ~~~~~~~~~~~~~ -On RHEL 6, to build the Open vSwitch kernel module, copy -rhel/openvswitch-kmod.files into the RPM sources directory and run:: +On RHEL 6, to build the Open vSwitch kernel module run:: - $ rpmbuild -bb rhel/openvswitch-kmod-rhel6.spec + $ rpmbuild -bb rhel/kmod-openvswitch-rhel6.spec You might have to specify a kernel version and/or variants, e.g.: $ rpmbuild -bb \ -D "kversion 2.6.32-131.6.1.el6.x86_64" \ -D "kflavors default debug kdump" \ - rhel/openvswitch-kmod-rhel6.spec + rhel/kmod-openvswitch-rhel6.spec This produces an "kmod-openvswitch" RPM for each kernel variant, in this example: "kmod-openvswitch", "kmod-openvswitch-debug", and diff --git a/poc/playbook-centos-builder.yml b/poc/playbook-centos-builder.yml index 71f104010..e902db75d 100644 --- a/poc/playbook-centos-builder.yml +++ b/poc/playbook-centos-builder.yml @@ -41,13 +41,13 @@ chdir: /git/ovs/rhel with_items: - openvswitch.spec - - openvswitch-kmod-rhel6.spec + - kmod-openvswitch-rhel6.spec - name: Install build dependencies specified from spec files shell: echo "y" | yum-builddep /tmp/{{item}} with_items: - openvswitch.spec - - openvswitch-kmod-rhel6.spec + - kmod-openvswitch-rhel6.spec - name: Create rpm dev tree command: rpmdev-setuptree @@ -81,7 +81,7 @@ line: "Release: {{ ansible_local.builder.release }}" with_items: - openvswitch.spec - - openvswitch-kmod-rhel6.spec + - kmod-openvswitch-rhel6.spec - name: Build Open vSwitch user space rpms command: rpmbuild -bb --without check rhel/openvswitch.spec @@ -89,7 +89,7 @@ chdir: "{{SOURCE}}/openvswitch-{{version.stdout}}" - name: Build Open vSwitch kmod rpms (only for currently loaded kernel) - command: rpmbuild -bb --without check rhel/openvswitch-kmod-rhel6.spec + command: rpmbuild -bb --without check rhel/kmod-openvswitch-rhel6.spec args: chdir: "{{SOURCE}}/openvswitch-{{version.stdout}}" diff --git a/rhel/.gitignore b/rhel/.gitignore index e584a1ed0..a9c047f83 100644 --- a/rhel/.gitignore +++ b/rhel/.gitignore @@ -1,6 +1,6 @@ openvswitch-dkms.spec openvswitch-kmod-rhel5.spec -openvswitch-kmod-rhel6.spec +kmod-openvswitch-rhel6.spec openvswitch-kmod-fedora.spec openvswitch.spec openvswitch-fedora.spec diff --git a/rhel/automake.mk b/rhel/automake.mk index 137ff4a39..82a450831 100644 --- a/rhel/automake.mk +++ b/rhel/automake.mk @@ -15,8 +15,8 @@ EXTRA_DIST += \ rhel/etc_sysconfig_network-scripts_ifup-ovs \ rhel/openvswitch-dkms.spec \ rhel/openvswitch-dkms.spec.in \ - rhel/openvswitch-kmod-rhel6.spec \ - rhel/openvswitch-kmod-rhel6.spec.in \ + rhel/kmod-openvswitch-rhel6.spec \ + rhel/kmod-openvswitch-rhel6.spec.in \ rhel/openvswitch-kmod.files \ rhel/openvswitch-kmod-fedora.spec \ rhel/openvswitch-kmod-fedora.spec.in \ @@ -48,7 +48,7 @@ update_rhel_spec = \ $(srcdir)/rhel/openvswitch-dkms.spec: rhel/openvswitch-dkms.spec.in $(top_builddir)/config.status $(update_rhel_spec) -$(srcdir)/rhel/openvswitch-kmod-rhel6.spec: rhel/openvswitch-kmod-rhel6.spec.in $(top_builddir)/config.status +$(srcdir)/rhel/kmod-openvswitch-rhel6.spec: rhel/kmod-openvswitch-rhel6.spec.in $(top_builddir)/config.status $(update_rhel_spec) $(srcdir)/rhel/openvswitch-kmod-fedora.spec: rhel/openvswitch-kmod-fedora.spec.in $(top_builddir)/config.status diff --git a/rhel/openvswitch-kmod-rhel6.spec.in b/rhel/kmod-openvswitch-rhel6.spec.in similarity index 100% rename from rhel/openvswitch-kmod-rhel6.spec.in rename to rhel/kmod-openvswitch-rhel6.spec.in