From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:ac2:4d29:: with SMTP id h9mr31778780lfk.633.1637324019341; Fri, 19 Nov 2021 04:13:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3e10:: with SMTP id i16ls223100lfv.3.gmail; Fri, 19 Nov 2021 04:13:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJzDwUFURszyCyxhTQjsrJA53XVuoXQ686uqQUpB9EFfRujtNW21K+KvbSepfjZEM2JkZWx7 X-Received: by 2002:a05:6512:2101:: with SMTP id q1mr31844938lfr.663.1637324018303; Fri, 19 Nov 2021 04:13:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637324018; cv=none; d=google.com; s=arc-20160816; b=ibEB6BZesKAsrZcrU2pW1OwmEYZF+NRC7HhOr1fQOHhZWyFSMbO2bVDxhmVWxlCPiq fsju8cb6Qq3vH0ofuhE4LeLkLQeTxR5fbaOJomrs+tpdFLVev3ttqM8N/DfftqQDhRe5 enoqPnBR37yDiVDpZegaXL1/pbebUT083uyVAHFYFRMdAu/f4aHD0TKWJSbb1sn5cFVX lhrwjx+k3LqO7SZVtAR31QaNa5tE4wFA5lBXccGFibhf4c6O52WyJQ+gCWyELqlOOpdO HxF4wGOsaia+DsHx6S0XPhn9vLVc6fTR4KiVXuKhpOM/fqwFq26gRqY0Fvb/nJHbzCuk PVwg== 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=uYxkwywYloZiNF7OEPhX/5xBPDEfApBPewLjgGG7I5o=; b=kCMLFmsoCXZqGgtR1LRr/24zMvKSLr+hCSZXexwLwh6nnLdiMP5gm2tt9y5l2wfowA s4dQZLczO2sTy0zcOFHSIPXZGDbUc5+ceV01HXWmVIHGq6Yjy5Ga/TjAksUV4qgDC/u/ ocbudfl3YwPv6ljSwdgw8mk4D8396naX9vPMuKM5/bsCgzqSEYCmyqvQM7DiXCwKV+0Z TLvRb6nEu1+T1X8yAwD/NeOBWBk//Oqtteglhv7o14R9e7cwEKvnHKeAKIwEHdhixqAb oC0/W5jaje4CXCapAYFnPZwoLsbsVVDKSDxHX8galszvWVY/KOaMABBs6EsMD/GcWIMf y/Ng== 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 u19si183708ljl.5.2021.11.19.04.13.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 04:13:38 -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 1AJCDX7K021829 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 13:13:37 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 10/24] sbuild: Introduce environment variables export API Date: Fri, 19 Nov 2021 13:13:19 +0100 Message-Id: <20211119121333.13805-11-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: dloKxdxRE1Gk 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} } 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}" +} -- 2.20.1