From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057120643105423360 X-Received: by 2002:a05:6512:401f:: with SMTP id br31mr2890189lfb.44.1643113943368; Tue, 25 Jan 2022 04:32:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:a0b:: with SMTP id k11ls2897041ljq.2.gmail; Tue, 25 Jan 2022 04:32:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZArM9I54UB6e/jXpiDiLFxnBrEMyCf/bD2PPptuo0nLnf6n23x8IOg3nqLKybx5GzEt77 X-Received: by 2002:a05:651c:b21:: with SMTP id b33mr14067040ljr.531.1643113942321; Tue, 25 Jan 2022 04:32:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643113942; cv=none; d=google.com; s=arc-20160816; b=ynGY2u0HTyLYRXRAbbbLb/KygtUJ9cVjBDu7EJiLF8OJmDYZ/enMTYqczimZP+wbfh mqmT6PxrCzgj8k9F8nu159kPZBAP5dkdR4n5cbgy//yz4zKWuxhtILPGDOr1JPD63ttT DwF9KmnnFJhKjnHy2ufHxBa6XZRishgF2ZZfMspqEPZR1/6E1dnPySRVe0vqT/LZeHOl YjEP6U6R8qUsqtIPNz2Of2jDQpWX64lw6wLcWCedAdZXZJYq506vB+8egS7GF9L7VB/s uc6LXrko3QGdLhqqJaGeeyuzVsd6steJ537RIKj6R1rS4u1CiK+rmqazjOWvgSAoz3Ex TWmw== 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=o65ruSohxHUji0znhapcaj+b8u3WvLDjSRIGFAd0+uE=; b=MmxPvcpb4xKcJJzOGSccvGR6fJtl6kOMd45UX2nTQi+2TGNEoZC6LfjniA0JNnUcfF i2QUARvt2KAABEmgqs9E5siFHQ4wwrPrSD/3hxdIsmwLHmHt2q0pQQsxNaq3G1Xd9Hu1 bLgo0FwSP5o40bLlp1pdGR+JrnkRRfo0sMsUTg6YI2OgieGhkWp29mcUZtdKskfZA+4r 6bt4HT1vprCdYQLX/cdDZjCzkk1v6mTf+cSWSk2NRBZztatl64QwB6m5qf0Zj4dvzJc6 cN6TWoMICOUaCjsIyf8vOMrfO34rwGf/jyG9gBGGA8fyaEyqTfTcrtipS7bE91RWOWRD 2uyg== 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 n22si168877lji.7.2022.01.25.04.32.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 25 Jan 2022 04:32:22 -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 20PCWJHr019024 (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 5/9] optee-os: Do not use shell environment Date: Tue, 25 Jan 2022 13:32:15 +0100 Message-Id: <20220125123219.32395-6-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: XTcbm9IjF6Ug From: Anton Mikanovich To make package build process independent of the shell environment we should remove OPTEE_PLATFORM and OPTEE_EXTRA_BUILDARGS passing through export call. So we migrate to template-based debian/rules file. Signed-off-by: Anton Mikanovich --- .../optee-os/files/debian/{rules => rules.tmpl} | 4 ++-- meta/recipes-bsp/optee-os/optee-os-custom.inc | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) rename meta/recipes-bsp/optee-os/files/debian/{rules => rules.tmpl} (75%) diff --git a/meta/recipes-bsp/optee-os/files/debian/rules b/meta/recipes-bsp/optee-os/files/debian/rules.tmpl similarity index 75% rename from meta/recipes-bsp/optee-os/files/debian/rules rename to meta/recipes-bsp/optee-os/files/debian/rules.tmpl index d2e9900f..9ab80dfe 100755 --- a/meta/recipes-bsp/optee-os/files/debian/rules +++ b/meta/recipes-bsp/optee-os/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) PLATFORM=$(OPTEE_PLATFORM) \ - $(OPTEE_EXTRA_BUILDARGS) + CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLATFORM=${OPTEE_PLATFORM} \ + ${OPTEE_EXTRA_BUILDARGS} %: dh $@ diff --git a/meta/recipes-bsp/optee-os/optee-os-custom.inc b/meta/recipes-bsp/optee-os/optee-os-custom.inc index 1bd51969..23612d81 100644 --- a/meta/recipes-bsp/optee-os/optee-os-custom.inc +++ b/meta/recipes-bsp/optee-os/optee-os-custom.inc @@ -22,8 +22,8 @@ DEBIAN_BUILD_DEPENDS ?= "python3-pycryptodome:native, python3-pyelftools" PROVIDES += "optee-os-${OPTEE_NAME}" -TEMPLATE_FILES = "debian/control.tmpl" -TEMPLATE_VARS += "OPTEE_NAME DEBIAN_BUILD_DEPENDS" +TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl" +TEMPLATE_VARS += "OPTEE_NAME DEBIAN_BUILD_DEPENDS OPTEE_PLATFORM OPTEE_EXTRA_BUILDARGS" # split strip platform flavor, if any, from the specified platform string OPTEE_PLATFORM_BASE = "${@d.getVar('OPTEE_PLATFORM').split('-')[0]}" @@ -39,8 +39,3 @@ do_prepare_build() { ${S}/debian/optee-os-${OPTEE_NAME}.install done } - -dpkg_runbuild_prepend() { - export OPTEE_PLATFORM="${OPTEE_PLATFORM}" - export OPTEE_EXTRA_BUILDARGS="${OPTEE_EXTRA_BUILDARGS}" -} -- 2.20.1