From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:a5d:4582:: with SMTP id p2mr60120096wrq.364.1638968750798; Wed, 08 Dec 2021 05:05:50 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4092:: with SMTP id o18ls1391268wrp.1.gmail; Wed, 08 Dec 2021 05:05:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJwyerI3AL4OZfp3hE8KtdtN8h1nmEnWZYDExMzLoeLkMCA9pjk7fqbMbYp2s3Kn73V92sF0 X-Received: by 2002:a5d:5385:: with SMTP id d5mr56947393wrv.132.1638968749703; Wed, 08 Dec 2021 05:05:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638968749; cv=none; d=google.com; s=arc-20160816; b=CE/sq7SeAqbjbtvJmXVANKs3KtT3VejYov7hLRysXiWR1JzTP8JhzJvp6fo/t2rA4R KN0Q1BNiiEAXVwqS2/dqkEm1NGWziLei1I2b4v1V8RATL1DwECE6fzqJ1UqqiJ6tMna9 sRlLguUr8krwsHyqNHbawlFrfbXbmKb9e1cUBBi7KNkkLjRkVAhQ60PmZfYJs4Lu8TI5 DC9s1MuC4JyRS0RcoAos+UlkR1fa+B8DDU1ftaHYk2W8VogE5moQKZwcIx26/biPV/YY FGJivhUo1qCvFAyLDxNzKqK3SVmhqnhggdx3KzF1/nC68plk/hBBSpT/visAjaQ5nYY5 6FnQ== 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=mcLhlkOptA5YrVC3JeLKEMv6hB/SYHT/6JTEG0VFEK0=; b=TcZirlYHGSnmeAw/oXP3C96uAcGDpYZxYmhEsNnabuFfkvosTKqozJTyc/i096xrQ7 SS5/CLKnf/GYhqsb+qsZR+nY/AUaZ9y9RKv2uzB74vneP9waPMUQsIthonltAX3XGg2Z 4E7wTwtdGH1X4FQ0Psi4LPuQLbMMRd9YbzOr2RhJi89sDwpLKw18rzJu1dPRShxdNZZK XP5aX3USnipNEfnrYO95Yl0qc9azQvuRp9+dHcQLuIwA4dKkjo9hsgiEfYQu4s1/17Ve rud+rIFxvYx216ve6x5LAJAalGEK42y8yiMOhaW+7NAGP6EtXvMM3Bs96GRwE2qDaffh 20Aw== 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 o29si441753wms.1.2021.12.08.05.05.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Dec 2021 05:05:49 -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 1B8D5iLE009193 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Dec 2021 14:05:49 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 13/20] sbuild: Introduce environment variables export API Date: Wed, 8 Dec 2021 14:05:37 +0100 Message-Id: <20211208130544.15133-14-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211208130544.15133-1-ubely@ilbers.de> References: <20211208130544.15133-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: Z/zTDtDuR+Aw 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 208b00e1..3471595a 100644 --- a/meta/classes/sbuild.bbclass +++ b/meta/classes/sbuild.bbclass @@ -95,6 +95,19 @@ schroot_delete_configs() { 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}" +} + schroot_install() { schroot_create_configs APTS="$1" -- 2.20.1