From 24e51fc773b63bd222e61226431f3b32ac9915c2 Mon Sep 17 00:00:00 2001 From: Nabih Estefan Date: Mon, 22 Sep 2025 10:36:48 +0100 Subject: [PATCH] checkpatch: Ignore removed lines in license check MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When running the license check, if we are updating a license it is possible for the checkpatch script to test against old license lines instead of newer ones, since the removal lines appear before the addition lines in a .patch file. Fix this by skipping over lines that start with "-" in the checkpatch script. Signed-off-by: Nabih Estefan Reviewed-by: Daniel P. Berrangé Reviewed-by: Alex Bennée Message-ID: <20250916165928.10048-1-nabihestefan@google.com> Signed-off-by: Alex Bennée Message-ID: <20250922093711.2768983-4-alex.bennee@linaro.org> --- scripts/checkpatch.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 91616c974f2..40b6955c698 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1816,7 +1816,8 @@ sub process { } # Check SPDX-License-Identifier references a permitted license - if ($rawline =~ m,SPDX-License-Identifier: (.*?)(\*/)?\s*$,) { + if (($rawline =~ m,SPDX-License-Identifier: (.*?)(\*/)?\s*$,) && + $rawline !~ /^-/) { $fileinfo->{facts}->{sawspdx} = 1; &checkspdx($realfile, $1); } -- 2.47.3