From patchwork Mon Sep 10 20:33:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Xu X-Patchwork-Id: 968236 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="AENvYLh+"; 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 428KWT2Jrkz9s7T for ; Tue, 11 Sep 2018 06:33:40 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 7A81C1279; Mon, 10 Sep 2018 20:33:38 +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 1E81ACEA for ; Mon, 10 Sep 2018 20:33:37 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 8D735766 for ; Mon, 10 Sep 2018 20:33:36 +0000 (UTC) Received: by mail-pl1-f196.google.com with SMTP id f66-v6so2102888plb.10 for ; Mon, 10 Sep 2018 13:33:36 -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=P2ubBgkblnDScFbfk5yxKepUmflE2m+vJOB8WE5vsI0=; b=AENvYLh+qcx2DCyn0Y3LGwljOQGqZw4Bkec2PlwZGf3TEW3mP4CtHyAoB2a/vhzxR3 fXbF/HzODHNGq76x6bsa4+fcajIzRP+BQwp2AKFr5RyUBGOMJUqtWzD2OvPaMpuVWEuV LxF0G29zjqwDCKQKqEhAVN2CFs7Gmwfthyrwtbmzf5u3awY1hc2GBvl2afvd6q6745+B ohHpvV0NWW52gNVucNoQ3vkgkpmDP6ccDXEHvCSZYt42zpUXyHiprwlrHuwr+FNTEvvX Ud+/hvea9gGujZUwjLig3Gyxqs18B3yu/qjRBabcec9TDWh8cdNLI8YLLtZ5HpGAX7Sw 6zoQ== 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=P2ubBgkblnDScFbfk5yxKepUmflE2m+vJOB8WE5vsI0=; b=iX/x+hhh91gGuWkuVnyZlE8905854LB3MkZE/QMdzQDH2MI+/loYNKkhigxrYkiFS1 MvjKPb5V5Fp06492i7Eu5Dhca6FRbBf7fYK1UtvUuySm+sPHfjGHIFCrIdXx8mKgxuaU tMjs99xhAmUWohGeIqwVUxURa1niFl23ZR34tD4l2NWxNN6gJToHYthb1fpBLgcNRayx 8Gm3viahMc/7TG2/9qlrUnW3/30yWri3h3iJCLz8622OUrH+equXx7eH5MwpuXHF2xVo EB58pwuTHHwYflRUY64RigFJlaKYXGWfc4UlFZ28PBoMcXufpSRIr1n+0iLYdCYOBayW B12g== X-Gm-Message-State: APzg51D47EiokSKzWLgyI352+A0jqLTHc2QWHBiYiZ/bfA4uCTuaerbJ KXMHI0DRZKtd1w7ED2+WPxsyNnf2 X-Google-Smtp-Source: ANB0VdYwF4a18TQgrslAOrZ4HkzNNvR/cnmZXDJOEO9vjhBvZqXzYA/4gKGgOkEmCYWHOG/LOy99gA== X-Received: by 2002:a17:902:33c2:: with SMTP id b60-v6mr23541716plc.11.1536611615799; Mon, 10 Sep 2018 13:33:35 -0700 (PDT) Received: from vm1-rhel74-local.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id a90-v6sm34865439pfg.106.2018.09.10.13.33.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 13:33:34 -0700 (PDT) From: Martin Xu To: dev@openvswitch.org Date: Mon, 10 Sep 2018 13:33:31 -0700 Message-Id: <1536611611-5382-1-git-send-email-martinxu9.ovs@gmail.com> X-Mailer: git-send-email 1.8.3.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 v1] rhel: add build option to package ovs shared libraries, 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 This patches extends 4886d4d2495b (debian, rhel: Ship ovs shared libraries and header files) to fedora, by adding support of '--with enabled_shared' flag to 'make rpm-fedora' command. By default, the shared libraries are not included in the openvswitch RPM. When 'with' is specified, the openvswith RPM is packaged with the shared library files. These files are always packaged for the RPM built with rhel6 spec file. VMware-BZ: #2036847 Signed-off-by: Martin Xu CC: Flavio Leitner --- rhel/openvswitch-fedora.spec.in | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index cb7ecca..0fb7c0a 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -33,6 +33,8 @@ # have Python 3 by default (Fedora > 22). %bcond_with build_python3 +%bcond_with enable_shared + # Enable PIE, bz#955181 %global _hardened_build 1 @@ -236,6 +238,9 @@ Docker network plugins for OVN. --with-dpdk=$(dirname %{_datadir}/dpdk/*/.config) \ %endif --enable-ssl \ +%if %{with enable_shared} + --enable-shared \ +%endif --with-pkidir=%{_sharedstatedir}/openvswitch/pki \ %if 0%{?fedora} > 22 || %{with build_python3} PYTHON3=%{__python3} \ @@ -336,6 +341,8 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/ovs-parse-backtrace \ $RPM_BUILD_ROOT%{_sbindir}/ovs-vlan-bug-workaround \ $RPM_BUILD_ROOT%{_mandir}/man8/ovs-vlan-bug-workaround.8 +rm -rf $RPM_BUILD_ROOT/%{_libdir}/lib*.so + %check %if %{with check} if make check TESTSUITEFLAGS='%{_smp_mflags}' RECHECK=yes; then :; @@ -592,6 +599,9 @@ fi %{_bindir}/ovs-testcontroller %{_bindir}/ovs-pki %{_bindir}/vtep-ctl +%if %{with enable_shared} +%{_libdir}/lib*.so.* +%endif %{_sbindir}/ovs-bugtool %{_sbindir}/ovs-vswitchd %{_sbindir}/ovsdb-server