From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057120643105423360 X-Received: by 2002:a05:6512:1305:: with SMTP id x5mr6888811lfu.179.1644738074397; Sat, 12 Feb 2022 23:41:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3ba6:: with SMTP id g38ls1295455lfv.3.gmail; Sat, 12 Feb 2022 23:41:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJxpiMlnLYFeFtHg98rwohwFbIxoW7U5KULXRXCzOFzkN53kziU+O7dnfnYao/nGyQ8ribTW X-Received: by 2002:a05:6512:168d:: with SMTP id bu13mr6657341lfb.284.1644738073355; Sat, 12 Feb 2022 23:41:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644738073; cv=none; d=google.com; s=arc-20160816; b=JaQCcWJVcKXcueZvbBJAIyvqZ+JxE+UR8x7waoQMUoq8Ol7XkoRPNYXOX20vzHRa1U cvLoT2oUDq7l+mUe+24DGFjdKW2FaKjYqG7+haaK4VH+WGxOf15VajCEc5HWoonk774W KGa5JRQuF8wjTE9OYt2fiZI1OrTIBO3AVKHtwWktkwq+lLID661cOYJBf156fJJ/gz4v gwsYBUExt5GsdhvhZR6wCsIedXirab2i2QTtbaHBJYCvkwZWP0nIiED1w9xsThPP4iIl nvQ3ipugWEikIjUZPDE8LFSgdeu17B0bGKTmLHV3M2VSaS8Zx01ZaxZ3uB7OUyVZvT4L vW4A== 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=rSEjEypcVlgoSpzEv/KR6QMxrZx+yuapyjPIDYYJbGEF0+T/IhgMSPgCXvdqSK6Afu g6R/A8EJOl1UDQmBTSxV8APWXysXm2xI3h3KH5Z3CaLnfiaX6Ly4deFNjhn3mMfd7yJY QsXHfHgMk/y2qF//DTO9dTDX6u+f92YDrgKWT7F3FVqSLeyF1w/hIr/kOJCU0il4y+V7 uu6txGRLbSbjfQnAibk6Y44L2YOG+zbyhgniZkSkHikEOYJzDBlFOhXd5dGtvTTl+38+ qyx2SuyHtSi8AIPQzkmbHSDhn5YP8IXzYzwIJQ3iIVkwuFt8ldO2okMoZjrzCSYKMuOg rirw== 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 w7si1266256lfr.2.2022.02.12.23.41.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 12 Feb 2022 23:41:13 -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 21D7fBw7010231 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 13 Feb 2022 08:41:12 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v5 3/9] u-boot: Do not use shell environment Date: Sun, 13 Feb 2022 08:41:05 +0100 Message-Id: <20220213074111.23232-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220213074111.23232-1-ubely@ilbers.de> References: <20220213074111.23232-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: XY9uyaRVF1Da 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