From patchwork Thu Jun 8 20:47:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li,Rongqing via dev" X-Patchwork-Id: 773499 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3wkHYj6sxKz9s4q for ; Fri, 9 Jun 2017 06:47:53 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=skyportsystems.com header.i=@skyportsystems.com header.b="3UEv2kRl"; dkim-atps=neutral Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 9606DC26; Thu, 8 Jun 2017 20:47:24 +0000 (UTC) X-Original-To: ovs-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 D1784C09 for ; Thu, 8 Jun 2017 20:47:21 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f173.google.com (mail-pf0-f173.google.com [209.85.192.173]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id C9F07EB for ; Thu, 8 Jun 2017 20:47:20 +0000 (UTC) Received: by mail-pf0-f173.google.com with SMTP id 9so20997976pfj.1 for ; Thu, 08 Jun 2017 13:47:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skyportsystems.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=lm1h6KDQWhYG9U2xQO4/DuyE4FlC8D0zYtco16Wa3II=; b=3UEv2kRlQGRw3JCKCrkXnStKe6TSDgMFyCNKepTDyY6jpZ+CfZIHG1dtI/B5fffsgP P9VW4kBVzn8eZlGhUJtpke4xt9bgWXeSd5DXdPYNPW4iLM3Soyujtf1GaOzXeaVqbdzE vi5pRH368FGhMblAesHi4T6efbMUt9wf6Kv+8= 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:in-reply-to:references; bh=lm1h6KDQWhYG9U2xQO4/DuyE4FlC8D0zYtco16Wa3II=; b=MfF6tiLMpX0sJB48/dP6XH7Eanp5VbbHo7m5wEg3xGWI1EGejOWeqLiDbAtEo/wlic epJADoHHdTXaSmTKrY4pC7tXnvryMk2/4rEZYk7Xl2GZ/7qh9v8fqaFGQNmB76ODNE8q A2SEIFmTb1mcirw5HMiISuXwVtK5DBt+wdW839R4mu+9sBRiteigf2jtfUIjFTPXW9Iw RXKF7oPxU+dHwWV8PZlnaz2LBrTXVYObitYW5Y0TGorugsnLSwVVotkdyOakaA0ngwPk 1d6hc/n3V5SgwIZghGGwQmsJ7CRsPfPIf3YZ4gRN+UByVMRTh74uuqpgjpoHdVNG+T4A GEdg== X-Gm-Message-State: AODbwcC++L16j9gJh+BFIXU2y3ENjdbp0CMDHITpcMFyQMFzeAP4Dr/f 645KejjmeR1SkqdjYMxI2Q== X-Received: by 10.98.28.74 with SMTP id c71mr13848482pfc.154.1496954840279; Thu, 08 Jun 2017 13:47:20 -0700 (PDT) Received: from Arrow.corp.skyportsystems.com (67-207-112-138.static.wiline.com. [67.207.112.138]) by smtp.gmail.com with ESMTPSA id u62sm11722023pgd.53.2017.06.08.13.47.19 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 08 Jun 2017 13:47:19 -0700 (PDT) To: ovs-dev@openvswitch.org, blp@ovn.org Date: Thu, 8 Jun 2017 13:47:03 -0700 Message-Id: <7fe928606e1b9519990373e7a981c6ee4560d81a.1496950313.git.ben@skyportsystems.com> X-Mailer: git-send-email 2.11.0 (Apple Git-81) In-Reply-To: References: In-Reply-To: References: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, 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: Ben Warren Subject: [ovs-dev] [PATCH 2/2] Debian: Provide multi-arch support 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: , X-Patchwork-Original-From: Ben Warren via dev From: "Li,Rongqing via dev" Reply-To: ben@skyportsystems.com MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Ben Warren This puts all libraries and pkg-config files in architecture-specific directories for easier cross-compiling. Signed-off-by: Ben Warren --- debian/compat | 2 +- debian/control | 3 +++ debian/libopenvswitch-dev.install | 6 +++--- debian/libopenvswitch.install | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 42e6f16..2173735 100644 --- a/debian/control +++ b/debian/control @@ -56,6 +56,7 @@ Description: Open vSwitch datapath module source - DKMS version Package: openvswitch-common Architecture: linux-any +Multi-Arch: foreign Depends: openssl, python (>= 2.7), python-six, @@ -79,6 +80,7 @@ Description: Open vSwitch common components Package: libopenvswitch Architecture: linux-any +Multi-Arch: same Depends: libssl-dev, ${misc:Depends}, ${shlibs:Depends} @@ -302,6 +304,7 @@ Description: Open vSwitch VTEP utilities Package: libopenvswitch-dev Architecture: linux-any +Multi-Arch: same Depends: libopenvswitch (>= ${binary:Version}), ${misc:Depends} diff --git a/debian/libopenvswitch-dev.install b/debian/libopenvswitch-dev.install index 11791e4..ca3d22c 100644 --- a/debian/libopenvswitch-dev.install +++ b/debian/libopenvswitch-dev.install @@ -1,6 +1,6 @@ -usr/lib/lib*.so -usr/lib/lib*.a -usr/lib/pkgconfig +usr/lib/*/lib*.so +usr/lib/*/lib*.a +usr/lib/*/pkgconfig include/*.h usr/include/openvswitch include/openflow/*.h usr/include/openvswitch/openflow include/openvswitch/*.h usr/include/openvswitch/openvswitch diff --git a/debian/libopenvswitch.install b/debian/libopenvswitch.install index d0dbfd1..3ddde58 100644 --- a/debian/libopenvswitch.install +++ b/debian/libopenvswitch.install @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.*