[PATCH] devtools: fix SPDX tag check

[PATCH] devtools: fix SPDX tag check

[Thomas Monjalon]

If a file has no SPDX tag and is not filtered out by no_license_list,
there will be an error when using its path containing a slash
in the sed command delimited with slashes.

It is fixed by using the pipe character as sed command delimiter.

Fixes: b99a3b8aa989 ("license: standardize SPDX tag")
Cc: stable@dpdk.org

Reported-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 devtools/check-spdx-tag.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/check-spdx-tag.sh b/devtools/check-spdx-tag.sh
index 2390941c74..f0fcddf0d3 100755
--- a/devtools/check-spdx-tag.sh
+++ b/devtools/check-spdx-tag.sh
@@ -41,7 +41,7 @@ check_spdx() {
     files_without_spdx=$(cat $tmpfile)
     git grep -LE '(/\*|#|;|\.\.) *SPDX-License-Identifier: [A-Z(]' -- $no_license_list > $tmpfile
     for file in $files_without_spdx ; do
-	sed -i "/^$file$/d" $tmpfile
+	sed -i "\|^$file$|d" $tmpfile
     done
 
     warnings=$(($warnings + $(wc -l < $tmpfile)))
-- 
2.53.0

Re: [PATCH] devtools: fix SPDX tag check

[Stephen Hemminger]

On Wed, 29 Apr 2026 15:09:35 +0200
Thomas Monjalon <thomas@monjalon.net> wrote:

> If a file has no SPDX tag and is not filtered out by no_license_list,
> there will be an error when using its path containing a slash
> in the sed command delimited with slashes.
> 
> It is fixed by using the pipe character as sed command delimiter.
> 
> Fixes: b99a3b8aa989 ("license: standardize SPDX tag")
> Cc: stable@dpdk.org
> 
> Reported-by: David Marchand <david.marchand@redhat.com>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---

Acked-by: Stephen Hemminger <stephen@networkplumber.org>

Re: [PATCH] devtools: fix SPDX tag check

[David Marchand]

On Wed, 29 Apr 2026 at 15:10, Thomas Monjalon <thomas@monjalon.net> wrote:
>
> If a file has no SPDX tag and is not filtered out by no_license_list,
> there will be an error when using its path containing a slash
> in the sed command delimited with slashes.
>
> It is fixed by using the pipe character as sed command delimiter.
>
> Fixes: b99a3b8aa989 ("license: standardize SPDX tag")
> Cc: stable@dpdk.org
>
> Reported-by: David Marchand <david.marchand@redhat.com>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>

Acked-by: David Marchand <david.marchand@redhat.com>


-- 
David Marchand

RE: [PATCH] devtools: fix SPDX tag check

[Marat Khalili]

Patch definitely improves the situation, but after a quick prompt Gemini suggested `| grep -vF "$files_without_spdx"` for safe filtering (man page confirms that patterns can be separated with newlines).

Re: [PATCH] devtools: fix SPDX tag check

[Thomas Monjalon]

29/04/2026 18:17, Marat Khalili:
> Patch definitely improves the situation, but after a quick prompt Gemini suggested `| grep -vF "$files_without_spdx"` for safe filtering (man page confirms that patterns can be separated with newlines).

Yes grep looks simpler than sed for this filter.
I'll send a v2 with your suggestion.
Thank you

[PATCH v2] devtools: fix SPDX tag check

[Thomas Monjalon]

If a file has no SPDX tag and is not filtered out by no_license_list,
there will be an error when using its path containing a slash
in the sed command delimited with slashes.

It could be fixed by using another character as sed command delimiter.
The chosen fix is to use grep instead of sed.

Fixes: b99a3b8aa989 ("license: standardize SPDX tag")
Cc: stable@dpdk.org

Reported-by: David Marchand <david.marchand@redhat.com>
Suggested-by: Marat Khalili <marat.khalili@huawei.com>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
v1: replace / with |
v2: use grep instead of sed (Marat's suggestion)
---
 devtools/check-spdx-tag.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/devtools/check-spdx-tag.sh b/devtools/check-spdx-tag.sh
index 2390941c74..41fc1fe01d 100755
--- a/devtools/check-spdx-tag.sh
+++ b/devtools/check-spdx-tag.sh
@@ -39,10 +39,8 @@ check_spdx() {
     fi
 
     files_without_spdx=$(cat $tmpfile)
-    git grep -LE '(/\*|#|;|\.\.) *SPDX-License-Identifier: [A-Z(]' -- $no_license_list > $tmpfile
-    for file in $files_without_spdx ; do
-	sed -i "/^$file$/d" $tmpfile
-    done
+    git grep -LE '(/\*|#|;|\.\.) *SPDX-License-Identifier: [A-Z(]' -- $no_license_list |
+    grep -vF "$files_without_spdx" > $tmpfile
 
     warnings=$(($warnings + $(wc -l < $tmpfile)))
     $quiet || cat $tmpfile
-- 
2.53.0

RE: [PATCH v2] devtools: fix SPDX tag check

[Marat Khalili]

> diff --git a/devtools/check-spdx-tag.sh b/devtools/check-spdx-tag.sh
> index 2390941c74..41fc1fe01d 100755
> --- a/devtools/check-spdx-tag.sh
> +++ b/devtools/check-spdx-tag.sh
> @@ -39,10 +39,8 @@ check_spdx() {
>      fi
> 
>      files_without_spdx=$(cat $tmpfile)
> -    git grep -LE '(/\*|#|;|\.\.) *SPDX-License-Identifier: [A-Z(]' -- $no_license_list > $tmpfile
> -    for file in $files_without_spdx ; do
> -	sed -i "/^$file$/d" $tmpfile
> -    done
> +    git grep -LE '(/\*|#|;|\.\.) *SPDX-License-Identifier: [A-Z(]' -- $no_license_list |
> +    grep -vF "$files_without_spdx" > $tmpfile
> 
>      warnings=$(($warnings + $(wc -l < $tmpfile)))
>      $quiet || cat $tmpfile
> --
> 2.53.0

Sorry for forgetting to mention it right away, some kind of sentinel or if
condition is needed if $files_without_spdx can be empty, don't know how
realistic it is in practice and whether other parts are ready to handle this
case. E.g. `files_without_spdx=$(echo //sentinel; cat $tmpfile)`. I hope it
won't make the whole thing too complicated and not worth it.

Otherwise,

Acked-by: Marat Khalili <marat.khalili@huawei.com>

Re: [PATCH v2] devtools: fix SPDX tag check

[Thomas Monjalon]

30/04/2026 15:30, Marat Khalili:
> > diff --git a/devtools/check-spdx-tag.sh b/devtools/check-spdx-tag.sh
> > index 2390941c74..41fc1fe01d 100755
> > --- a/devtools/check-spdx-tag.sh
> > +++ b/devtools/check-spdx-tag.sh
> > @@ -39,10 +39,8 @@ check_spdx() {
> >      fi
> > 
> >      files_without_spdx=$(cat $tmpfile)
> > -    git grep -LE '(/\*|#|;|\.\.) *SPDX-License-Identifier: [A-Z(]' -- $no_license_list > $tmpfile
> > -    for file in $files_without_spdx ; do
> > -	sed -i "/^$file$/d" $tmpfile
> > -    done
> > +    git grep -LE '(/\*|#|;|\.\.) *SPDX-License-Identifier: [A-Z(]' -- $no_license_list |
> > +    grep -vF "$files_without_spdx" > $tmpfile
> > 
> >      warnings=$(($warnings + $(wc -l < $tmpfile)))
> >      $quiet || cat $tmpfile
> > --
> > 2.53.0
> 
> Sorry for forgetting to mention it right away, some kind of sentinel or if
> condition is needed if $files_without_spdx can be empty, don't know how
> realistic it is in practice and whether other parts are ready to handle this
> case. E.g. `files_without_spdx=$(echo //sentinel; cat $tmpfile)`. I hope it
> won't make the whole thing too complicated and not worth it.

Sorry I don't understand the need for a sentinel.
The script is working fine with an empty files_without_spdx.

RE: [PATCH v2] devtools: fix SPDX tag check

[Marat Khalili]

> Sorry I don't understand the need for a sentinel.
> The script is working fine with an empty files_without_spdx.

It may filter out everything instead of nothing in that case.