From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057120643105423360 X-Received: by 2002:a05:6512:3e25:: with SMTP id i37mr3808648lfv.325.1644475401198; Wed, 09 Feb 2022 22:43:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1990:: with SMTP id bx16ls751862ljb.3.gmail; Wed, 09 Feb 2022 22:43:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJz65Hh6ZM93DNu/KCyblpq2py/e8DVfEr133WoQyXzXVZj5UEA9t9UAw0BHzg7vs5FWkqVq X-Received: by 2002:a2e:a7ce:: with SMTP id x14mr4065577ljp.181.1644475400119; Wed, 09 Feb 2022 22:43:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644475400; cv=none; d=google.com; s=arc-20160816; b=n9FXhyCLmCRl9BRRur/gOKtgXu40fRIIl4w51QeFSlSeAtqzZ1qTDCRftJ0lJjEB3g GZmAnC6GXUUqvkbqhVjNAmPslv5/2Hp8zRMB+JfoYvi9B8Gq7ViUlV+tGrOipE1MUxWU /GUF+5SKVCpDCFR0wKKJh60QnagsfqPoht6/Pf75Gd6uDCYfGvbYBm67Um93Wkly3PLX sRo2JTxsMuGpynLOT6ElO0yJuAW0ZVMZZToLqXbhYCiPha5kZbABU+4Vfak3Qtsed7i5 vE/vtlPsyIR5zzAPtyweg32O5O6U0oKhmZYZl4GneKftY5rt6eHzxJDSKJPU62xpDc9v V4gg== 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=U4rIpEq2uYP38DX+MADouE76Bvwt1AzgDWdOyOLO7q4=; b=j7ITMsZnBzGkDjBU2ROO+dOQtNivHMN0OGklVciDhcKZlw7t6WTRaUC8CszgDP9aCd 0kJ3YsMJiciawf6T9TPpaDoajjaK/Tdl3bIRjV3N8V2Sv7V1BkI+uuWeaNr5w1fTUO8r zSAJwKKlDST66sQR1mrUdhpvB0QlFTRC/jKIJ80k2yUharnl87ERqAGZWjZPC+BKpQac PZKnGa3Wv+BvbbLasfwZsrndZXJBKTxe8J1DR9Cmx29mO8Q76VG6pkuP5UN/FA1/fP4H 3YRanSDD2Ob0GuFd9QGiDARgMQ7hMgBzAbYO5MWj/yYWN+IMGvpkMdF4Ar+9lvZlAFL9 nxaA== 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 o24si1098151lfb.1.2022.02.09.22.43.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Feb 2022 22:43:20 -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 21A6hHmm027943 (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 4/9] trusted-firmware: Do not use shell environment Date: Thu, 10 Feb 2022 07:43:12 +0100 Message-Id: <20220210064317.3712-5-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: LZYRP5ra0MKM From: Anton Mikanovich To make package build process independent of the shell environment we should remove TF_A_PLATFORM and TF_A_EXTRA_BUILDARGS passing through export call. So we migrate to template-based debian/rules file. Signed-off-by: Anton Mikanovich --- .../files/debian/{rules => rules.tmpl} | 4 ++-- .../trusted-firmware-a/trusted-firmware-a-custom.inc | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) rename meta/recipes-bsp/trusted-firmware-a/files/debian/{rules => rules.tmpl} (77%) diff --git a/meta/recipes-bsp/trusted-firmware-a/files/debian/rules b/meta/recipes-bsp/trusted-firmware-a/files/debian/rules.tmpl similarity index 77% rename from meta/recipes-bsp/trusted-firmware-a/files/debian/rules rename to meta/recipes-bsp/trusted-firmware-a/files/debian/rules.tmpl index 70e1dd66..6dbf44db 100755 --- a/meta/recipes-bsp/trusted-firmware-a/files/debian/rules +++ b/meta/recipes-bsp/trusted-firmware-a/files/debian/rules.tmpl @@ -12,8 +12,8 @@ export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- endif override_dh_auto_build: - CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLAT=$(TF_A_PLATFORM) \ - $(TF_A_EXTRA_BUILDARGS) + CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLAT=${TF_A_PLATFORM} \ + ${TF_A_EXTRA_BUILDARGS} %: dh $@ diff --git a/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc b/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc index 1142bfce..64153c6b 100644 --- a/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc +++ b/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc @@ -22,8 +22,8 @@ DEBIAN_BUILD_DEPENDS ?= "" PROVIDES += "trusted-firmware-a-${TF_A_NAME}" -TEMPLATE_FILES = "debian/control.tmpl" -TEMPLATE_VARS += "TF_A_NAME DEBIAN_BUILD_DEPENDS" +TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl" +TEMPLATE_VARS += "TF_A_NAME DEBIAN_BUILD_DEPENDS TF_A_PLATFORM TF_A_EXTRA_BUILDARGS" do_prepare_build() { cp -r ${WORKDIR}/debian ${S}/ @@ -36,8 +36,3 @@ do_prepare_build() { ${S}/debian/trusted-firmware-a-${TF_A_NAME}.install done } - -dpkg_runbuild_prepend() { - export TF_A_PLATFORM="${TF_A_PLATFORM}" - export TF_A_EXTRA_BUILDARGS="${TF_A_EXTRA_BUILDARGS}" -} -- 2.20.1