Commit 154916f4 authored by Lukas Bulwahn's avatar Lukas Bulwahn Committed by Greg Kroah-Hartman
Browse files

scripts/spdxcheck: Handle license identifiers in Jinja comments 



Commit 4b132aac ("tools: Add xdrgen") adds a tool, which uses Jinja
template files, i.e., files with the j2 file extension, for its lightweight
code generation.

These template files for this tool have proper headers with the SPDX
License information, which are included as Jinja comments by enclosing the
text with '{#' and '#}'. Sofar, the spdxcheck script does not support to
properly parse this license information in Jinja comments and it reports
back with 'Invalid token: #}'.

Parse Jinja comments properly by stripping the known Jinja comment suffix.

Signed-off-by: default avatarLukas Bulwahn <lukas.bulwahn@redhat.com>
Link: https://lore.kernel.org/r/20250108125207.57486-1-lukas.bulwahn@redhat.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 634d34e8

scripts/spdxcheck.py

+3 −0
Original line number Diff line number Diff line
@@ -214,6 +214,9 @@ class id_parser(object): 
                # Remove trailing xml comment closure

                if line.strip().endswith('-->'):

                    expr = expr.rstrip('-->').strip()

                # Remove trailing Jinja2 comment closure

                if line.strip().endswith('#}'):

                    expr = expr.rstrip('#}').strip()

                # Special case for SH magic boot code files

                if line.startswith('LIST \"'):

                    expr = expr.rstrip('\"').strip()