[{"id":17326,"web_url":"https://patchwork.libcamera.org/comment/17326/","msgid":"<20210527093019.GI1274010@pyrite.rasen.tech>","date":"2021-05-27T09:30:19","subject":"Re: [libcamera-devel] [PATCH] utils: ipc: extract-docs: Extract the\n\tSPDX header if it exists","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi me,\n\nOn Thu, May 27, 2021 at 06:27:43PM +0900, Paul Elder wrote:\n> Take the SPDX header from the mojom file, if it exists. Otherwise\n> default to LGPL-2.1+ as before.\n> \n> Signed-off-by: Paul Elder \n> ---\n> utils/ipc/extract-docs.py | 10 ++++++++--\n> 1 file changed, 8 insertions(+), 2 deletions(-)\n> \n> diff --git a/utils/ipc/extract-docs.py b/utils/ipc/extract-docs.py\n> index 56566ce0..b617b6fa 100755\n> --- a/utils/ipc/extract-docs.py\n> +++ b/utils/ipc/extract-docs.py\n> @@ -12,6 +12,7 @@ import sys\n> \n> regex_block_start = re.compile('^\\/\\*\\*$')\n> regex_block_end = re.compile('^ \\*\\/$')\n> +regex_spdx = re.compile('^\\/\\* SPDX-License-Identifier: .* \\*\\/$')\n> \n> \n> def main(argv):\n> @@ -28,8 +29,13 @@ def main(argv):\n> \n> lines = open(args.input, 'r').readlines()\n> pipeline = args.input.split('/')[-1].replace('.mojom', '')\n> - data = f'''\\\n> -/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +\n> + if regex_spdx.match(lines[0]):\n> + data = lines[0]\n> + else:\n> + data = '/* SPDX-License-Identifier: LGPL-2.1-or-later */'\n\nThis needs \\n at the end of the string.\n\n\nPaul\n> +\n> + data += f'''\\\n> /*\n> * Copyright (C) 2021, Google Inc.\n> *\n> -- \n> 2.27.0\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 5F4C5BDB80\n\tfor ;\n\tThu, 27 May 2021 09:30:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 620A268927;\n\tThu, 27 May 2021 11:30:28 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3786D68923\n\tfor ;\n\tThu, 27 May 2021 11:30:27 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id CE7B6124E\n\tfor ;\n\tThu, 27 May 2021 11:30:25 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"DMayvOJD\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1622107827;\n\tbh=Y32N4x55fA97xGXB9yJ/zxy8xiVH5ZVCUIFd88hFNL0=;\n\th=Date:From:To:Subject:References:In-Reply-To:From;\n\tb=DMayvOJDYzMEgweIQgN2OT9dEZw5SaiCqIDJkMwbCIUDpKPrwNASoAA410+bmX1lW\n\teidi1TEtwt+K25SDY2Y6t4/RIgVM+cljFwxkk9LGr06X0JyMKR4DRW5MRbTl+90Gx/\n\tdgSdghZOZ7WVHK3Xk5hWTZ9PlNZ2bORI69vKX/lk=","Date":"Thu, 27 May 2021 18:30:19 +0900","From":"paul.elder@ideasonboard.com","To":"libcamera-devel@lists.libcamera.org","Message-ID":"<20210527093019.GI1274010@pyrite.rasen.tech>","References":"<20210527092743.1347857-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20210527092743.1347857-1-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] utils: ipc: extract-docs: Extract the\n\tSPDX header if it exists","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17327,"web_url":"https://patchwork.libcamera.org/comment/17327/","msgid":"","date":"2021-05-27T09:36:25","subject":"Re: [libcamera-devel] [PATCH] utils: ipc: extract-docs: Extract the\n\tSPDX header if it exists","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Thu, May 27, 2021 at 06:27:43PM +0900, Paul Elder wrote:\n> Take the SPDX header from the mojom file, if it exists. Otherwise\n> default to LGPL-2.1+ as before.\n\nDo we need a default ? All the mojom files should have an SPDX header.\n\n> Signed-off-by: Paul Elder \n> ---\n> utils/ipc/extract-docs.py | 10 ++++++++--\n> 1 file changed, 8 insertions(+), 2 deletions(-)\n> \n> diff --git a/utils/ipc/extract-docs.py b/utils/ipc/extract-docs.py\n> index 56566ce0..b617b6fa 100755\n> --- a/utils/ipc/extract-docs.py\n> +++ b/utils/ipc/extract-docs.py\n> @@ -12,6 +12,7 @@ import sys\n> \n> regex_block_start = re.compile('^\\/\\*\\*$')\n> regex_block_end = re.compile('^ \\*\\/$')\n> +regex_spdx = re.compile('^\\/\\* SPDX-License-Identifier: .* \\*\\/$')\n> \n> \n> def main(argv):\n> @@ -28,8 +29,13 @@ def main(argv):\n> \n> lines = open(args.input, 'r').readlines()\n> pipeline = args.input.split('/')[-1].replace('.mojom', '')\n> - data = f'''\\\n> -/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> +\n> + if regex_spdx.match(lines[0]):\n> + data = lines[0]\n> + else:\n> + data = '/* SPDX-License-Identifier: LGPL-2.1-or-later */'\n> +\n> + data += f'''\\\n> /*\n> * Copyright (C) 2021, Google Inc.\n> *","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 59A3EC3203\n\tfor ;\n\tThu, 27 May 2021 09:36:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9CF0968927;\n\tThu, 27 May 2021 11:36:33 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 652CD68923\n\tfor ;\n\tThu, 27 May 2021 11:36:32 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7D98CB2C;\n\tThu, 27 May 2021 11:36:31 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"FnPKDI5v\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1622108191;\n\tbh=M2QR7E1Y4IZCa7sBCFjUJBGdtDhIRJ43ZbfZg8voVW4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=FnPKDI5viBSigw0xJuY3zaLtnFZUicYNrR75dYLP2oOQ3qwvkGiE4HORrnVIb2G8x\n\tLt+ZHihXk/Wo6Wh/K0mDjKCJh/3n/fOny7Kyt9m/FzK3NwcBrlbr2dd3S/hTbKS8eS\n\tCxET9hLOmtsT2dnLR7DMo9yt7tD3bzbxCMsVrX+M=","Date":"Thu, 27 May 2021 12:36:25 +0300","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"","References":"<20210527092743.1347857-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210527092743.1347857-1-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] utils: ipc: extract-docs: Extract the\n\tSPDX header if it exists","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17328,"web_url":"https://patchwork.libcamera.org/comment/17328/","msgid":"<20210527095948.GJ1274010@pyrite.rasen.tech>","date":"2021-05-27T09:59:48","subject":"Re: [libcamera-devel] [PATCH] utils: ipc: extract-docs: Extract the\n\tSPDX header if it exists","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi Laurent,\n\nOn Thu, May 27, 2021 at 12:36:25PM +0300, Laurent Pinchart wrote:\n> Hi Paul,\n> \n> Thank you for the patch.\n> \n> On Thu, May 27, 2021 at 06:27:43PM +0900, Paul Elder wrote:\n> > Take the SPDX header from the mojom file, if it exists. Otherwise\n> > default to LGPL-2.1+ as before.\n> \n> Do we need a default ? All the mojom files should have an SPDX header.\n\nMaybe we don't.\n\nJust error out then? Or output without the SPDX header?\n\n\nPaul\n\n> \n> > Signed-off-by: Paul Elder \n> > ---\n> > utils/ipc/extract-docs.py | 10 ++++++++--\n> > 1 file changed, 8 insertions(+), 2 deletions(-)\n> > \n> > diff --git a/utils/ipc/extract-docs.py b/utils/ipc/extract-docs.py\n> > index 56566ce0..b617b6fa 100755\n> > --- a/utils/ipc/extract-docs.py\n> > +++ b/utils/ipc/extract-docs.py\n> > @@ -12,6 +12,7 @@ import sys\n> > \n> > regex_block_start = re.compile('^\\/\\*\\*$')\n> > regex_block_end = re.compile('^ \\*\\/$')\n> > +regex_spdx = re.compile('^\\/\\* SPDX-License-Identifier: .* \\*\\/$')\n> > \n> > \n> > def main(argv):\n> > @@ -28,8 +29,13 @@ def main(argv):\n> > \n> > lines = open(args.input, 'r').readlines()\n> > pipeline = args.input.split('/')[-1].replace('.mojom', '')\n> > - data = f'''\\\n> > -/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> > +\n> > + if regex_spdx.match(lines[0]):\n> > + data = lines[0]\n> > + else:\n> > + data = '/* SPDX-License-Identifier: LGPL-2.1-or-later */'\n> > +\n> > + data += f'''\\\n> > /*\n> > * Copyright (C) 2021, Google Inc.\n> > *","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id AC4D5BDB80\n\tfor ;\n\tThu, 27 May 2021 09:59:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E01B468926;\n\tThu, 27 May 2021 11:59:56 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 1A9B76891B\n\tfor ;\n\tThu, 27 May 2021 11:59:55 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A9643B2C;\n\tThu, 27 May 2021 11:59:53 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"HLzfLVjd\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1622109594;\n\tbh=NpAC3EMQ2/olW0sVhqN2GBVus1JXdjBezu/qq2Zx6cA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=HLzfLVjdoxoogDXv2twSKb6QDBKi83Ky28L72JtTYp4vrk0jwEGj+LYudbkkHZtwu\n\tAjXXE+10oH84UP8JMpLCsv4avJy3s5jsPOXBWFHfKRvMgtiUnP5NGFNDDPaqOPRXC8\n\t+Hq6xD3Sc8TPZb7eYk6Xtj1W0/c0R6+SAjPMTrEo=","Date":"Thu, 27 May 2021 18:59:48 +0900","From":"paul.elder@ideasonboard.com","To":"Laurent Pinchart ","Message-ID":"<20210527095948.GJ1274010@pyrite.rasen.tech>","References":"<20210527092743.1347857-1-paul.elder@ideasonboard.com>\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [PATCH] utils: ipc: extract-docs: Extract the\n\tSPDX header if it exists","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":17329,"web_url":"https://patchwork.libcamera.org/comment/17329/","msgid":"","date":"2021-05-27T10:07:30","subject":"Re: [libcamera-devel] [PATCH] utils: ipc: extract-docs: Extract the\n\tSPDX header if it exists","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nOn Thu, May 27, 2021 at 06:59:48PM +0900, paul.elder@ideasonboard.com wrote:\n> On Thu, May 27, 2021 at 12:36:25PM +0300, Laurent Pinchart wrote:\n> > On Thu, May 27, 2021 at 06:27:43PM +0900, Paul Elder wrote:\n> > > Take the SPDX header from the mojom file, if it exists. Otherwise\n> > > default to LGPL-2.1+ as before.\n> > \n> > Do we need a default ? All the mojom files should have an SPDX header.\n> \n> Maybe we don't.\n> \n> Just error out then? Or output without the SPDX header?\n\nI'd error out, we'll catch missing SPDX tags faster.\n\n> > > Signed-off-by: Paul Elder \n> > > ---\n> > > utils/ipc/extract-docs.py | 10 ++++++++--\n> > > 1 file changed, 8 insertions(+), 2 deletions(-)\n> > > \n> > > diff --git a/utils/ipc/extract-docs.py b/utils/ipc/extract-docs.py\n> > > index 56566ce0..b617b6fa 100755\n> > > --- a/utils/ipc/extract-docs.py\n> > > +++ b/utils/ipc/extract-docs.py\n> > > @@ -12,6 +12,7 @@ import sys\n> > > \n> > > regex_block_start = re.compile('^\\/\\*\\*$')\n> > > regex_block_end = re.compile('^ \\*\\/$')\n> > > +regex_spdx = re.compile('^\\/\\* SPDX-License-Identifier: .* \\*\\/$')\n> > > \n> > > \n> > > def main(argv):\n> > > @@ -28,8 +29,13 @@ def main(argv):\n> > > \n> > > lines = open(args.input, 'r').readlines()\n> > > pipeline = args.input.split('/')[-1].replace('.mojom', '')\n> > > - data = f'''\\\n> > > -/* SPDX-License-Identifier: LGPL-2.1-or-later */\n> > > +\n> > > + if regex_spdx.match(lines[0]):\n> > > + data = lines[0]\n> > > + else:\n> > > + data = '/* SPDX-License-Identifier: LGPL-2.1-or-later */'\n> > > +\n> > > + data += f'''\\\n> > > /*\n> > > * Copyright (C) 2021, Google Inc.\n> > > *","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 457F1C3203\n\tfor ;\n\tThu, 27 May 2021 10:07:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 92F4B602AE;\n\tThu, 27 May 2021 12:07:38 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 08FF7602AA\n\tfor ;\n\tThu, 27 May 2021 12:07:37 +0200 (CEST)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7DF87B2C;\n\tThu, 27 May 2021 12:07:36 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"G0MYjMWT\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1622110056;\n\tbh=FhgG+tFkuKwdvFcOdf9WxQxlLwPbN16TNo8MPzbOFuY=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=G0MYjMWTSTZbQZ1oBqoiMFOH9jM4U4qY4OIagmNOFpe1p3/0DXjWZai0+BtesI9jW\n\t1twi7fdOZ2lkN3QMh0v9IUv4uubRuS1CPZ4LmbqsrTtwGzIBlpiq57E9biSmQxALrG\n\tm61hp0sftEMkZZXRBcRM0o7ae1IRR1oUQvcnQDBI=","Date":"Thu, 27 May 2021 13:07:30 +0300","From":"Laurent Pinchart ","To":"paul.elder@ideasonboard.com","Message-ID":"","References":"<20210527092743.1347857-1-paul.elder@ideasonboard.com>\n\t\n\t<20210527095948.GJ1274010@pyrite.rasen.tech>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20210527095948.GJ1274010@pyrite.rasen.tech>","Subject":"Re: [libcamera-devel] [PATCH] utils: ipc: extract-docs: Extract the\n\tSPDX header if it exists","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]