From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989231260094693376 X-Received: by 2002:a17:906:109d:: with SMTP id u29mr16788301eju.489.1627307221862; Mon, 26 Jul 2021 06:47:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:e3c7:: with SMTP id c7ls1262974edm.1.gmail; Mon, 26 Jul 2021 06:47:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxj8o1ftmOEvEiQalCvueJn/h+9xWDh/RY8YNlSHosknHZwofjmwuxtICL2OGTRhsKr6RCI X-Received: by 2002:aa7:d296:: with SMTP id w22mr8537217edq.170.1627307221036; Mon, 26 Jul 2021 06:47:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627307221; cv=none; d=google.com; s=arc-20160816; b=jJuz9LTHJcRd0WvG+T5/MLQ5Tfy4dX9BebDvgeJW67WT8Z0XoDzMx7Fk0bIOyDB1PQ KZchcXR1oK0LQn28FkD/JXazvK2poG/SWKrSKXqT4/Z8iTOfA5sr/ngo26rdTQOsVcQL qL8lWJRaWnvaDdvpRi7gpzXmG0Fu4t+bMgGP9/rTBhhA1bEfxDmGysUdfIxPwk7Z3Er0 dG8SMhy6Bjbo+ZGSkthlZBb6EqGpwFMmaGZyC95UCroqxBRmT9fxV99YkmKSlSmhMvdz gMEHv7mEXPdqLFHis5yvznW1sCr1pv+m64fL/vg0gFU3y0HBeguMWIL4U4xOdm3EePdZ g+cA== 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:cc:to:from; bh=dI1jibjLrEzVVKu9MHwx4g5hJBq26t6oRhMPNiVnGVM=; b=H/lc7hmamIVDqJ36nVr2u1cglpXinR7fQTTrM/eqe35uNcUFobuw9gXEhSbeBkJC3P B10qyEAhC8uB/RkO0gqWiUyiYAJlG7M4nKU+KevXjvIDZlEqhVNyBtsmzXYHH4OrHG1L rBtLi8STPPp5LkfjZyB35JxyLtWCwsnoMS5kcZR4LsW5bzUW3w5vBj3KzFuA1RG4n84G n7YKR01x4YviIk5UnSc0OJTI9bJpR08ZbnFUunOPFzp6rBKa/nujC6p9pyUP6Vp8FVtr HcrWtqmKBk5pztWiW47Lh9/nN+FHs9Jh+CHPcFDyYOoXovLRRWQZqVtSLPoy1EMheDbz ub9Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id s8si1319050edd.4.2021.07.26.06.47.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jul 2021 06:47:01 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-198-62-214-37.mgts.dynamic.pppoe.byfly.by [37.214.62.198] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 16QDknv2019679 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Jul 2021 15:47:00 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [RFC 10/15] sbuild: Introduce environment variables export API Date: Mon, 26 Jul 2021 16:46:31 +0300 Message-Id: <20210726134636.30800-11-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210726134636.30800-1-amikan@ilbers.de> References: <20210726134636.30800-1-amikan@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: hqfaYpxxidwU 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 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} } 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}" +} -- 2.25.1