From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a2e:8447:: with SMTP id u7mr47240263ljh.179.1638968748041; Wed, 08 Dec 2021 05:05:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1687:: with SMTP id bd7ls323454ljb.10.gmail; Wed, 08 Dec 2021 05:05:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJzb7kUX3qQpUkqnaKemB7CL1sJsb67N3PEp5r2Ijj3Bw3j23iADTSSfZJpfXyzNKxKzTass X-Received: by 2002:a2e:b8ca:: with SMTP id s10mr49802427ljp.327.1638968746776; Wed, 08 Dec 2021 05:05:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638968746; cv=none; d=google.com; s=arc-20160816; b=g9mch0oRhIXVoDWmG/VZpMjBtQn44hWYrtTRpDN90jI8uTdeOoBDWMWCkCmFioIg9U CcVXCGSZminzaHF37AOOtCcSjfRyRyS84irdDr7v3elmlm0HCSEPXPRDc2osb9zkoCCD m9RyJGnA2NyA2CR/YfzQRBGRNVY1DwQT4lzjtVeiEYGMM88a1+x4GeTSCjkjN+gMlGQe 8AjcRoVsz39DHa3+rsB6O9R1VL9kwZ7/Y+rtoySG+zXl9H+63BXdbg8c+IAN01XZeZmZ Li9apAHMxfwVOIQdz9SqyKt+UxVrFgoKLhueb40bGKAPk7a9s02e4JBFEgbH6Vej4U/7 FuDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=NuYwU5OjqJ+cAutb83ChfX/xmti14DqszMKsBt/6KLo=; b=uUuySzkthOF9JWWot1w35YdmeLphjDS7sKh84wCw5FbWBts1Bp0dNsjxDYxX1UZuMl mA3Ns22gy4FMouLjke0XHVJ0nLmGErHm1yvw4aMCl34wnhAoJkHBMhZ07QYR0PdgJELd nICuS0rQ+wKPZOUiMvHV7qDVp7Hf8OjyGKPhrSl6vNpnYbWJtgCW1ND57jANq4xBvf5s 58nRwrrmFhIN8+/G8dQSx4djYTKVsvn/hMEplP/Q1ZaJ6Q6P6MGTSE1157EoSKnotVgL Ks8ErAwdjcrO7IepuQGtNL9bJ8OHMtciZk1EllLiYKYFtWWlamQMCyLcOjCsbd5hLJhr DN4Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id e15si259634ljg.0.2021.12.08.05.05.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Dec 2021 05:05:46 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 1B8D5iL3009193 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Dec 2021 14:05:45 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 02/20] template: Make templates passthrough Date: Wed, 8 Dec 2021 14:05:26 +0100 Message-Id: <20211208130544.15133-3-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211208130544.15133-1-ubely@ilbers.de> References: <20211208130544.15133-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: dFN1WjND4arg From: Anton Mikanovich 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. 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 --- 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" 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 -- 2.20.1