From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gwMWn-0001Pl-Ib for barebox@lists.infradead.org; Wed, 20 Feb 2019 07:42:51 +0000 Date: Wed, 20 Feb 2019 08:42:47 +0100 From: Sascha Hauer Message-ID: <20190220074247.evwtutkl75rjgieo@pengutronix.de> References: <20190219141647.2537-1-a.fatoum@pengutronix.de> <20190219141647.2537-3-a.fatoum@pengutronix.de> <20190220101412.5032124aaf26a799c903ec9f@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190220101412.5032124aaf26a799c903ec9f@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH v2 2/2] scripts/checkpatch.pl: rebase on top of upstream v5.0-rc6 To: Antony Pavlov Cc: barebox@lists.infradead.org, Ahmad Fatoum On Wed, Feb 20, 2019 at 10:14:12AM +0300, Antony Pavlov wrote: > On Tue, 19 Feb 2019 15:16:47 +0100 > Ahmad Fatoum wrote: > > > This brings many upstream goodies, among them checking for > > SPDX-License-Identifier entries for newly added source files. > > > > For future reference, following barebox changes were applied > > on top of the version copied from upstream: > > > > 4a7f56056d ("scripts: Adapt checkpatch.pl for barebox.") > > 2671c30c25 ("scripts/checkpatch.pl: don't search for Doxyfile when checking top_of_kernel_tree()") > > ad3c55fbf2 ("scripts/checkpatch.pl: don't search for CREDITS when checking top_of_kernel_tree()") > > 13b0f4666d ("checkpatch: don't check TODO file presence") > > > > These adjust sub top_of_kernel_tree's @tree_check to eventually contain > > ( > > "arch", "commands", "common", "COPYING", "defaultenv", > > "Documentation", "drivers", "fs", "include", "lib", > > "MAKEALL", "Makefile", "net", "README", "scripts" > > ); > > > > 9e809ef431 ("scripts: allow lines longer than 80 cols with printf() in checkpatch") > > > > adds an exception for printf, same as printk. > > > > The new checkpatch.pl now also depends on some more files: > > - cleanfile, cleanpatch, spdxcheck.py, spelling.txt: copied over > > - const_structs.checkpatch: added as empty file for now > > - get_maintainer.pl: implemented a dummy to keep changes here to a minimum. > > > > Signed-off-by: Ahmad Fatoum > > --- > > scripts/checkpatch.pl | 4682 ++++++++++++++++++++++++++---- > > scripts/cleanfile | 178 ++ > > scripts/cleanpatch | 260 ++ > > scripts/const_structs.checkpatch | 0 > > scripts/get_maintainer.pl | 11 + > > scripts/spdxcheck.py | 286 ++ > > scripts/spelling.txt | 1344 +++++++++ > > 7 files changed, 6169 insertions(+), 592 deletions(-) > > create mode 100755 scripts/cleanfile > > create mode 100755 scripts/cleanpatch > > create mode 100644 scripts/const_structs.checkpatch > > create mode 100755 scripts/get_maintainer.pl > > create mode 100755 scripts/spdxcheck.py > > create mode 100644 scripts/spelling.txt > > > > ... > > > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > > index 4e17347a8481..48b39fbf962a 100755 > > --- a/scripts/checkpatch.pl > > +++ b/scripts/checkpatch.pl > ... > > > @@ -1555,13 +2997,9 @@ sub process { > > > > my @compats = $rawline =~ /\"([a-zA-Z0-9\-\,\.\+_]+)\"/g; > > > > - # linux device tree files > > - my $dt_path = $root . "/dts/Bindings/"; > > + my $dt_path = $root . "/Documentation/devicetree/bindings/"; > > At the moment it looks like barebox uses both paths ("/dts/Bindings/" and "/Documentation/devicetree/bindings/") > to store dt-related documentation. > > The patch is very long and very hard to review. > > @Sascha > > Can we introduce rules on storing dt-documentation? > > It looks like we have some dt documentation duplication, e.g. > > ./Documentation/devicetree/bindings/rtc/dallas,ds1307.rst > ./dts/Bindings/rtc/rtc-ds1307.txt The rule should be that the upstream documentation is in dts/Bindings/. Only if there are barebox specific additions they should be in Documentation/devicetree/bindings. Ideally the barebox files should have the same name as the upstream files, only contain the additions and refer to the upstream file for the general bindings. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox