From nobody Fri Apr 4 03:28:40 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1740757561; cv=none; d=zohomail.com; s=zohoarc; b=JvW8/9TaAkTZQJ7CyTIWxuZWZE6NOzWheRJ3WIMyPneEZxQSftnVEL7Q5hFz1Ig75SxygEVMKVsIN6T2b1dGWY2pJ5Og6fz+uzDD6jLDV2X8KmLtU+gaWIPEdBDtdZU3CfhkMcaSjCuIeSp+rmSrQbRvfEuIseZUhbpHY4yGcUw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1740757561; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5qmjxlFJYRGpu/O0tFmociUrh9h9ST5a8nYzad46yZI=; b=BXEn2OAxX12tz5rQZqIdplurzB/0sb4E6XsXLGcxbN78giXFW+BI6fmvG9wJTAo+kyAnbZBqixPRMoshfRV0upyRqsEELWVg07AEczNPSwFoX9XXHys2AouqkOf8mgLIPN6htBf8tjC1LZSOYlTvfYsTFt6izxoAV6GMbTuqq+E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1740757561540506.5894257001248; Fri, 28 Feb 2025 07:46:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1to2YH-0006H6-OX; Fri, 28 Feb 2025 10:45:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1to2Xw-0005zV-4l for qemu-devel@nongnu.org; Fri, 28 Feb 2025 10:45:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1to2Xu-00059E-I7 for qemu-devel@nongnu.org; Fri, 28 Feb 2025 10:45:03 -0500 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-116-8bBuGNSVNAKJ5vGNTCF_PA-1; Fri, 28 Feb 2025 10:45:00 -0500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 459F51954B19; Fri, 28 Feb 2025 15:44:58 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.42.28.45]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AFCB119560AE; Fri, 28 Feb 2025 15:44:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1740757501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5qmjxlFJYRGpu/O0tFmociUrh9h9ST5a8nYzad46yZI=; b=SuHSmT89w+21VLzKGdznwvWszE/Okm8/Xui09iELppuBWjM8guXCvkU16Zl3VLbXqGraOc jc1aQIJjW2TqIFTutLhZOKyiVekDAArSsOOsW0ply7D3b4GoqHJFt2/faSijszGJ2pm+QY pOuPtWrK4euP02U4I6SyEt5/W+flH4I= X-MC-Unique: 8bBuGNSVNAKJ5vGNTCF_PA-1 X-Mimecast-MFC-AGG-ID: 8bBuGNSVNAKJ5vGNTCF_PA_1740757499 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell Subject: [PULL 2/3] scripts: validate SPDX license choices Date: Fri, 28 Feb 2025 15:44:49 +0000 Message-ID: <20250228154450.3185564-3-berrange@redhat.com> In-Reply-To: <20250228154450.3185564-1-berrange@redhat.com> References: <20250228154450.3185564-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.444, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1740757564398019100 We expect all new code to be contributed with the "GPL-2.0-or-later" license tag. Divergence is permitted if the new file is derived from pre-existing code under a different license, whether from elsewhere in QEMU codebase, or outside. Issue a warning if the declared license is not "GPL-2.0-or-later", and an error if the license is not one of the handful of the expected licenses to prevent unintended proliferation. The warning asks users to explain their unusual choice of license in the commit message. Reviewed-by: Peter Maydell Signed-off-by: Daniel P. Berrang=C3=A9 --- scripts/checkpatch.pl | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 01f25aa88d..8995d2c391 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1353,6 +1353,70 @@ sub checkfilename { } } =20 +sub checkspdx { + my ($file, $expr) =3D @_; + + # Imported Linux headers probably have SPDX tags, but if they + # don't we're not requiring contributors to fix this, as these + # files are not expected to be modified locally in QEMU. + # Also don't accidentally detect own checking code. + if ($file =3D~ m,include/standard-headers, || + $file =3D~ m,linux-headers, || + $file =3D~ m,checkpatch.pl,) { + return; + } + + my $origexpr =3D $expr; + + # Flatten sub-expressions + $expr =3D~ s/\(|\)/ /g; + $expr =3D~ s/OR|AND/ /g; + + # Merge WITH exceptions to the license + $expr =3D~ s/\s+WITH\s+/-WITH-/g; + + # Cull more leading/trailing whitespace + $expr =3D~ s/^\s*//g; + $expr =3D~ s/\s*$//g; + + my @bits =3D split / +/, $expr; + + my $prefer =3D "GPL-2.0-or-later"; + my @valid =3D qw( + GPL-2.0-only + LGPL-2.1-only + LGPL-2.1-or-later + BSD-2-Clause + BSD-3-Clause + MIT + ); + + my $nonpreferred =3D 0; + my @unknown =3D (); + foreach my $bit (@bits) { + if ($bit eq $prefer) { + next; + } + if (grep /^$bit$/, @valid) { + $nonpreferred =3D 1; + } else { + push @unknown, $bit; + } + } + if (@unknown) { + ERROR("Saw unacceptable licenses '" . join(',', @unknown) . + "', valid choices for QEMU are:\n" . join("\n", $prefer, @valid)); + } + + if ($nonpreferred) { + WARN("Saw acceptable license '$origexpr' but note '$prefer' is " . + "preferred for new files unless the code is derived from a " . + "source file with an existing declared license that must be " . + "retained. Please explain the license choice in the commit " . + "message."); + } +} + sub process { my $filename =3D shift; =20 @@ -1645,6 +1709,11 @@ sub process { } } =20 +# Check SPDX-License-Identifier references a permitted license + if ($rawline =3D~ m,SPDX-License-Identifier: (.*?)(\*/)?\s*$,) { + &checkspdx($realfile, $1); + } + # Check for wrappage within a valid hunk of the file if ($realcnt !=3D 0 && $line !~ m{^(?:\+|-| |\\ No newline|$)}) { ERROR("patch seems to be corrupt (line wrapped?)\n" . --=20 2.48.1