[dpdk-stable] patch 'buildtools: fix all drivers disabled on Windows' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.2

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

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/3d8025a12158b9a34bfea44a4c6c19b686140cb3

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 3d8025a12158b9a34bfea44a4c6c19b686140cb3 Mon Sep 17 00:00:00 2001
From: Dmitry Kozlyuk <dmitry.kozliuk at gmail.com>
Date: Fri, 16 Apr 2021 23:48:52 +0300
Subject: [PATCH] buildtools: fix all drivers disabled on Windows
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit 74299cc7591192cbc72e8f411dff0c7f3cfdf309 ]

buildtools/list-dir-globs.py printed paths with OS directory separator,
which is "/" on Unices and "\" on Windows, while Meson code always
expected "/". This resulted in all drivers being disabled on Windows.

Replace "\" with "/" in script output. Forward slash is a valid,
although non-default, separator on Windows, so no paths can be broken
by this substitution.

Fixes: ab9407c3addd ("build: allow using wildcards to disable drivers")

Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk at gmail.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 buildtools/list-dir-globs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildtools/list-dir-globs.py b/buildtools/list-dir-globs.py
index 80b5e801f2..f5f7d73485 100755
--- a/buildtools/list-dir-globs.py
+++ b/buildtools/list-dir-globs.py
@@ -16,4 +16,4 @@ root = os.path.join(os.getenv('MESON_SOURCE_ROOT', '.'),
 for path in sys.argv[1].split(','):
     for p in iglob(os.path.join(root, path)):
         if os.path.isdir(p):
-            print(os.path.relpath(p))
+            print(os.path.relpath(p).replace('\\', '/'))
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-05-10 23:59:31.140975900 +0800
+++ 0177-buildtools-fix-all-drivers-disabled-on-Windows.patch	2021-05-10 23:59:26.610000000 +0800
@@ -1 +1 @@
-From 74299cc7591192cbc72e8f411dff0c7f3cfdf309 Mon Sep 17 00:00:00 2001
+From 3d8025a12158b9a34bfea44a4c6c19b686140cb3 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit 74299cc7591192cbc72e8f411dff0c7f3cfdf309 ]
@@ -15 +17,0 @@
-Cc: stable at dpdk.org
@@ -24 +26 @@
-index 911e267335..d824360d39 100755
+index 80b5e801f2..f5f7d73485 100755
@@ -27,6 +29,6 @@
-@@ -17,4 +17,4 @@ for path in sys.argv[1].split(','):
-     if path:
-         for p in iglob(os.path.join(root, path)):
-             if os.path.isdir(p):
--                print(os.path.relpath(p))
-+                print(os.path.relpath(p).replace('\\', '/'))
+@@ -16,4 +16,4 @@ root = os.path.join(os.getenv('MESON_SOURCE_ROOT', '.'),
+ for path in sys.argv[1].split(','):
+     for p in iglob(os.path.join(root, path)):
+         if os.path.isdir(p):
+-            print(os.path.relpath(p))
++            print(os.path.relpath(p).replace('\\', '/'))