From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7032253102499561472 X-Received: by 2002:ac2:53ad:: with SMTP id j13mr30168768lfh.225.1637324018049; Fri, 19 Nov 2021 04:13:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3e10:: with SMTP id i16ls223062lfv.3.gmail; Fri, 19 Nov 2021 04:13:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJyY4YIjej1AkKGQ9Dd0uTBaXSRhojGLJGu0yfxD8clOBkpCmdMC2a4hRQ+dAYMbpDwmbXSA X-Received: by 2002:a05:6512:4025:: with SMTP id br37mr30958967lfb.2.1637324016973; Fri, 19 Nov 2021 04:13:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637324016; cv=none; d=google.com; s=arc-20160816; b=RFjVp306dmCTY9zfD+D+s1TYwfzg87ZDO4M/M2rqP8UQziO4pgzsLHRyUyHF3GpJjQ dVfcdilExOeHlQ7AHHCZ92r6WfFSBo+G8RwJvYff6RLFqunPKNx3Ya/edYWPzGDeXYzs WIOS+lDmG9F0S6XCH2y214dRbVd/N+k98jiGeyv0dOcst62/zeUQmgX+X2MpWAG32KvU KUjuxgATS98ussisitS9Ju5t7eDRj66+YtAWbB2mSaUecTRTwP2nOdbFvjqTHWHKN6UT +0+q/NAMW+o0STinvIkuLwQXuIf+Um99Cv9Y/lkGv6MxvzZg8MR5/rKVpzKia3G8wMca WzFA== 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=Y+iTkof65JB6S5TLAdMPKlXGALesk0eP7K2my6AIMtU=; b=rW6W6uPMK9Hy43aaBRoYZEuEGyYW2Cepwp6vUR1Uw9qfSGhVla+0AoyKK6OdtsvsCQ /I1qEWYWWSAmtTo00xopYsTY8SfiKEtQQ1ol0gVKPnVjCQ5b87WMzkCivc3397zhCIm8 jvI+eLqPtZah48Lf5p59CyxSZMHSDCSdUWa3OC83uoukDO/L855iRvlDKbKYuDLbdrA+ JQoNXDvbzViSug0jHiXQlRTZlHjPw7HZoDDl5ln0YWLDMABsLmlj8tTSh126KmR2k/Lf J3yXJ4E3+pd+/DyMkyIKpxDCOFJExAyHm3b7oYrsK20I6ZxEC44cn0FFnHwxEBdstkxB aiEw== 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 c15si205771lfv.8.2021.11.19.04.13.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 19 Nov 2021 04:13:36 -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 1AJCDX7G021829 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 19 Nov 2021 13:13:36 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 06/24] trusted-firmware: Do not use shell environment Date: Fri, 19 Nov 2021 13:13:15 +0100 Message-Id: <20211119121333.13805-7-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: FV1+zykNRAEs From: Anton Mikanovich To make package build process independent of the shell environment we should remove TF_A_PLATFORM and TF_A_EXTRA_BUILDARGS passing through export call. So we migrate to template-based debian/rules file. Signed-off-by: Anton Mikanovich --- .../files/debian/{rules => rules.tmpl} | 4 ++-- .../trusted-firmware-a/trusted-firmware-a-custom.inc | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) rename meta/recipes-bsp/trusted-firmware-a/files/debian/{rules => rules.tmpl} (77%) diff --git a/meta/recipes-bsp/trusted-firmware-a/files/debian/rules b/meta/recipes-bsp/trusted-firmware-a/files/debian/rules.tmpl similarity index 77% rename from meta/recipes-bsp/trusted-firmware-a/files/debian/rules rename to meta/recipes-bsp/trusted-firmware-a/files/debian/rules.tmpl index 70e1dd66..6dbf44db 100755 --- a/meta/recipes-bsp/trusted-firmware-a/files/debian/rules +++ b/meta/recipes-bsp/trusted-firmware-a/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) PLAT=$(TF_A_PLATFORM) \ - $(TF_A_EXTRA_BUILDARGS) + CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLAT=${TF_A_PLATFORM} \ + ${TF_A_EXTRA_BUILDARGS} %: dh $@ diff --git a/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc b/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc index 1142bfce..3fe4c415 100644 --- a/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc +++ b/meta/recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc @@ -22,8 +22,8 @@ DEBIAN_BUILD_DEPENDS ?= "" PROVIDES += "trusted-firmware-a-${TF_A_NAME}" -TEMPLATE_FILES = "debian/control.tmpl" -TEMPLATE_VARS += "TF_A_NAME DEBIAN_BUILD_DEPENDS" +TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl" +TEMPLATE_VARS += "TF_A_NAME DEBIAN_BUILD_DEPENDS TF_A_PLATFORM TF_A_EXTRA_BUILDARGS" do_prepare_build() { cp -r ${WORKDIR}/debian ${S}/ @@ -35,9 +35,7 @@ do_prepare_build() { echo "build/${TF_A_PLATFORM}/$binary /usr/lib/trusted-firmware-a/${TF_A_NAME}/" >> \ ${S}/debian/trusted-firmware-a-${TF_A_NAME}.install done -} -dpkg_runbuild_prepend() { - export TF_A_PLATFORM="${TF_A_PLATFORM}" - export TF_A_EXTRA_BUILDARGS="${TF_A_EXTRA_BUILDARGS}" + # restore execute permissions + chmod a+x ${S}/debian/rules } -- 2.20.1