From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989231260094693376 X-Received: by 2002:a05:6512:400c:: with SMTP id br12mr13858332lfb.268.1627310829523; Mon, 26 Jul 2021 07:47:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a7c4:: with SMTP id x4ls2736361ljp.8.gmail; Mon, 26 Jul 2021 07:47:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyL/HP0KmNnruNn9dFNw92mG3ltCOJNBYpGc2lErserbEGEfS6h/i6vicGkfq3B6e8qnzVk X-Received: by 2002:a2e:5741:: with SMTP id r1mr12426840ljd.190.1627310828366; Mon, 26 Jul 2021 07:47:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627310828; cv=none; d=google.com; s=arc-20160816; b=S3i72eeS7ZP9Iok8ZrMXRjaBZwaHpedHAG0wITU/2HPwfVJsqhM4ndIZioBAJFGS5w 3nA2CXtUhM+I5Hf5gGiupkmy8bhjUVMs5iipKxG91JnYuqS8HfI/3m3J1gtccBn1P6Kd G+wVpc4sONFoCqCgArfNVZmpbGt6A1sWKbiy1wDv3MHAFnfJuLCgu9uuolnBYVe+5Z8p eS/7RQ6TN/dZubPkd/BFJBz0yLF0auIkaLpBJ0xR68GKJSqVbsEeQ+NK5Cp6QEOmA1X7 W77fLmyqUa8Uhpik0hw1pzI/5t3KEKerj1AOAGrEWfUJ6ee7HpkiTjHreZ+NVcjMguer EPvg== 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=KQlG6BRdBYeZAJbzvTcNI36VrxY6iyIHfmCv1l2IUhk=; b=HJESibKpqd2YJFyEUZZwQgRPtbDLoQ026fH79eDDcq4A2NnYaHtdvwWsYP77yrq6pP pp2jQUW9wTJ+UlKebyl/ZLQOahVKb14vvmsol3gJ8+MK89ZiboqPLUwj2pHBCBjoH56x GFjhGishzdRHMEKyeTyKk8470XBRlSV4N9SpBYvTZKv2Tt7yqhaRHzpf/JJYc6H8IEQZ Y9IYi5OtfupwQW+dgqHrDPkvyHjAGCpVcoemRqB7sc6StZ6mT/92r+/0I4zAYvpnsRQP jz7OnHVMBnCwUGIuB+Cq1CfTks5pQGpU8ZzufqMAA9XKzl1PFmpEh7XTWaMDasVVwg2w dHNQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id r190si6642lff.0.2021.07.26.07.47.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jul 2021 07:47:08 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 16QEl7EC032659 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 26 Jul 2021 16:47:07 +0200 Received: from [167.87.33.191] ([167.87.33.191]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 16QEl7tX003757; Mon, 26 Jul 2021 16:47:07 +0200 Subject: Re: [RFC 10/15] sbuild: Introduce environment variables export API To: Anton Mikanovich , isar-users@googlegroups.com References: <20210726134636.30800-1-amikan@ilbers.de> <20210726134636.30800-11-amikan@ilbers.de> From: Jan Kiszka Message-ID: Date: Mon, 26 Jul 2021 16:47:07 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210726134636.30800-11-amikan@ilbers.de> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: UZBBGCv0xmEn On 26.07.21 15:46, Anton Mikanovich wrote: > 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. > Ah, here is what I was looking for. > 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 0fa2005..19aa763 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} Maybe not call this mechanism "sbuild" - what if we switch the builder in the future? And it should be documented. > } > diff --git a/meta/classes/sbuild.bbclass b/meta/classes/sbuild.bbclass > index ed2d0cf..cc7db66 100644 > --- a/meta/classes/sbuild.bbclass > +++ b/meta/classes/sbuild.bbclass > @@ -15,3 +15,16 @@ python __anonymous() { > > SBUILD_CHROOT ?= "${DEBDISTRONAME}-${@os.getlogin()}-${DISTRO}-${SBUILD_HOST_ARCH}" > SBUILD_CHROOT_RW ?= "${DEBDISTRONAME}-${@os.getlogin()}-${DISTRO}-${SBUILD_HOST_ARCH}-rw" > + > +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}" > +} > Jan -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux