From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a19:c350:: with SMTP id t77mr48069110lff.152.1638968748366; Wed, 08 Dec 2021 05:05:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:234c:: with SMTP id p12ls1239477lfu.0.gmail; Wed, 08 Dec 2021 05:05:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyyTpjmwXj1Au7Gpb0FwsWHJ6LynlLOIffDkSahB5JpRS31bH25dy57MsBpi3wgldtg+bkP X-Received: by 2002:a05:6512:1287:: with SMTP id u7mr47285405lfs.226.1638968747141; Wed, 08 Dec 2021 05:05:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638968747; cv=none; d=google.com; s=arc-20160816; b=nIqk2TCwJT2ZKpOazEeMU6Z4Cgw2ep6WcCc1LQEq+Zvz8pXmQjKB2WejKnEBKNQg75 OHzCqii9BLurQXRxAGd6xiraEq3vljurK2jxiy3uIssCsyPtm3DSRu9FQ8FXbhk5/gX/ kybFX+hGV5rddMU4+/ESkxfXaVEow8xge5cC0vMCruD3mAqZe/eDNvl19StU50adqv6j qrXhEBFZitfytIcKeNADFXkDT7j2sLtLufpucREeGI2Ow6DuIIZiXJzSvxFJFlg7dQTF psAOq59Niex0wDSyQPkIkQePQYu0iMppzhYuHRZse9J2tRK1T5iNapmmu7YdCsO3BaAV /3Ag== 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=LXx2VgP+muJKtx/oz+Y7y684DAePDkHbgSeFpE6PVNBkrotux+c3Umq16kSKGEsnzY Sj+C3e8GagpIFnmhrDHX96AI+22BFJo7mITkLOZUrAHUJvNnzEPTbjcd+yJymCKk+5Rx EgIpKswp/KtfG2mWeiV2S+IkS+zb+B6bFaST2Y26mXXRBscF+PYQsTEAPNXwS4utZiMh nPPHLOQAUf8FelWy01AMaJ/eGp+ks2FWD1zehfJ8v1E6ZGTsridEWngvRmh6hXDmo3HP 3ZMeQv/nFy9sf8ky4j7MveOvCp/75zGC65NykNqxAcOTiLc0MIcu+8BEsBuR73zLWjzQ RfaA== 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 b29si196482ljf.6.2021.12.08.05.05.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Dec 2021 05:05:47 -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 1B8D5iL5009193 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Dec 2021 14:05:46 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 04/20] u-boot: Do not use shell environment Date: Wed, 8 Dec 2021 14:05:28 +0100 Message-Id: <20211208130544.15133-5-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: 4EcRvHJ1F32r 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