From nobody Sat Nov 23 20:28:54 2024 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=1732015771; cv=none; d=zohomail.com; s=zohoarc; b=S3oSXW0iow6v6z44zel3UJYXUyG7lTgjKzeRqPtON6bWEk4tPLDGUtbhPAydFITDWBGblPWJCH2mlAKZlWpOpHgrLsnUZRrgK3mSy94MBoao0jfEkIgzBCtbOAlzvixd7QgDPcjaillBKvLH99qaYFGM4Wj/xAW4ebBHIA4bEz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732015771; 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=bcIkVZ6uxzQG8FIq5djm31zQ2wixRzA9tY79S1pl6A8=; b=AJZPYY0IqR1IfgbZk3vIc2MVs56BAx1v0qEWvKIwUb2fLkePHlFNZOQpWuvweoJwGtTa8Q7uHi+YQVihEI2XVopSeR3VYPZ8eupaH40UMeKZf5L7VEmw8duoa44xt140vUI3g2jysFjH7ZdR+B2/ok4LKDRTnyAMKEZ2GuxOotw= 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 1732015771436129.19570865396588; Tue, 19 Nov 2024 03:29:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDMPz-0006Gw-VA; Tue, 19 Nov 2024 06:29:15 -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 1tDMPy-0006GO-QO for qemu-devel@nongnu.org; Tue, 19 Nov 2024 06:29:14 -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 1tDMPx-0002gc-6I for qemu-devel@nongnu.org; Tue, 19 Nov 2024 06:29:14 -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-670-YcN6nFiiP66vOiIvpkPbHQ-1; Tue, 19 Nov 2024 06:29:10 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 18DE01956046 for ; Tue, 19 Nov 2024 11:29:10 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.110]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0B8D219560A3; Tue, 19 Nov 2024 11:29:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732015752; 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=bcIkVZ6uxzQG8FIq5djm31zQ2wixRzA9tY79S1pl6A8=; b=Nv6QNzQYrctXHLol56Wy35DULVtXc+Iko1xmgsyKME9tMEbCGQQ2Bf8JtwRLn10ETO5XhA AU5TcWqK9hSwCpGVqlo9bFKJ7EYKbVqddkmiXXIC0yfD9O3Smp/yE3TthziDmOniXoXLKo S0OaV15r7RwjVWmjKVDPm8hF1pUtdqQ= X-MC-Unique: YcN6nFiiP66vOiIvpkPbHQ-1 X-Mimecast-MFC-AGG-ID: YcN6nFiiP66vOiIvpkPbHQ 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?= Subject: [PATCH v2 2/3] scripts: validate SPDX license choices Date: Tue, 19 Nov 2024 11:29:02 +0000 Message-ID: <20241119112903.1010350-3-berrange@redhat.com> In-Reply-To: <20241119112903.1010350-1-berrange@redhat.com> References: <20241119112903.1010350-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.12 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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: 1732015773697116600 We expect all new code to be contributed with the "GPL-2.0-or-later" license tag. Divergance 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. Signed-off-by: Daniel P. Berrang=C3=A9 --- scripts/checkpatch.pl | 68 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index d946121b8e..b507da8e2b 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1353,6 +1353,69 @@ 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 + if ($file =3D~ m,include/standard-headers, || + $file =3D~ m,linux-headers,) { + 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( + LGPL-2.0-or-later + LGPL-2.1-or-later + GPL-2.0-only + LGPL-2.0-only + LGPL-2.0-only + 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 with an " . + "existed declared license that must be followed. Please explain " . + "license choice in the commit message"); + } +} + sub process { my $filename =3D shift; =20 @@ -1641,6 +1704,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.46.0