From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a19:e048:: with SMTP id g8mr31655374lfj.533.1637324019115; Fri, 19 Nov 2021 04:13:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d9e:: with SMTP id k30ls223429lfv.1.gmail; Fri, 19 Nov 2021 04:13:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJz4dlUiLiwAKkorCeZdcNM6dVFPakmReKtL0pWbI0j0ZN/SakJw27Y5NxoqvjEt1d2yqiGf X-Received: by 2002:ac2:5e8f:: with SMTP id b15mr32607305lfq.252.1637324017370; Fri, 19 Nov 2021 04:13:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637324017; cv=none; d=google.com; s=arc-20160816; b=XyYK/0SnXg0l8spfEsh13dWulKHLmOSg7M6ZLdrntfInx+sPZDl86hsLE2AjjZr9dw qkMarU9gtLB9VgUrtzWfsuJF8WtTj00cmEYKkiexx2b2QblhtbMwgDD5Lk/SpiEnfC/H GtRMhSWnQmOrAi89kSZaZDx+rS+RGAbotcQzrgTam/ewTCW3rmsPgGPomRSo6nKSNAUj uibZg+0PlqLJPZO0sQ5xfh6mnxhnR4J3j8ceYjZ5hxPrVd4+HQfVShaiEjj3czIdrS/P 7OEgbvkcJdhhJ7QQd8eir2RKZdxTJ6sgwlNs6RsZMtGHN4cr1Wb5b1V/XUndvwPfaL+X QLqA== 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=7XYA/i1GOJ0BCPGd0xN4bxTGl1M0YQOqzcjAnk8e6ac=; b=HMMxzou+3vRCC7VkPI4wE2Eq9S8A5B4JLsKKMcJuKSjUteYKqkLXOWHc3K9V52orfi +Jetxk8+RuKAtmcT1ATM7Eh+v22GKzbetbxoPzvQ+r5rTjgtcmG9qKR8fC+IqZ/uCfYY cOpx1A0pdQ2/YG4fKcFR/wO0G/SWOr5Q0Q5d5DEdjK3oIRWqCT6EfpALQckw/6/KGeKf Vbm+eqPoOqpOoUvjOQYATKCUr1vv8f8wKkoRfqprWm0nYUX33o7IbIZrdjoMTGGmmZxy L3KId2xHK2G9NiYAcCE99LLGutRVNyWhRd2/kgRnNpForSJblHQwkmg3JL4g9fimNfdW hkgw== 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 y7si202037ljp.7.2021.11.19.04.13.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 04:13:37 -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 1AJCDX7H021829 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 13:13:36 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 07/24] optee-os: Do not use shell environment Date: Fri, 19 Nov 2021 13:13:16 +0100 Message-Id: <20211119121333.13805-8-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: ohCOUGncuNkd 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 | 10 ++++------ 2 files changed, 6 insertions(+), 8 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..e9eed54d 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]}" @@ -38,9 +38,7 @@ do_prepare_build() { echo "out/arm-plat-${OPTEE_PLATFORM_BASE}/core/$binary /usr/lib/optee-os/${OPTEE_NAME}/" >> \ ${S}/debian/optee-os-${OPTEE_NAME}.install done -} -dpkg_runbuild_prepend() { - export OPTEE_PLATFORM="${OPTEE_PLATFORM}" - export OPTEE_EXTRA_BUILDARGS="${OPTEE_EXTRA_BUILDARGS}" + # restore execute permissions + chmod a+x ${S}/debian/rules } -- 2.20.1