[elbe-devel] [PATCH] mako: fix comments

John Ogness john.ogness at linutronix.de
Fri Jul 20 12:40:17 CEST 2018 

On 2018-07-12, Manuel Traut <manut at linutronix.de> wrote:
> mako comments need to start with ##, the automatically created copyright
> statements only used # so the copyright information also lasts in the
> generated files.

If it is ok that the generated files have no copyright, then:

Reviewed-by: John Ogness <john.ogness at linutronix.de>

> also some other information, like 'This file was copied from..' used #
> instead of ##.
>
> Signed-off-by: Manuel Traut <manut at linutronix.de>
> ---
>  elbepack/init/Makefile.mako                   |  6 +-
>  elbepack/init/init-elbe.sh.mako               |  6 +-
>  elbepack/init/preseed.cfg.mako                |  6 +-
>  .../makofiles/debianize/barebox/control.mako  |  4 +-
>  .../makofiles/debianize/barebox/format.mako   |  4 +-
>  .../makofiles/debianize/barebox/rules.mako    |  4 +-
>  .../makofiles/debianize/kernel/control.mako   |  6 +-
>  .../makofiles/debianize/kernel/format.mako    |  2 +-
>  .../makofiles/debianize/kernel/postinst.mako  |  4 +-
>  .../makofiles/debianize/kernel/postrm.mako    |  4 +-
>  .../makofiles/debianize/kernel/preinst.mako   |  4 +-
>  .../makofiles/debianize/kernel/prerm.mako     |  4 +-
>  .../makofiles/debianize/kernel/rules.mako     |  8 +-
>  .../makofiles/environment-setup-elbe.mako     | 74 +++++++++----------
>  elbepack/makofiles/preferences.mako           |  6 +-
>  .../makofiles/toolchain-shar-extract.sh.mako  | 46 ++++++------
>  16 files changed, 94 insertions(+), 94 deletions(-)
>
> diff --git a/elbepack/init/Makefile.mako b/elbepack/init/Makefile.mako
> index c4f79574..06c0e0e5 100644
> --- a/elbepack/init/Makefile.mako
> +++ b/elbepack/init/Makefile.mako
> @@ -1,7 +1,7 @@
>  ## ELBE - Debian Based Embedded Rootfilesystem Builder
> -# Copyright (c) 2014-2017 Torben Hohn <torben.hohn at linutronix.de>
> -# Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
> -# Copyright (c) 2017 Lukasz Walewski <lwalewski at s-can.at>
> +## Copyright (c) 2014-2017 Torben Hohn <torben.hohn at linutronix.de>
> +## Copyright (c) 2014-2017 Manuel Traut <manut at linutronix.de>
> +## Copyright (c) 2017 Lukasz Walewski <lwalewski at s-can.at>
>  ##
>  ## SPDX-License-Identifier: GPL-3.0-or-later
>  ##
> diff --git a/elbepack/init/init-elbe.sh.mako b/elbepack/init/init-elbe.sh.mako
> index eb69a898..4234ec74 100644
> --- a/elbepack/init/init-elbe.sh.mako
> +++ b/elbepack/init/init-elbe.sh.mako
> @@ -1,7 +1,7 @@
>  ## ELBE - Debian Based Embedded Rootfilesystem Builder
> -# Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
> -# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
> -# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
> +## Copyright (c) 2014-2016 Torben Hohn <torben.hohn at linutronix.de>
> +## Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
> +## Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
>  ##
>  ## SPDX-License-Identifier: GPL-3.0-or-later
>  ##
> diff --git a/elbepack/init/preseed.cfg.mako b/elbepack/init/preseed.cfg.mako
> index 0a8bfc8c..333f65c2 100644
> --- a/elbepack/init/preseed.cfg.mako
> +++ b/elbepack/init/preseed.cfg.mako
> @@ -1,7 +1,7 @@
>  ## ELBE - Debian Based Embedded Rootfilesystem Builder
> -# Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
> -# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
> -# Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
> +## Copyright (c) 2014-2015 Torben Hohn <torbenh at linutronix.de>
> +## Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
> +## Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
>  ##
>  ## SPDX-License-Identifier: GPL-3.0-or-later
>  ##
> diff --git a/elbepack/makofiles/debianize/barebox/control.mako b/elbepack/makofiles/debianize/barebox/control.mako
> index 597fc8a9..d6e02b10 100644
> --- a/elbepack/makofiles/debianize/barebox/control.mako
> +++ b/elbepack/makofiles/debianize/barebox/control.mako
> @@ -1,6 +1,6 @@
>  ## ELBE - Debian Based Embedded Rootfilesystem Builder
> -# Copyright (c) 2017 Torben Hohn <torben.hohn at linutronix.de>
> -# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
> +## Copyright (c) 2017 Torben Hohn <torben.hohn at linutronix.de>
> +## Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
>  ##
>  ## SPDX-License-Identifier: GPL-3.0-or-later
>  ##
> diff --git a/elbepack/makofiles/debianize/barebox/format.mako b/elbepack/makofiles/debianize/barebox/format.mako
> index 34f5af8d..5062aaa5 100644
> --- a/elbepack/makofiles/debianize/barebox/format.mako
> +++ b/elbepack/makofiles/debianize/barebox/format.mako
> @@ -1,6 +1,6 @@
>  ## ELBE - Debian Based Embedded Rootfilesystem Builder
> -# Copyright (c) 2017 Torben Hohn <torben.hohn at linutronix.de>
> -# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
> +## Copyright (c) 2017 Torben Hohn <torben.hohn at linutronix.de>
> +## Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
>  ##
>  ## SPDX-License-Identifier: GPL-3.0-or-later
>  ##
> diff --git a/elbepack/makofiles/debianize/barebox/rules.mako b/elbepack/makofiles/debianize/barebox/rules.mako
> index 322d45fc..e9efa0e1 100755
> --- a/elbepack/makofiles/debianize/barebox/rules.mako
> +++ b/elbepack/makofiles/debianize/barebox/rules.mako
> @@ -1,6 +1,6 @@
>  ## ELBE - Debian Based Embedded Rootfilesystem Builder
> -# Copyright (c) 2017 Torben Hohn <torben.hohn at linutronix.de>
> -# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
> +## Copyright (c) 2017 Torben Hohn <torben.hohn at linutronix.de>
> +## Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
>  ##
>  ## SPDX-License-Identifier: GPL-3.0-or-later
>  ##
> diff --git a/elbepack/makofiles/debianize/kernel/control.mako b/elbepack/makofiles/debianize/kernel/control.mako
> index 9702a986..fffdd70e 100644
> --- a/elbepack/makofiles/debianize/kernel/control.mako
> +++ b/elbepack/makofiles/debianize/kernel/control.mako
> @@ -1,7 +1,7 @@
>  ## ELBE - Debian Based Embedded Rootfilesystem Builder
> -# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
> -# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
> -# Copyright (c) 2017 Philipp Rosenberger <p.rosenberger at linutronix.de>
> +## Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
> +## Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
> +## Copyright (c) 2017 Philipp Rosenberger <p.rosenberger at linutronix.de>
>  ##
>  ## SPDX-License-Identifier: GPL-3.0-or-later
>  ##
> diff --git a/elbepack/makofiles/debianize/kernel/format.mako b/elbepack/makofiles/debianize/kernel/format.mako
> index bbefce21..f4d82fb3 100644
> --- a/elbepack/makofiles/debianize/kernel/format.mako
> +++ b/elbepack/makofiles/debianize/kernel/format.mako
> @@ -1,5 +1,5 @@
>  ## ELBE - Debian Based Embedded Rootfilesystem Builder
> -# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
> +## Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
>  ##
>  ## SPDX-License-Identifier: GPL-3.0-or-later
>  ##
> diff --git a/elbepack/makofiles/debianize/kernel/postinst.mako b/elbepack/makofiles/debianize/kernel/postinst.mako
> index ce5eb032..f8fa1345 100755
> --- a/elbepack/makofiles/debianize/kernel/postinst.mako
> +++ b/elbepack/makofiles/debianize/kernel/postinst.mako
> @@ -1,6 +1,6 @@
>  ## ELBE - Debian Based Embedded Rootfilesystem Builder
> -# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
> -# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
> +## Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
> +## Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
>  ##
>  ## SPDX-License-Identifier: GPL-3.0-or-later
>  ##
> diff --git a/elbepack/makofiles/debianize/kernel/postrm.mako b/elbepack/makofiles/debianize/kernel/postrm.mako
> index 69bbd3d6..22585559 100755
> --- a/elbepack/makofiles/debianize/kernel/postrm.mako
> +++ b/elbepack/makofiles/debianize/kernel/postrm.mako
> @@ -1,6 +1,6 @@
>  ## ELBE - Debian Based Embedded Rootfilesystem Builder
> -# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
> -# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
> +## Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
> +## Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
>  ##
>  ## SPDX-License-Identifier: GPL-3.0-or-later
>  ##
> diff --git a/elbepack/makofiles/debianize/kernel/preinst.mako b/elbepack/makofiles/debianize/kernel/preinst.mako
> index af53f87c..bd6d2f2f 100755
> --- a/elbepack/makofiles/debianize/kernel/preinst.mako
> +++ b/elbepack/makofiles/debianize/kernel/preinst.mako
> @@ -1,6 +1,6 @@
>  ## ELBE - Debian Based Embedded Rootfilesystem Builder
> -# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
> -# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
> +## Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
> +## Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
>  ##
>  ## SPDX-License-Identifier: GPL-3.0-or-later
>  ##
> diff --git a/elbepack/makofiles/debianize/kernel/prerm.mako b/elbepack/makofiles/debianize/kernel/prerm.mako
> index 15498725..865223e9 100755
> --- a/elbepack/makofiles/debianize/kernel/prerm.mako
> +++ b/elbepack/makofiles/debianize/kernel/prerm.mako
> @@ -1,6 +1,6 @@
>  ## ELBE - Debian Based Embedded Rootfilesystem Builder
> -# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
> -# Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
> +## Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
> +## Copyright (c) 2017 Manuel Traut <manut at linutronix.de>
>  ##
>  ## SPDX-License-Identifier: GPL-3.0-or-later
>  ##
> diff --git a/elbepack/makofiles/debianize/kernel/rules.mako b/elbepack/makofiles/debianize/kernel/rules.mako
> index f0f4d880..b01d6787 100755
> --- a/elbepack/makofiles/debianize/kernel/rules.mako
> +++ b/elbepack/makofiles/debianize/kernel/rules.mako
> @@ -1,8 +1,8 @@
>  ## ELBE - Debian Based Embedded Rootfilesystem Builder
> -# Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
> -# Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
> -# Copyright (c) 2017 Martin Kaistra <martin.kaistra at linutronix.de>
> -# Copyright (c) 2017 Philipp Rosenberger <p.rosenberger at linutronix.de>
> +## Copyright (c) 2016-2017 Manuel Traut <manut at linutronix.de>
> +## Copyright (c) 2016 John Ogness <john.ogness at linutronix.de>
> +## Copyright (c) 2017 Martin Kaistra <martin.kaistra at linutronix.de>
> +## Copyright (c) 2017 Philipp Rosenberger <p.rosenberger at linutronix.de>
>  ##
>  ## SPDX-License-Identifier: GPL-3.0-or-later
>  ##
> diff --git a/elbepack/makofiles/environment-setup-elbe.mako b/elbepack/makofiles/environment-setup-elbe.mako
> index 087291ea..d7986134 100644
> --- a/elbepack/makofiles/environment-setup-elbe.mako
> +++ b/elbepack/makofiles/environment-setup-elbe.mako
> @@ -1,40 +1,40 @@
> -# This file was copied from http://git.yoctoproject.org/git/poky
> -#                           16e22f3e37788afb83044f5089d24187d70094bd
> -#
> -# origin location of the file is: 'meta/classes/toolchain-scripts.bbclass'
> -#
> -# known authors of the origin file are:
> -#
> -# Richard Purdie <richard.purdie at linuxfoundation.org>
> -# Lianhao Lu <lianhao.lu at intel.com>
> -# Jessica Zhang <jessica.zhang at intel.com>
> -# Richard Purdie <rpurdie at linux.intel.com>
> -# Joshua Lock <joshua.g.lock at intel.com>
> -# Mark Hatle <mark.hatle at windriver.com>
> -# Otavio Salvador <otavio at ossystems.com.br>
> -# Randy Witt <randy.e.witt at linux.intel.com>
> -# Dongxiao Xu <dongxiao.xu at intel.com>
> -# Joshua Lock <josh at linux.intel.com>
> -# Khem Raj <raj.khem at gmail.com>
> -# Robert Yang <liezhi.yang at windriver.com>
> -# Ross Burton <ross.burton at intel.com>
> -# Stephano Cetola <stephano.cetola at linux.intel.com>
> -# Zongchun Yu <b40527 at freescale.com>
> -# Andre McCurdy <armccurdy at gmail.com>
> -# Christopher Larson <chris_larson at mentor.com>
> -# Denys Dmytriyenko <denys at ti.com>
> -# Fang Jia <fang.jia at windriver.com>
> -# Jacob Kroon <jacob.kroon at gmail.com>
> -# Jun Zhang <jun.zhang at windriver.com>
> -# Kevin Tian <kevin.tian at intel.com>
> -# Koen Kooi <koen at dominion.thruhere.net>
> -# Laszlo Papp <lpapp at kde.org>
> -# Laurentiu Palcu <laurentiu.palcu at intel.com>
> -# Martin Ertsaas <mertsas at cisco.com>
> -# Nitin A Kamble <nitin.a.kamble at intel.com>
> -#
> -# The 'meta' folder of the origin repo contains a
> -# COPYING.GPLv2 and COPYING.MIT file.
> +## This file was copied from http://git.yoctoproject.org/git/poky
> +##                           16e22f3e37788afb83044f5089d24187d70094bd
> +##
> +## origin location of the file is: 'meta/classes/toolchain-scripts.bbclass'
> +##
> +## known authors of the origin file are:
> +##
> +## Richard Purdie <richard.purdie at linuxfoundation.org>
> +## Lianhao Lu <lianhao.lu at intel.com>
> +## Jessica Zhang <jessica.zhang at intel.com>
> +## Richard Purdie <rpurdie at linux.intel.com>
> +## Joshua Lock <joshua.g.lock at intel.com>
> +## Mark Hatle <mark.hatle at windriver.com>
> +## Otavio Salvador <otavio at ossystems.com.br>
> +## Randy Witt <randy.e.witt at linux.intel.com>
> +## Dongxiao Xu <dongxiao.xu at intel.com>
> +## Joshua Lock <josh at linux.intel.com>
> +## Khem Raj <raj.khem at gmail.com>
> +## Robert Yang <liezhi.yang at windriver.com>
> +## Ross Burton <ross.burton at intel.com>
> +## Stephano Cetola <stephano.cetola at linux.intel.com>
> +## Zongchun Yu <b40527 at freescale.com>
> +## Andre McCurdy <armccurdy at gmail.com>
> +## Christopher Larson <chris_larson at mentor.com>
> +## Denys Dmytriyenko <denys at ti.com>
> +## Fang Jia <fang.jia at windriver.com>
> +## Jacob Kroon <jacob.kroon at gmail.com>
> +## Jun Zhang <jun.zhang at windriver.com>
> +## Kevin Tian <kevin.tian at intel.com>
> +## Koen Kooi <koen at dominion.thruhere.net>
> +## Laszlo Papp <lpapp at kde.org>
> +## Laurentiu Palcu <laurentiu.palcu at intel.com>
> +## Martin Ertsaas <mertsas at cisco.com>
> +## Nitin A Kamble <nitin.a.kamble at intel.com>
> +##
> +## The 'meta' folder of the origin repo contains a
> +## COPYING.GPLv2 and COPYING.MIT file.
>  
>  # Check for LD_LIBRARY_PATH being set, which can break SDK and generally is a bad practice
>  # http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html#AEN80
> diff --git a/elbepack/makofiles/preferences.mako b/elbepack/makofiles/preferences.mako
> index ca1f5255..2d85585a 100644
> --- a/elbepack/makofiles/preferences.mako
> +++ b/elbepack/makofiles/preferences.mako
> @@ -1,7 +1,7 @@
>  ## ELBE - Debian Based Embedded Rootfilesystem Builder
> -# Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
> -# Copyright (c) 2014 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
> -# Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
> +## Copyright (c) 2014, 2017 Manuel Traut <manut at linutronix.de>
> +## Copyright (c) 2014 Ferdinand Schwenk <ferdinand.schwenk at emtrion.de>
> +## Copyright (c) 2017 John Ogness <john.ogness at linutronix.de>
>  ##
>  ## SPDX-License-Identifier: GPL-3.0-or-later
>  ##
> diff --git a/elbepack/makofiles/toolchain-shar-extract.sh.mako b/elbepack/makofiles/toolchain-shar-extract.sh.mako
> index 4d9a0e91..96810aad 100644
> --- a/elbepack/makofiles/toolchain-shar-extract.sh.mako
> +++ b/elbepack/makofiles/toolchain-shar-extract.sh.mako
> @@ -1,27 +1,27 @@
>  #!/bin/sh
> -#
> -# This file was copied from http://git.yoctoproject.org/git/poky
> -#                           16e22f3e37788afb83044f5089d24187d70094bd
> -#
> -# origin location of the file is: 'meta/files/toolchain-shar-extract.sh'
> -#
> -# known authors of the origin file are:
> -#
> -# Anibal Limon <anibal.limon at linux.intel.com>
> -# Brendan Le Foll <brendan.le.foll at intel.com>
> -# Ed Bartosh <ed.bartosh at linux.intel.com>
> -# George Nita <george.nita at enea.com>
> -# Maxin B. John <maxin.john at intel.com>
> -# Paul Eggleton <paul.eggleton at linux.intel.com>
> -# Qi.Chen at windriver.com <Qi.Chen at windriver.com>
> -# Randy Witt <randy.e.witt at linux.intel.com>
> -# Richard Purdie <richard.purdie at linuxfoundation.org>
> -# Robert Yang <liezhi.yang at windriver.com>
> -# Todor Minchev <todor.minchev at linux.intel.com>
> -# Wenlin Kang <wenlin.kang at windriver.com>
> -#
> -# The 'meta' folder of the origin repo contains a
> -# COPYING.GPLv2 and COPYING.MIT file.
> +##
> +## This file was copied from http://git.yoctoproject.org/git/poky
> +##                           16e22f3e37788afb83044f5089d24187d70094bd
> +##
> +## origin location of the file is: 'meta/files/toolchain-shar-extract.sh'
> +##
> +## known authors of the origin file are:
> +##
> +## Anibal Limon <anibal.limon at linux.intel.com>
> +## Brendan Le Foll <brendan.le.foll at intel.com>
> +## Ed Bartosh <ed.bartosh at linux.intel.com>
> +## George Nita <george.nita at enea.com>
> +## Maxin B. John <maxin.john at intel.com>
> +## Paul Eggleton <paul.eggleton at linux.intel.com>
> +## Qi.Chen at windriver.com <Qi.Chen at windriver.com>
> +## Randy Witt <randy.e.witt at linux.intel.com>
> +## Richard Purdie <richard.purdie at linuxfoundation.org>
> +## Robert Yang <liezhi.yang at windriver.com>
> +## Todor Minchev <todor.minchev at linux.intel.com>
> +## Wenlin Kang <wenlin.kang at windriver.com>
> +##
> +## The 'meta' folder of the origin repo contains a
> +## COPYING.GPLv2 and COPYING.MIT file.
>  
>  [ -z "$ENVCLEANED" ] && exec /usr/bin/env -i ENVCLEANED=1 HOME="$HOME" \
>  	LC_ALL=en_US.UTF-8 \

More information about the elbe-devel mailing list