From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989231260094693376 X-Received: by 2002:a17:907:7e9a:: with SMTP id qb26mr17420916ejc.490.1627307218131; Mon, 26 Jul 2021 06:46:58 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:fd13:: with SMTP id i19ls1263412eds.2.gmail; Mon, 26 Jul 2021 06:46:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy6uSnUoovh7HBFQ6FsBK7H+YBH+kjQwGHwz9Wq+5OMj4aLWaPU70rTbM+BCpAb6KvoA/L2 X-Received: by 2002:a05:6402:3089:: with SMTP id de9mr21645297edb.69.1627307217241; Mon, 26 Jul 2021 06:46:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627307217; cv=none; d=google.com; s=arc-20160816; b=oZK/p4fRWmecfpRneWAwrUSh67oQ5A+jCsesAH8KLF86OK3zfxj1kSOf6AlPpJWGBH 7bS7u2S47BViyMRat50L50AZqKtzjm9Ejig7EJIIvcOa8KcBUw6bNRoY4/s4vbGd0u+X h72TQL9Zmp0ZuvJeZ6r74e8NrhmNzjvTE2Bux5sVW3B6+oKsCCKDVOSheTQlvBCIqD/8 RWbygkbto1LDwOThsqpgf6Mk/mvmLuNVMhOSWKDyXOQKe9WW9t/f8uXOR59HdG8drwX3 nIBVeq2cLEWMs6TSk+wYkxRtfpYlPBexCjOE0mZkQ2OqWM0N63Ycw+9nvlvZWukIUC2K M19w== 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=dwWC53mxZKrWX86YqM9fNfLvgCUR8zp7PSaOhqyKnZk=; b=RUOAxZDXcgUHvmAj6mNzIFkUn6neF1GkkoBfassYCQu6XDX4V3vbHrtWVcICwenAjK LeMiRnAmRAPjDSzl5dF/vYylNGTJHQeRbypf7wlCOPBUE2zpCENK+Ga1GD5oTdbw71cm dF7ZjQGjKcH3nL7SkxklhpQ9Z+tGMkekEfwi3DuJjGnD7ATt4OmqRgGbOkoSm2YaTsVt yZgMAAgCfu3ruLfW/wOX2j9FyrwfaUoJyaSQRUbU8Um/eZUro4DiVBk8Oir87TYPjtSv bXK7iHI3dLmk5Q2XYKJoyBU+Br218qj+VX43o0jUySj4n0zZV1ngNo4RpCulJYY2OTB4 /Zaw== 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 s18si2243819ejo.1.2021.07.26.06.46.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jul 2021 06:46:57 -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 16QDknuw019679 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Jul 2021 15:46:56 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [RFC 06/15] trusted-firmware: Do not use shell environment Date: Mon, 26 Jul 2021 16:46:27 +0300 Message-Id: <20210726134636.30800-7-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: h54Z4krD2tJK 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 70e1dd6..6dbf44d 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 1142bfc..3fe4c41 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.25.1