From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a9f:2383:: with SMTP id 3mr71015129uao.77.1637485632012; Sun, 21 Nov 2021 01:07:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1f:43cd:: with SMTP id q196ls762549vka.2.gmail; Sun, 21 Nov 2021 01:07:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJywSp+luNv4VjBKUc2DPVJEsDdYDYEyJPzsdbHUdkil/3sARz5ibaYZKDBxvmErsYus2p4+ X-Received: by 2002:a05:6122:7c9:: with SMTP id l9mr15598721vkr.7.1637485631463; Sun, 21 Nov 2021 01:07:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637485631; cv=none; d=google.com; s=arc-20160816; b=OK0KoTWsDDApAGvmvI3LcDJDBDjI+0wZpLtNG2FWTLbF9+rwPhhRtPrK0LxFCnfJIz NufvD9XKUvABgj9PCyYz8SLHjEic1K97S3XT1rmlo60eRGKITSw0kpayd4FnKxg1y5TJ AVcwKDiuaA36nnd1VZTDmxBZeN6AgdRpsqz9tyyBPSXxLuwW764XAiwisc3FoI6MrhRe xiSChdYc1sydt6udNjW9PbC2C27J5WpxAYzkKJdUKNs/yutTq+x28xh580mZHfrDIq5N cpPl1etVWK4oix7TM63G9/9CxeomBlZRlp9iBHFSmTL7UBtUFeS9itGuF6x3lVluzSyV uM7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject; bh=4ljZyWur42kTmRdCMA1G5Gk/XHbaRdcn6kh3bLzTtDI=; b=c/qIkZ4ckthw9r+U0w9hLQvnExDTeanIj0+QVDgmXZEK0r6UCMIY4qGCNZ5UireaKr 5rxJW709X20UX3H2mdmUyafXOUB7QnFkz/Zv8e/7QddtNN9e38LX4J42/WwLlzOZwOxO eLVlMOBzylsvKFYHzLUPkEpFPmZgInGIAMFs4cSZ8GiNk28kgamWTt531gzVZBMq9cKf rO6nWPOvb8uC6x7eqc6/QTABNRSmvgP2esOk918w2/Cm/90+jH9D7KhYjnVH7j9b5KEy qyo2NCl5Qj90htGUPCdzuLHEXueAL+7+MqRmensd2NtamRyt5Gm4ZwOg0N8YE8D0XMw+ eW4Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id e76si254218vke.5.2021.11.21.01.07.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Nov 2021 01:07:11 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 1AL979gv011645 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 21 Nov 2021 10:07:09 +0100 Received: from [167.87.72.70] ([167.87.72.70]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1AL978w9023562; Sun, 21 Nov 2021 10:07:09 +0100 Subject: Re: [PATCH v2 10/24] sbuild: Introduce environment variables export API To: Uladzimir Bely , isar-users@googlegroups.com References: <20211119121333.13805-1-ubely@ilbers.de> <20211119121333.13805-11-ubely@ilbers.de> From: Jan Kiszka Message-ID: Date: Sun, 21 Nov 2021 10:07:08 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <20211119121333.13805-11-ubely@ilbers.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 52uEirNxJV43 On 19.11.21 13:13, Uladzimir Bely wrote: > From: Anton Mikanovich > > In case there is no ability to pass variables through template > mechanism we need to keep fallback API to migrate from bare export. > Using it with optee-os-stm32mp15x recipe as example. > > Signed-off-by: Anton Mikanovich > --- > .../optee-os/optee-os-stm32mp15x_3.11.0.bb | 2 +- > meta/classes/sbuild.bbclass | 13 +++++++++++++ > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb > index 0fa2005d..19aa763a 100644 > --- a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb > +++ b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.11.0.bb > @@ -21,5 +21,5 @@ OPTEE_BINARIES = "tee-header_v2.stm32 tee-pageable_v2.stm32 tee-pager_v2.stm32" > # Set version manually to PV, the tarball does not contain any hint. > # Alternative: pull from git and add git as build dependency. > dpkg_runbuild_prepend() { > - export TEE_IMPL_VERSION=${PV} > + sbuild_export TEE_IMPL_VERSION=${PV} build_export - avoids having to rename this once again when we should switch to something != sbuild. Again, I think this is the nicer way to make the recipes sbuild compatible (less invasive, less boilerplate than templating). Jan > } > diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass > index d6e5b926..5f9f7691 100644 > --- a/meta/classes/sbuild.bbclass > +++ b/meta/classes/sbuild.bbclass > @@ -85,3 +85,16 @@ schroot_delete_configs() { > rm -f "${SCHROOT_CONF_FILE}" > EOSUDO > } > + > +sbuild_export() { > + SBUILD_CONFIG="${WORKDIR}/sbuild.conf" > + VAR_LINE="'${1%%=*}' => '${1#*=}'," > + if [ -s "${SBUILD_CONFIG}" ]; then > + sed -i -e "\$i\\" -e "${VAR_LINE}" ${SBUILD_CONFIG} > + else > + echo "\$build_environment = {" > ${SBUILD_CONFIG} > + echo "${VAR_LINE}" >> ${SBUILD_CONFIG} > + echo "};" >> ${SBUILD_CONFIG} > + fi > + export SBUILD_CONFIG="${SBUILD_CONFIG}" > +} > -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux