From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7057120643105423360 X-Received: by 2002:a05:6512:30d:: with SMTP id t13mr19317400lfp.398.1643734397711; Tue, 01 Feb 2022 08:53:17 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:5ca:: with SMTP id 193ls3340317ljf.11.gmail; Tue, 01 Feb 2022 08:53:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzt3YOTRbiP2+vYcYXOOlGoqq7DbTVmbiVZnKznKfpP0XarL1ATR9j10RKdq0+/j01r9SgR X-Received: by 2002:a05:651c:1a22:: with SMTP id by34mr17244415ljb.331.1643734396563; Tue, 01 Feb 2022 08:53:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643734396; cv=none; d=google.com; s=arc-20160816; b=wUgN8pucPkeQOZF+qsloiHCWEXDmKcl/AHStlwXL0xzrGx6FPs6ZdyKuEtlAqwQ/wX /wbnAX2rN9Na3G0hadkFqc0v5d2xJnSH4n/jI1NujodDiBGaVlCd7amjtndgf2tnQd+8 0boPlOYFEoYunlJtmXM3DXsbvOd8EQT0CRyKQsrncX40iVgWnAKjPxM1Zj+s/T43vifs Q8pepoXoHTTTnht9K5B68MqQ2l1IveXxFswo7IQpoXbY1S56EvAuux2mYTFxE+g+vXgd /hXCKlHNUnOhuArdF2O8WT3UOH/s5Ti55Z/ORbYElWHn+0LLB4Pam1mii3VrcwrJq9d/ VHkw== 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=V5YOL6WonEeoCrlKjBZ27k+GiWivwgmPq13IylB6RzSEUiN6XqxmXme3vWBIBEKwQ7 ue55pHyQAIdg/sZ0s7bivnnrJMs+bTQDJyw4+HwO4aNwm65EDf/0LO8E3UQFWFueGf9P TeUH94hCbHyWdMMppuO6qRvZWlrWAjKcdwIBXbovNYDnmG0lofPn+aasXOsAzphWYzvj 2q2c7KpC76xhNb0YpTt4puvErA9r6CD230r1aMQ99ctwvGw9fFG4V8bj/Flb3BrAyyjQ TZPrWv5qOcjFG+DPMHXebDeCLaJNIp1U70ZcYuDcqpvPjtshtM+aWTxhbVRkyYX01YyT W9NA== 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 i4si482227lfg.6.2022.02.01.08.53.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Feb 2022 08:53:16 -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 211Gr4qk019494 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 1 Feb 2022 17:53:15 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 5/8] optee-os: Do not use shell environment Date: Tue, 1 Feb 2022 17:53:01 +0100 Message-Id: <20220201165304.21976-6-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220201165304.21976-1-ubely@ilbers.de> References: <20220201165304.21976-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: T1kUXbttE/CI 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