From nobody Sun Feb 8 04:03:36 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E23DA1F942F for ; Wed, 8 Jan 2025 12:52:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736340738; cv=none; b=pdSpUszJM+6PtEOJvt0s+k4AJ2gs3B0LG2ZQkOVpLK7F+FVrjckaj4IHRS+90L82Rh3r7/8tg0DJ0CaYotB4gXJvgI6/sytVGL6lP7/xYiPpaJ3rx5uRqPRmAtL7/4Z0DyXzo28E38CM9x41xw9hxOwJSMkX7hZ4W+o0M5TSNWE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736340738; c=relaxed/simple; bh=7/nUm1XmUYHu95tvN749XruBQ2pH6Ix1E5N7HxXiohI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=PeQCA5rp6MSazGqRlH1LyY3Y1geuunzD6vP1Y7U11UAjcGGB94fxXy5QGhtVux8cf6cHQ5IFMdBycQRG0i8jtT+LQ4jv6UWbR2mUK+blEI+MntkTPz36dFQ6CH8lei4BuPJNkq0q1zXme5m7FaDOCEgwREr5gOmidvfeePSzHXY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=TzFZq/wg; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TzFZq/wg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1736340735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=uvfkjo/zZZsaBn97aqm4h+YhSCJm1XU141gYKpbaOx8=; b=TzFZq/wgACbtFtuGTJGLn2Cl8f7S47LOGiSS7J1ghW0haE98bqgnkDqiT9pNNhl+bjnQWn NOZOa5AV88AVlwvttJPVyjSolv3AOAzNvJpMDzq+tCsy0k02ArLgfUbz6Vy0nFB8bA2k1n 2OI/ySFZbrNHmelXIV36BF4PZf5M6U8= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-645-liQtbbTNNsKGkoXdSoSXJA-1; Wed, 08 Jan 2025 07:52:14 -0500 X-MC-Unique: liQtbbTNNsKGkoXdSoSXJA-1 X-Mimecast-MFC-AGG-ID: liQtbbTNNsKGkoXdSoSXJA Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-436328fcfeeso121000585e9.1 for ; Wed, 08 Jan 2025 04:52:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736340733; x=1736945533; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=uvfkjo/zZZsaBn97aqm4h+YhSCJm1XU141gYKpbaOx8=; b=EO5CwPkZcJ6wpNJqv7CjF6wpAdrO1Vq1YfCe61MtDA7zJqeL47d6N5RIzixMBEINKB P4XQbygo+PnEd4xa4gKIwxFA7zKBfsWIi9YH6GwbifoAwMaZj85p1JCui6/VNNgK56xS kP7nnHpnJb7GXRdyynTH2MTy8AR12yyHtevHnm6FDFqpyppaLx08rjxt9sFHDbGrs+FP 8zJWbFuaPLI7Ad6yqw5B34L2SSeUle+WV0Qe+nwyG0Eq3I1hEbWNZw5o5rlpVts/1MpL PJt6DEwtHfu1t4FfyVCI85y2TllWcJ6At3RWZ6ZoRu9fxcbgAKjOuFgQ2q50y9YePv7t ugDQ== X-Gm-Message-State: AOJu0YyDnDTn3fYWamnN/64/E97S2uJJSTqZK6Wl2Txas/lQEyatLOSx lm15cK6mnG/VMhJ+Sfzxp1EbvNy8itfMChWDlPFj36ZK7G+w2/8X9vyobcdSJ+StD+LDk42WWSD EAM/rvqe0EAuWv2F7UveKpszenw4k+vnSIQP72ln0uAd5LkCLqr49fX90O7ARIQ== X-Gm-Gg: ASbGnctzaSVBBNoyrisQ2CWq6ZOJbbzMzMRFRKuAVUpmbvl2gn6DvmpzJ6m5mCeY9uQ 1bg+OnQORyUtbktlJ6Q/qHMRO3YqyjrM8F1SVMSB6o9yaBDRfEpQ4xYDnCTUiSDF4klt/2BrCvl r+LX3bhgj841iJFOm8rxYs9C6YL+l477RShbfsMmwDdxD+dWBg55JrU6t6sqrpsrDgjIRnJmotv q+RLGC2IlpkcamQZdbBIS3KveJ1z5hIQwPG4ni78zLnexdUCDv9FHXHrqNJ56HqNKyR6CMLYL3Q dGkf5EsMoGDGNo3MURTxeoWZCaux X-Received: by 2002:a05:600c:470f:b0:434:a94f:f8a9 with SMTP id 5b1f17b1804b1-436e26f1305mr15924365e9.28.1736340733506; Wed, 08 Jan 2025 04:52:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IEDDeW0JKwRzZt9fC7mqQZVmaVNcOFtY2RPiMDGbGyW4SKUafgBQxP4P8DZOWozoi+G0380LQ== X-Received: by 2002:a05:600c:470f:b0:434:a94f:f8a9 with SMTP id 5b1f17b1804b1-436e26f1305mr15924155e9.28.1736340733165; Wed, 08 Jan 2025 04:52:13 -0800 (PST) Received: from lbulwahn-thinkpadx1carbongen9.rmtde.csb ([2a02:810d:7e40:14b0:4ce1:e394:7ac0:6905]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a1c8475d9sm52660540f8f.56.2025.01.08.04.52.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 04:52:12 -0800 (PST) From: Lukas Bulwahn X-Google-Original-From: Lukas Bulwahn To: Thomas Gleixner , Greg Kroah-Hartman , linux-spdx@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [PATCH] scripts/spdxcheck: Handle license identifiers in Jinja comments Date: Wed, 8 Jan 2025 13:52:07 +0100 Message-ID: <20250108125207.57486-1-lukas.bulwahn@redhat.com> X-Mailer: git-send-email 2.47.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lukas Bulwahn Commit 4b132aacb076 ("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: Lukas Bulwahn --- scripts/spdxcheck.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py index 8b8fb115fc81..5c33681492dd 100755 --- a/scripts/spdxcheck.py +++ b/scripts/spdxcheck.py @@ -214,6 +214,9 @@ class id_parser(object): # Remove trailing xml comment closure if line.strip().endswith('-->'): expr =3D expr.rstrip('-->').strip() + # Remove trailing Jinja2 comment closure + if line.strip().endswith('#}'): + expr =3D expr.rstrip('#}').strip() # Special case for SH magic boot code files if line.startswith('LIST \"'): expr =3D expr.rstrip('\"').strip() --=20 2.47.1