From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:ac2:44c5:: with SMTP id d5mr19740158lfm.275.1638968749119; Wed, 08 Dec 2021 05:05:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1320:: with SMTP id x32ls1233395lfu.2.gmail; Wed, 08 Dec 2021 05:05:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyvXvPLM3O9Ji80MoKqxPwPGMv+N1IHTEpTuhO3UPNwNTc1J2EdVyq2O6AwY+g+glCB3h6V X-Received: by 2002:ac2:4e09:: with SMTP id e9mr45760850lfr.657.1638968747715; Wed, 08 Dec 2021 05:05:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638968747; cv=none; d=google.com; s=arc-20160816; b=KKVkzOBUpfHUAwd7+BOqvRJOEV39FufF5DbzKs0u8EofOYHnnORjlHKzP0+npiePlp MPoijNKsTiICW4TvN7bPeNMwSW0/ygZrtvhRDoV6r8T6LmE+VzRgAgyUR36sM1x2ITud hRXjLj0o7TopQX8/kWSexyMnrrjwPieRmKprIk44E53fu9RjFv1yMV3Owxm9Po2OOllF lsDo0PGs+msvyelMUOB/OlmgLK/aY3BDnbwlYztqO9H0OpLmqAlmJo25zoG5WDzj+Noh GuiTyoV21jFmZWroeK26Pb5flhtwdQNtqYzaBR7L0idCWdl5D5/6RxQtVzaXMZVqa+8w T15A== 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=o65ruSohxHUji0znhapcaj+b8u3WvLDjSRIGFAd0+uE=; b=gZkh6vcFWML+25Dsu3+EhoR7Km2k0Htju2NDpiHvxB4OH53+3M/i9hXg/7qCB4pY1q H6wfojroJy1UcEYsc47g9qk1vP/TzlCNwlrr/5a9Iai3FXx5hS/fa3cAlK08DPjwxleI 2p2/tdosWDbPXBJ4MHVAHonJj9uIyCaSbO8nWt4I2hGi30FfPMmGv2jhemkG2PrTzhdV IrD/OOUPzHgDXPoHaVkHmAAWYy0z9fD4UlDh3r/u6IJ/1wqSvOzPukc9YwSsxnovPWER GrkT8RIZ4qemYfepLIg0dMKHY0w2zcTwICbO/4HgMn7MoGBFKalUZIEHt76SNx7+tsP/ Uh/w== 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 b11si171476lfv.12.2021.12.08.05.05.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 Dec 2021 05:05:47 -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 1B8D5iL7009193 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 8 Dec 2021 14:05:46 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 06/20] optee-os: Do not use shell environment Date: Wed, 8 Dec 2021 14:05:30 +0100 Message-Id: <20211208130544.15133-7-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: BY4GbKUBXA/X From: Anton Mikanovich To make package build process independent of the shell environment we should remove OPTEE_PLATFORM and OPTEE_EXTRA_BUILDARGS passing through export call. So we migrate to template-based debian/rules file. Signed-off-by: Anton Mikanovich --- .../optee-os/files/debian/{rules => rules.tmpl} | 4 ++-- meta/recipes-bsp/optee-os/optee-os-custom.inc | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) rename meta/recipes-bsp/optee-os/files/debian/{rules => rules.tmpl} (75%) diff --git a/meta/recipes-bsp/optee-os/files/debian/rules b/meta/recipes-bsp/optee-os/files/debian/rules.tmpl similarity index 75% rename from meta/recipes-bsp/optee-os/files/debian/rules rename to meta/recipes-bsp/optee-os/files/debian/rules.tmpl index d2e9900f..9ab80dfe 100755 --- a/meta/recipes-bsp/optee-os/files/debian/rules +++ b/meta/recipes-bsp/optee-os/files/debian/rules.tmpl @@ -12,8 +12,8 @@ export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- endif override_dh_auto_build: - CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLATFORM=$(OPTEE_PLATFORM) \ - $(OPTEE_EXTRA_BUILDARGS) + CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLATFORM=${OPTEE_PLATFORM} \ + ${OPTEE_EXTRA_BUILDARGS} %: dh $@ diff --git a/meta/recipes-bsp/optee-os/optee-os-custom.inc b/meta/recipes-bsp/optee-os/optee-os-custom.inc index 1bd51969..23612d81 100644 --- a/meta/recipes-bsp/optee-os/optee-os-custom.inc +++ b/meta/recipes-bsp/optee-os/optee-os-custom.inc @@ -22,8 +22,8 @@ DEBIAN_BUILD_DEPENDS ?= "python3-pycryptodome:native, python3-pyelftools" PROVIDES += "optee-os-${OPTEE_NAME}" -TEMPLATE_FILES = "debian/control.tmpl" -TEMPLATE_VARS += "OPTEE_NAME DEBIAN_BUILD_DEPENDS" +TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl" +TEMPLATE_VARS += "OPTEE_NAME DEBIAN_BUILD_DEPENDS OPTEE_PLATFORM OPTEE_EXTRA_BUILDARGS" # split strip platform flavor, if any, from the specified platform string OPTEE_PLATFORM_BASE = "${@d.getVar('OPTEE_PLATFORM').split('-')[0]}" @@ -39,8 +39,3 @@ do_prepare_build() { ${S}/debian/optee-os-${OPTEE_NAME}.install done } - -dpkg_runbuild_prepend() { - export OPTEE_PLATFORM="${OPTEE_PLATFORM}" - export OPTEE_EXTRA_BUILDARGS="${OPTEE_EXTRA_BUILDARGS}" -} -- 2.20.1