From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057120643105423360 X-Received: by 2002:a1c:4407:: with SMTP id r7mr2741155wma.112.1643113942608; Tue, 25 Jan 2022 04:32:22 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:6009:: with SMTP id az9ls1175837wmb.1.gmail; Tue, 25 Jan 2022 04:32:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJwLn2egHcpR0RI5E+SghcDJMeDyM4+LDlzZlYw14U/XXsVTYm4E8ar8MMiZEchoDjg+KLw4 X-Received: by 2002:a05:600c:3d0c:: with SMTP id bh12mr2787573wmb.179.1643113941650; Tue, 25 Jan 2022 04:32:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643113941; cv=none; d=google.com; s=arc-20160816; b=UKqlM3PNqXCNlabwX2+xAY86CGHpmpKYXpnu9KnBHg8Y5G7xTNbBq8eK1sqzGoA0k7 N4g5FGYgq5Ag8uBzU8u4bPtVgNmmdtysxnMWiaVS5WIn42twPsFloSng9UaHcX3QV/RO HQIhcYZn2kShoEzoGczMf6mYvNsjJHKhzcFKn+V5kVzbdXyRrnwkGTfbamCxEMHPIx2X odwW3CuQzg76r8QYovBFw35Xs4MYMOJ9jG6dzwdOCk5VSxTIuY6JpYUYSAUHCsoIMZqz BnVZCY6EBtSGLw3wUvDT8n+eCJtXwpWtwfQWTMm7MZH7jmk829kSo50wuB9E7VC/q0cN ixhA== 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=Ok4irO3uF1fHbIfAScFhUfPsIGvAzoKaI5PoJdmxjEdkbcJ7Q+PG+StPAQtA3UJ1fc MSE9F3dAWXMWtzrD2kHRjhBB5/BS1EwPQYblMH9dBCW6m0B+So4dodRTIpBPEXfr2BMX FzUrq4bIzIdyUjHPlqfKY4DW5iwbMnb3sAd/NmzSjqp1I3kwa3/Mqxxu/GnYwfGz9Bpv FhxSAsZmz0MQb0M34kVH6fGby67Y3es866TNYKvkZ63nhpfz+GTgYQa44Yl9md/78ZhR VxDSE4amuHSZMLKdC+57OSvueZDOGrJY+JUy9OcREpiCPY7Ddl3xHBsNwrqkjm3JwUCq SnFw== 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 m4si612812wru.6.2022.01.25.04.32.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jan 2022 04:32:21 -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 20PCWJHq019024 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Jan 2022 13:32:21 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 4/9] trusted-firmware: Do not use shell environment Date: Tue, 25 Jan 2022 13:32:14 +0100 Message-Id: <20220125123219.32395-5-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220125123219.32395-1-ubely@ilbers.de> References: <20220125123219.32395-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: 2DJw2a+kkhpR 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