[dpdk-stable] patch 'examples/ntb: fix clean target' has been queued to stable release 19.11.6

luca.boccassi at gmail.com luca.boccassi at gmail.com
Tue Nov 17 12:14:13 CET 2020


Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/19/20. 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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/9ea2f2c7593fc25a160a81ec7a850424d2009b9c

Thanks.

Luca Boccassi

---
>From 9ea2f2c7593fc25a160a81ec7a850424d2009b9c Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Sat, 14 Nov 2020 10:05:29 +0100
Subject: [PATCH] examples/ntb: fix clean target

[ upstream commit 9bb2997cb7a9e9fa286c13fabe392e544b95158b ]

When introducing this example, the cleanup from commit 7e9562a107f1
("examples: fix make clean when using pkg-config") was missed.

Fixes: c5eebf85badc ("examples/ntb: add example for NTB")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Xiaoyun Li <xiaoyun.li at intel.com>
---
 examples/ntb/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/ntb/Makefile b/examples/ntb/Makefile
index e36a4f9bfa..f41ccfac27 100644
--- a/examples/ntb/Makefile
+++ b/examples/ntb/Makefile
@@ -40,7 +40,7 @@ build:
 .PHONY: clean
 clean:
 	rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
-	rmdir --ignore-fail-on-non-empty build
+	test -d build && rmdir -p build || true
 
 else # Build using legacy build system
 
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-17 11:13:14.615008865 +0000
+++ 0039-examples-ntb-fix-clean-target.patch	2020-11-17 11:13:12.953117254 +0000
@@ -1 +1 @@
-From 9bb2997cb7a9e9fa286c13fabe392e544b95158b Mon Sep 17 00:00:00 2001
+From 9ea2f2c7593fc25a160a81ec7a850424d2009b9c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9bb2997cb7a9e9fa286c13fabe392e544b95158b ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 4675570fd2..d35dabc471 100644
+index e36a4f9bfa..f41ccfac27 100644
@@ -23 +24 @@
-@@ -42,4 +42,4 @@ build:
+@@ -40,7 +40,7 @@ build:
@@ -28,0 +30,3 @@
+ 
+ else # Build using legacy build system
+ 


More information about the stable mailing list