Re: [PATCH] template: Make templates passthrough

[Henning Schild <henning.schild@siemens.com>]

Does that removal have any side-effects on ... say the fetch task?
If not .. i guess toggeling that KEEP from 0 to 1 would result in "no
such file"


Am Mon, 15 Nov 2021 18:09:35 +0300
schrieb Anton Mikanovich <amikan@ilbers.de>:

> There is no need to store original template files after the conversion
> in real scenarios. To make working folder little cleaner we can remove
> them. This can be disabled with TEMPLATE_FILES_KEEP variable.

i do not buy the argument and would keep it the way it is ... reject
that patch, but maybe i do not yet get the full picture.
Not the whole patch ... the bits in the custom linux could be valid ...
always keep as with all other templates, unless it makes debian unhappy.

> Moreover output file should have exactly the same flags as input one,
> which is usefull for the cases like debian/rules or other executables.
> So we should copy this part of metadata after the conversion.
> 
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  meta/classes/template.bbclass              | 7 ++++++-
>  meta/recipes-kernel/linux/linux-custom.inc | 3 ---
>  2 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/meta/classes/template.bbclass
> b/meta/classes/template.bbclass index fb9d1186..f5760e15 100644
> --- a/meta/classes/template.bbclass
> +++ b/meta/classes/template.bbclass
> @@ -4,11 +4,12 @@
>  # SPDX-License-Identifier: MIT
>  
>  TEMPLATE_FILES ?= ""
> +TEMPLATE_FILES_KEEP ?= "0"

Why offer a way at all? And if we do not default to 1, do we need a
changelog entry?

All in all i think we can keep the files ... always. It is not like
they add a lot of overhead or confusion. And nobody would delete c
files in a Makefile after the .o s are created ...

regards,
Henning

>  TEMPLATE_VARS ?= "PN PV DESCRIPTION HOMEPAGE MAINTAINER DISTRO_ARCH"
>  
>  do_transform_template[vardeps] = "TEMPLATE_FILES ${TEMPLATE_VARS}"
>  python do_transform_template() {
> -    import subprocess, contextlib
> +    import subprocess, contextlib, shutil
>  
>      workdir = os.path.normpath(d.getVar('WORKDIR', True))
>  
> @@ -56,5 +57,9 @@ python do_transform_template() {
>                                            stdout=output, env=env))
>              if process.wait() != 0:
>                  bb.fatal("processing of template failed")
> +
> +        shutil.copymode(template_file, output_file)
> +        if d.getVar('TEMPLATE_FILES_KEEP', True) != '1':
> +            os.remove(template_file)
>  }
>  addtask do_transform_template after do_unpack
> diff --git a/meta/recipes-kernel/linux/linux-custom.inc
> b/meta/recipes-kernel/linux/linux-custom.inc index ed89aa09..57740860
> 100644 --- a/meta/recipes-kernel/linux/linux-custom.inc
> +++ b/meta/recipes-kernel/linux/linux-custom.inc
> @@ -122,9 +122,6 @@ do_prepare_build_prepend() {
>  	rm -rf ${S}/debian
>  	cp -r ${WORKDIR}/debian ${S}/
>  
> -	# remove templates from the source tree
> -	find ${S}/debian -name *.tmpl | xargs rm -f
> -
>  	# rename install/remove hooks to match user-specified name
> for our linux-image package mv ${S}/debian/linux-image.postinst
> ${S}/debian/linux-image-${KERNEL_NAME_PROVIDED}.postinst mv
> ${S}/debian/linux-image.postrm
> ${S}/debian/linux-image-${KERNEL_NAME_PROVIDED}.postrm