From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057120643105423360 X-Received: by 2002:aa7:dbd4:: with SMTP id v20mr20424178edt.170.1643113942374; Tue, 25 Jan 2022 04:32:22 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:5190:: with SMTP id q16ls7732870edd.3.gmail; Tue, 25 Jan 2022 04:32:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJwvyiysTzEDBP+9zAUCYXZ0LqEgp+FRQLVwCOuzrmpeiPFGx2Jg8vVwNlO9fNVg2TtjKq2w X-Received: by 2002:a50:8d05:: with SMTP id s5mr20773222eds.251.1643113941405; Tue, 25 Jan 2022 04:32:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643113941; cv=none; d=google.com; s=arc-20160816; b=n7qZq8sVh1WDyvf/EC+dof23K/f1HbVsa4o1u8HP3zWgT1rxzIUiNsR3rotqoco1ef H0EllYdXrp10cippbxvUaVs+lpdZ2Ce3KtoY8uOQktq0z/+3HhU0gjq+kPmznukE4riw zZTFmKjnb79WQ9/IYh1LDWXWIY6hOd/bfRzEGf/8lvd6cyjutWqfZ8HUKjXzPt9/zyEd 4RIc5LlVoWww6RgfIuuGWb4SNXrnVyGb5NjirMjpGKFIMiHIbFDqHTIl30q9YW+vTRpg cdnwYBrXE2KtWjM8FSO0uG58Mpwb/+Ae0xVhoX90BOFOmNp2LMj2n3bZ0l2PLMHFMuVe 2ViQ== 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=wzmISBXdgkRZv7l+7mrO3luzBlkhNAlGlcz86gq07fY=; b=XJuO8tXyNT2l/I4oWReb9aQTXg8/G7eJ5TynEB3CyhlNKfgNq/rWVxDHCIV77F7yjA IO0WOfqDZYLvVu9VPDwNRupbwc3kwaEVYzKWvJE5fC8kdALEX9Xwkqvn8Q2qTkHEZsIm R2g5fn3y3I2Bxo9c3hWydnxh4F5x/YpRdpF3JuZ50bfz5kILDgyUJ064ZaiaoqIiXXmZ ZkZZR48AEOYBr7EFoWF96/aYNQvIqQ60zFMQcbwDM6MQHYyd/QU6+9xf6f7KPtRXEHoE 64HuaAulv1kOKoOxH1w953SHVHI7pRWwcpmJtY8BpP8k/rfBHxWWR0flv+tH//CgbRvc hBYA== 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 l16si777020edb.1.2022.01.25.04.32.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jan 2022 04:32:21 -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 20PCWJHp019024 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Jan 2022 13:32:20 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 3/9] u-boot: Do not use shell environment Date: Tue, 25 Jan 2022 13:32:13 +0100 Message-Id: <20220125123219.32395-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220125123219.32395-1-ubely@ilbers.de> References: <20220125123219.32395-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: UX+cDTu4XPw5 From: Anton Mikanovich 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 Signed-off-by: Uladzimir Bely --- .../u-boot/files/debian/{rules => rules.tmpl} | 2 +- meta/recipes-bsp/u-boot/u-boot-custom.inc | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) rename meta/recipes-bsp/u-boot/files/debian/{rules => rules.tmpl} (94%) diff --git a/meta/recipes-bsp/u-boot/files/debian/rules b/meta/recipes-bsp/u-boot/files/debian/rules.tmpl similarity index 94% rename from meta/recipes-bsp/u-boot/files/debian/rules rename to meta/recipes-bsp/u-boot/files/debian/rules.tmpl index 3d667620..806b01fe 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} $(MAKE) -n u-boot-initial-env >/dev/null 2>&1; if [ $$? -ne 2 ]; then \ $(MAKE) $(PARALLEL_MAKE) u-boot-initial-env; \ diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc index 9984d8cc..2af7ada1 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" @@ -71,8 +71,3 @@ fw_env.config /etc EOF fi } - -dpkg_runbuild_prepend() { - export U_BOOT_CONFIG="${U_BOOT_CONFIG}" - export U_BOOT_BIN="${U_BOOT_BIN}" -} -- 2.20.1