From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057120643105423360 X-Received: by 2002:a5d:404f:: with SMTP id w15mr5157148wrp.404.1644475400546; Wed, 09 Feb 2022 22:43:20 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a3d0:: with SMTP id m16ls40422wrb.3.gmail; Wed, 09 Feb 2022 22:43:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJy0Y4H57H/WwNKsGfp0y3KwC+m7uyFMnVQMb/thcJRXvwhpofwHjhAmMW4LrPhiTpxK0o1y X-Received: by 2002:a05:6000:2a5:: with SMTP id l5mr4971368wry.394.1644475399631; Wed, 09 Feb 2022 22:43:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644475399; cv=none; d=google.com; s=arc-20160816; b=Wuj0Qo5KTMTC5d29yLP6gjVk0E5HN9thFSKlxG/qb9PIfP/3/gBHXOCC2d3dCNndoS 6j1Hc1OP71abMQLSQldWj5JdCx+9zD4fFwupoJCYp4pxfAL+NixMjGTnqoWsnyGJq7Sg qzqNIKhEYKQ0FMXm1nZ3XCTs5FnpYX6HsS4SvCHNuTZuK8xTOcElTFRJD8zlKHRxn3M6 QYKhHYzkxd1Ai2FTVDLnwRqA5Twr9bSvxriJeE5MlFGo7qrazVRPjl3awzp43AUgOslv Mh52Veovhj8qG250n0pTbY19J0qUCLhcZhXukbaqavL4hmALKKF65OiTzBFKJGnezzPY PzpQ== 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=I+m3Mi1gtHNuNuOjuoH9tsOLf7Vs4xXaCEbTqh1vl+sgTXCOFAQDSoMJqO+m3N3JA4 RnTulE2OYeYVKmZYvxjht/bvkI66QAGBiZ5g2Nd5fRC3OjCB6KtUYjygmxT8mzcaFmi9 TIOtmU0D5V5dNTf+lY260zrtv0NR84/WUF4M+61V6jP3OxpMse0p9yU1QP9BN9pSaW9k AoHkNQH0XD6JZSPOfj2hSVcnigHLR8xi9irbfLUvzJrhOpqeth9BnOjhBaJ+gZLbhZo0 +AyMWE0wHRV0IFYGSyWzedXYBr/kHfQ4aUSD4jn4KS91A+Xt5EIcsXW9ZG9pYJ0Cm27p 3C6g== 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 o19si58750wme.1.2022.02.09.22.43.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 22:43:19 -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 21A6hHml027943 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Feb 2022 07:43:19 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 3/9] u-boot: Do not use shell environment Date: Thu, 10 Feb 2022 07:43:11 +0100 Message-Id: <20220210064317.3712-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220210064317.3712-1-ubely@ilbers.de> References: <20220210064317.3712-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: cwF2s9NtwgjA 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