From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a5d:4563:: with SMTP id a3mr6944039wrc.130.1637324019533; Fri, 19 Nov 2021 04:13:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:1943:: with SMTP id 64ls1611692wmz.0.gmail; Fri, 19 Nov 2021 04:13:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJzHVdHqvnZuTyfvvh8XCB9pY4xmO099+7aYARi+AZp0O2wf7Y0EPibJ0MExr6cAlqSGuFTU X-Received: by 2002:a7b:c102:: with SMTP id w2mr6212564wmi.151.1637324016598; Fri, 19 Nov 2021 04:13:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637324016; cv=none; d=google.com; s=arc-20160816; b=xP4s3BQN5pUHp2PdgcgooihzOPjxCB/1U5FcRdWBKcAlveMXzIMUsaCAKd/INBag6z nfSogyX9/uwx1G6rUsRtqMB9wEBpmRtsxQrW0dfQOjRgiORQB6Bc8pVGXsRDYnAZIqNR Tgq46J9bbFSJvctTFKayxIj5oBseg4BdvAkgtHOVDiH9GFjSAqBk7dNT5diLXZD93dxN rMocFt6MlFVCh1CxcYP2T6Guhp1xCvfmYdIBnEmc3yVb5LyfmnK0MdtbrpaXQnWRqv9B tNlLdADlkUP/6A3Icjp4MXztqarGmYzeUyekjntw8w8Wt2yV+zkGkV+EQ6mHyXE99TNw vW0A== 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=n4SVV3C/nqvMfsCNzSncYu1p4Q1ph5yFyjRKOZTb3x8=; b=N38pSqvyIZ9M4q474L7cZow1oEpDMcdL4Mdn/KDa3zw6BFWOasl5H171Q9vexK1XgY 30oFG+nO1L3ZiOQ9LQEAUpLaT2aieWOkbtSc/9f8XKkFstjemlJeI1b3SNTrzgmonSEV 6xPD2J90akZejMYmr5IvcDlV0N67GaZSxozsO8f0Z0wKfbfcgfaprFze2HU5qyKI/Alz w677OMja85E34dz/NXhB1CGCGGpSAQV5tpgAfQMElJZ+Z+reIwoSOaCaIFRKEsERzqW+ hZwJOU4VL/HBcQF8atxYIUfSAShu8r+02G30kFNor5zFgphzmA9GgYa/TTqrU3JKlG2X i7ZA== 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 q74si868195wme.0.2021.11.19.04.13.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 04:13:36 -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 1AJCDX7F021829 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 13:13:35 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 05/24] u-boot: Do not use shell environment Date: Fri, 19 Nov 2021 13:13:14 +0100 Message-Id: <20211119121333.13805-6-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211119121333.13805-1-ubely@ilbers.de> References: <20211119121333.13805-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: GxjOw1+OvToS 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 --- .../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} (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..819206af 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 } -- 2.20.1