From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989231260094693376 X-Received: by 2002:a2e:911a:: with SMTP id m26mr12384954ljg.109.1627311051417; Mon, 26 Jul 2021 07:50:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:36c2:: with SMTP id e2ls725151lfs.3.gmail; Mon, 26 Jul 2021 07:50:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCE3M+czKOZdre5bBOTaU6QXc19HHIAxQO7+KoufGX+eMMxGJ06RAheL4EEKkwVEnswoai X-Received: by 2002:ac2:55aa:: with SMTP id y10mr3097373lfg.216.1627311050301; Mon, 26 Jul 2021 07:50:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627311050; cv=none; d=google.com; s=arc-20160816; b=bZeQSRy5Zk3lbfLG+FyDWiMcNMK20iOYSzLMEaezE/SglIOJl2IKzDgQkKRwvBJ/UD e/oT1s7/ii1FKFClax+6HGPbCeST7WsPJUSrmYxBLXwSL36UXeYXO9GwddPx1S5nLk3w ltcblqoHhXm+0QwjYLhV/57H7kstjVUZccx+2w8vMbbwPLy8o0Fs+Kc25HwElC3T0UxK 5lUqtjs/3PDUvia69Dw1Llmnr74Jg357zDX6ZiVJYCAZ8espcL0azDcGlRanlsrF4V0P 9DUuV0I57ZkiBFpzag1ciUnGZOXs9DMtyed3/xdfY1WI9Ea6fDUvVgJwvQegIwFxscZj 0aLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=EQBozdatWPow5H/byaQfGlKBHRnEba9oN21AfAeGDGU=; b=xsJck+OOUlcstC5av3NQEuJ4bx37NGSdJyTms/AmA5V/QygmXSXSYvO8cTNGSbjEh9 pDuU0012f/jTQ6yzJ6Hmkriu2sHamWDuTBmTqAtUGndihDnPRs6d9GvN3QDt0xlYbjka Z1UsljcO1ILBZPlnfAstNcHP+uyWogz4ZhI4Wjx7mW/RmvruyH9NrMmKcfnmf0zzCCUO 0ntjtrOn4wbJ1ab1GlUfLJD3Nct/pYjyR73nxOAL5A8YEla17Y7nlMN1plpsBBgIGzWQ gzt7978fLLAmmRPIB06waiycMjnvy1BMoWFVCZJiZDdIyFh0CDffKZOzZSvG0PUgBLkr siJQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id a2si6084lji.5.2021.07.26.07.50.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jul 2021 07:50:50 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 16QEonOW016761 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 26 Jul 2021 16:50:49 +0200 Received: from [167.87.33.191] ([167.87.33.191]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 16QEonUS005454; Mon, 26 Jul 2021 16:50:49 +0200 Subject: Re: [RFC 05/15] u-boot: Do not use shell environment To: Anton Mikanovich , isar-users@googlegroups.com References: <20210726134636.30800-1-amikan@ilbers.de> <20210726134636.30800-6-amikan@ilbers.de> From: Jan Kiszka Message-ID: Date: Mon, 26 Jul 2021 16:50:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210726134636.30800-6-amikan@ilbers.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: AWGEOG/UUHaZ On 26.07.21 15:46, Anton Mikanovich wrote: > To make package build process independent of the shell environment we > should remove U_BOOT_CONFIG and U_BOOT_BIN passing through export call. > So we migrate to template-based debian/rules file. > > Signed-off-by: Anton Mikanovich > --- > .../u-boot/files/debian/{rules => rules.tmpl} | 2 +- > meta/recipes-bsp/u-boot/u-boot-custom.inc | 10 ++++------ > 2 files changed, 5 insertions(+), 7 deletions(-) > rename meta/recipes-bsp/u-boot/files/debian/{rules => rules.tmpl} (93%) > > diff --git a/meta/recipes-bsp/u-boot/files/debian/rules b/meta/recipes-bsp/u-boot/files/debian/rules.tmpl > similarity index 93% > rename from meta/recipes-bsp/u-boot/files/debian/rules > rename to meta/recipes-bsp/u-boot/files/debian/rules.tmpl > index 85bda91..0507fc5 100755 > --- a/meta/recipes-bsp/u-boot/files/debian/rules > +++ b/meta/recipes-bsp/u-boot/files/debian/rules.tmpl > @@ -13,7 +13,7 @@ SET_CROSS_BUILD_TOOLS=CROSS_BUILD_TOOLS=y > endif > > override_dh_auto_build: > - $(MAKE) $(PARALLEL_MAKE) $(U_BOOT_CONFIG) > + $(MAKE) $(PARALLEL_MAKE) ${U_BOOT_CONFIG} > $(MAKE) $(PARALLEL_MAKE) ${U_BOOT_BIN} > ./scripts/get_default_envs.sh >u-boot-initial-env > $(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 tools-only envtools > diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc > index 9984d8c..819206a 100644 > --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc > +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc > @@ -26,8 +26,8 @@ python() { > > DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git" > > -TEMPLATE_FILES = "debian/control.tmpl" > -TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS" > +TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl" > +TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS U_BOOT_CONFIG U_BOOT_BIN" > > U_BOOT_TOOLS_PACKAGE ?= "0" > U_BOOT_CONFIG_PACKAGE ?= "0" > @@ -70,9 +70,7 @@ u-boot-initial-env /etc > fw_env.config /etc > EOF > fi > -} > > -dpkg_runbuild_prepend() { > - export U_BOOT_CONFIG="${U_BOOT_CONFIG}" > - export U_BOOT_BIN="${U_BOOT_BIN}" > + # restore execute permissions > + chmod a+x ${S}/debian/rules > } > This will likely break users providing their own rules while expecting the interface to stay the same. Better use the builder-export magic consistently, not the tmpl pattern. Comment likely applies to other recipes inc files as well. Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux