From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 76690A0613 for ; Tue, 27 Aug 2019 11:31:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 67AB91C0D7; Tue, 27 Aug 2019 11:31:45 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E61B31C07F for ; Tue, 27 Aug 2019 11:31:44 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 64999307D84B; Tue, 27 Aug 2019 09:31:44 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 564485C1D6; Tue, 27 Aug 2019 09:31:43 +0000 (UTC) From: Kevin Traynor To: David Hunt Cc: Bruce Richardson , dpdk stable Date: Tue, 27 Aug 2019 10:30:19 +0100 Message-Id: <20190827093032.20423-42-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 27 Aug 2019 09:31:44 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/power: fix FreeBSD meson lib dependency' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/03/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/7cde4f3daf2cb052220267b056bc8aa5a6e34e04 Thanks. Kevin Traynor --- >From 7cde4f3daf2cb052220267b056bc8aa5a6e34e04 Mon Sep 17 00:00:00 2001 From: David Hunt Date: Fri, 12 Jul 2019 10:06:51 +0100 Subject: [PATCH] examples/power: fix FreeBSD meson lib dependency [ upstream commit 16015fd65a5532604139d4c597e1c16027209c4e ] Samples apps that depend on the power library should not build if the power library is not present. So now the following apps will check to see if it's built, else skip building. * l3fwd-pwer * vm_power_manager * guest_cli Fixes: e0130788576f ("examples/power: support meson/ninja build") Fixes: 89f0711f9ddf ("examples: build some samples with meson") Signed-off-by: David Hunt Acked-by: Bruce Richardson --- examples/l3fwd-power/meson.build | 6 ++++-- examples/vm_power_manager/guest_cli/meson.build | 5 +++++ examples/vm_power_manager/meson.build | 10 +++++++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/examples/l3fwd-power/meson.build b/examples/l3fwd-power/meson.build index a3c5c2f14..257f290e8 100644 --- a/examples/l3fwd-power/meson.build +++ b/examples/l3fwd-power/meson.build @@ -7,7 +7,9 @@ # DPDK instance, use 'make' -if host_machine.system() != 'linux' - build = false +if not dpdk_conf.has('RTE_LIBRTE_POWER') + build = false + subdir_done() endif + allow_experimental_apis = true deps += ['power', 'timer', 'lpm', 'hash'] diff --git a/examples/vm_power_manager/guest_cli/meson.build b/examples/vm_power_manager/guest_cli/meson.build index 9e821ceb8..38bd8d837 100644 --- a/examples/vm_power_manager/guest_cli/meson.build +++ b/examples/vm_power_manager/guest_cli/meson.build @@ -11,4 +11,9 @@ name = 'guest_cli' +if not dpdk_conf.has('RTE_LIBRTE_POWER') + build = false + subdir_done() +endif + deps += ['power'] diff --git a/examples/vm_power_manager/meson.build b/examples/vm_power_manager/meson.build index f98445bc6..20a4a05b3 100644 --- a/examples/vm_power_manager/meson.build +++ b/examples/vm_power_manager/meson.build @@ -7,4 +7,11 @@ # DPDK instance, use 'make' +if not dpdk_conf.has('RTE_LIBRTE_POWER') + build = false + subdir_done() +endif + +deps += ['power'] + if dpdk_conf.has('RTE_LIBRTE_BNXT_PMD') deps += ['pmd_bnxt'] @@ -19,7 +26,4 @@ if dpdk_conf.has('RTE_LIBRTE_IXGBE_PMD') endif -deps += ['power'] - - sources = files( 'channel_manager.c', 'channel_monitor.c', 'main.c', 'parse.c', 'power_manager.c', 'vm_power_cli.c' -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:13.203620627 +0100 +++ 0042-examples-power-fix-FreeBSD-meson-lib-dependency.patch 2019-08-27 09:40:10.938143951 +0100 @@ -1 +1 @@ -From 16015fd65a5532604139d4c597e1c16027209c4e Mon Sep 17 00:00:00 2001 +From 7cde4f3daf2cb052220267b056bc8aa5a6e34e04 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 16015fd65a5532604139d4c597e1c16027209c4e ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index b38a7a0d7..d5a3d4bb2 100644 +index a3c5c2f14..257f290e8 100644 @@ -32 +33 @@ --if not is_linux +-if host_machine.system() != 'linux' @@ -40 +41 @@ - deps += ['power', 'timer', 'lpm', 'hash', 'metrics'] + deps += ['power', 'timer', 'lpm', 'hash']