From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7044759803119271936 X-Received: by 2002:a05:600c:384e:: with SMTP id s14mr379987wmr.53.1640235960779; Wed, 22 Dec 2021 21:06:00 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:522c:: with SMTP id i12ls3068384wra.0.gmail; Wed, 22 Dec 2021 21:05:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJzrmDdgXZ1bNVF6CC3ypbfzPb2/viR4+lpJpNPnQzYQLc4vPCgVY0H8cF9fOw5NYvCbzte2 X-Received: by 2002:a5d:4690:: with SMTP id u16mr511126wrq.321.1640235959835; Wed, 22 Dec 2021 21:05:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1640235959; cv=none; d=google.com; s=arc-20160816; b=JTv0cA9F9gmX4sRnz65bN2CHG0HLAWMjrM0PsuImyjrpPnGBAXppHdzIAQWaKacp8l ZN6m1dJk7tNGcDz3wVH/blc/5mBUgxX5U9GKnxQ4eMXmS+E4bL7ZUm6BHq+qECFcno3f 5PBGBXwZ6BiLeJ/URVTS7E4mv2AE/K1tKaloxdRbZh75Js143KyT66eIltF6bhKGh851 kpoGcMtCTYYy+8zuTNeZhf1YRXyBKVCDWPfXXrGF+rSiVjmAndp1NJzxyxxscC6ODXpY LKPGIACSRDVAuKdOpXJDWQQLHZkfa8RXAvivfBQDx8l+1rCKXP62sXwIXsmgWkmeuOim 4/1g== 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=aNWE2FdmQWvIfIrZo2zw0Y652ZToaiiKfLuhdnBEjlARDDqD0D7uuXSHHUZUn+/SXL q4xeB1aAS2w7YYA72mxkI2skzmOLUILdMMpi0yLgdrDskfIA08JKDXb9Z01UGh6nnyKv zd/4HC208qMMXVpv27gjNX1dOUQq3G06ijkO51bM74G+CfZ3y6J0VnEwt7EHeM/I7ZBv bLiX/RG3PPqXw+5hKvRGfR+4aWGH1pS+BUpNJjp/mCAiG2rCtd1jBviByHEMiVk3YWNm /XH3iVcYHEPDIaTHBBmjY0qbzx6/hbEGVXAuR6TOHZFn5HnyeBhAIqRyeQVQ0t/n8yvA DdSg== 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 f10si187240wrf.5.2021.12.22.21.05.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 Dec 2021 21:05:59 -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 1BN55vqE009371 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Dec 2021 06:05:59 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 4/7] trusted-firmware: Do not use shell environment Date: Thu, 23 Dec 2021 06:05:54 +0100 Message-Id: <20211223050557.28269-5-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211223050557.28269-1-ubely@ilbers.de> References: <20211223050557.28269-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: iYbZwCBRWOxk 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