[dpdk-dev] [PATCH] buildtools: fix all drivers disabled on Windows

[dpdk-dev] [PATCH] buildtools: fix all drivers disabled on Windows

[Dmitry Kozlyuk]

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 it 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: 2e33309ebe03 ("config: enable/disable drivers in Arm builds")
Cc: Juraj Linkeš <juraj.linkes@pantheon.tech>

Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.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 911e267335..d824360d39 100755
--- a/buildtools/list-dir-globs.py
+++ b/buildtools/list-dir-globs.py
@@ -17,4 +17,4 @@
     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('\\', '/'))
-- 
2.29.3

Re: [dpdk-dev] [PATCH] buildtools: fix all drivers disabled on Windows

[Juraj Linkeš]

> -----Original Message-----
> From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> Sent: Thursday, April 15, 2021 11:36 PM
> To: dev@dpdk.org
> Cc: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>; Juraj Linkeš
> <juraj.linkes@pantheon.tech>; Bruce Richardson <bruce.richardson@intel.com>
> Subject: [PATCH] buildtools: fix all drivers disabled on Windows
> 
> 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 it 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: 2e33309ebe03 ("config: enable/disable drivers in Arm builds")
> Cc: Juraj Linkeš <juraj.linkes@pantheon.tech>

This patch was only the latest that changed the code if the file, but not the logic related to path separators. I think you patch fixes the original commit ab9407c3addd.

> 
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.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
> 911e267335..d824360d39 100755
> --- a/buildtools/list-dir-globs.py
> +++ b/buildtools/list-dir-globs.py
> @@ -17,4 +17,4 @@
>      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('\\', '/'))
> --
> 2.29.3
> 

Re: [dpdk-dev] [PATCH] buildtools: fix all drivers disabled on Windows

[Bruce Richardson]

On Fri, Apr 16, 2021 at 06:44:34AM +0000, Juraj Linkeš wrote:
> 
> 
> > -----Original Message-----
> > From: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> > Sent: Thursday, April 15, 2021 11:36 PM
> > To: dev@dpdk.org
> > Cc: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>; Juraj Linkeš
> > <juraj.linkes@pantheon.tech>; Bruce Richardson <bruce.richardson@intel.com>
> > Subject: [PATCH] buildtools: fix all drivers disabled on Windows
> > 
> > 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 it 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: 2e33309ebe03 ("config: enable/disable drivers in Arm builds")
> > Cc: Juraj Linkeš <juraj.linkes@pantheon.tech>
> 
> This patch was only the latest that changed the code if the file, but not the logic related to path separators. I think you patch fixes the original commit ab9407c3addd.
> 
> > 
> > Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>

+1 for the correction for the fixes line.

Acked-by: Bruce Richardson <bruce.richardson@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
> > 911e267335..d824360d39 100755
> > --- a/buildtools/list-dir-globs.py
> > +++ b/buildtools/list-dir-globs.py
> > @@ -17,4 +17,4 @@
> >      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('\\', '/'))
> > --
> > 2.29.3
> > 
> 

[dpdk-dev] [PATCH v2] buildtools: fix all drivers disabled on Windows

[Dmitry Kozlyuk]

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")
Cc: stable@dpdk.org

Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
v2: Change fixes line, correct a typo (Juraj, Bruce).

Not sure if it's worth backporting: it wasn't an issue in 20.11
and the patch won't apply as-is.

 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 911e267335..d824360d39 100755
--- a/buildtools/list-dir-globs.py
+++ b/buildtools/list-dir-globs.py
@@ -17,4 +17,4 @@
     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('\\', '/'))
-- 
2.29.3

Re: [dpdk-dev] [PATCH v2] buildtools: fix all drivers disabled on Windows

[Thomas Monjalon]

16/04/2021 22:48, Dmitry Kozlyuk:
> 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")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> v2: Change fixes line, correct a typo (Juraj, Bruce).
> 
> Not sure if it's worth backporting: it wasn't an issue in 20.11
> and the patch won't apply as-is.

The commit you mention was introduced in 21.02.
No matter which release it is, it is good to suggest backporting
for those who need to maintain an old release even if not upstream.

Applied, thanks