From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 738F9A046B for ; Mon, 24 Jun 2019 17:28:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 68A721BEAB; Mon, 24 Jun 2019 17:28:11 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 2CAB51BEF1 for ; Mon, 24 Jun 2019 17:28:10 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 14A598E22B; Mon, 24 Jun 2019 15:28:03 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BDBD19936; Mon, 24 Jun 2019 15:27:57 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Tiwei Bie , Xiaolong Ye , dpdk stable Date: Mon, 24 Jun 2019 16:25:18 +0100 Message-Id: <20190624152525.19349-54-ktraynor@redhat.com> In-Reply-To: <20190624152525.19349-1-ktraynor@redhat.com> References: <20190624152525.19349-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 24 Jun 2019 15:28:08 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/vdpa: remove trace of legacy linuxapp' 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 06/27/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/6fc0f6ec7b6bb2738964e81c6420328c998d039d Thanks. Kevin Traynor --- >From 6fc0f6ec7b6bb2738964e81c6420328c998d039d Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 17 Jun 2019 09:54:42 +0200 Subject: [PATCH] examples/vdpa: remove trace of legacy linuxapp [ upstream commit 0e34bced7829dc9cb74e0af81f3f12058380b352 ] This check on Linux environment has been added at a time when we already had switched to using the boolean RTE_EXEC_ENV_LINUXAPP. It was then missed when converting to RTE_EXEC_ENV_LINUX. Fixes: edbed86d1cc3 ("examples/vdpa: introduce a new sample for vDPA") Fixes: 742bde12f3bd ("build/linux: rename macro from LINUXAPP to LINUX") Signed-off-by: David Marchand Reviewed-by: Tiwei Bie Reviewed-by: Xiaolong Ye --- examples/vdpa/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/vdpa/Makefile b/examples/vdpa/Makefile index 42672a2bc..d3321ef94 100644 --- a/examples/vdpa/Makefile +++ b/examples/vdpa/Makefile @@ -11,5 +11,5 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV),"linuxapp") +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-24 16:18:57.860032820 +0100 +++ 0054-examples-vdpa-remove-trace-of-legacy-linuxapp.patch 2019-06-24 16:18:55.125429005 +0100 @@ -1 +1 @@ -From 0e34bced7829dc9cb74e0af81f3f12058380b352 Mon Sep 17 00:00:00 2001 +From 6fc0f6ec7b6bb2738964e81c6420328c998d039d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0e34bced7829dc9cb74e0af81f3f12058380b352 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 9d16d8eb5..ab2bbdf76 100644 +index 42672a2bc..d3321ef94 100644 @@ -25 +26 @@ -@@ -11,5 +11,5 @@ RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.conf +@@ -11,5 +11,5 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc @@ -29,2 +30,2 @@ -+ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) - $(info This application can only operate in a linux environment, \ ++ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) + $(info This application can only operate in a linuxapp environment, \