Source: u-boot
Severity: wishlist
Tags: patch

Clarify scope of TOOLSDIR in debian/rules
>From 2f3a6f8b946a7caf37e59f473ebe6cb112bb41e5 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nico...@debian.org>
Date: Sat, 9 Jan 2021 20:30:08 +0100
Subject: Clarify scope of TOOLSDIR in debian/rules

The variable is only used in the build-tools target, not at all during
build-indep.

diff --git a/debian/rules b/debian/rules
index 19a61e3cb7..1579562e59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,6 @@ configs/am335x_boneblack_defconfig: 
configs/am335x_evm_defconfig
        sed -e 's,CONFIG_OF_LIST=.*,CONFIG_OF_LIST="am335x-evm 
am335x-boneblack",g' \
                configs/am335x_evm_defconfig > 
configs/am335x_boneblack_defconfig
 
-override_dh_auto_build-arch: TOOLSDIR := debian/build/tools
 override_dh_auto_build-arch: TARGETARCH := $(DEB_HOST_ARCH)
 ifeq (,$(filter pkg.uboot.notools,$(DEB_BUILD_PROFILES)))
 override_dh_auto_build-arch: build-targets build-tools
@@ -54,7 +53,6 @@ else
 override_dh_auto_build-arch: build-targets
 endif
 
-override_dh_auto_build-indep: TOOLSDIR := debian/build/tools
 override_dh_auto_build-indep: TARGETARCH := all
 override_dh_auto_build-indep: build-targets
 
@@ -120,6 +118,7 @@ build-targets: configs/novena-rawsd_defconfig 
configs/am335x_boneblack_defconfig
                        >> debian/build/targets.$$subarch; \
        done
 
+TOOLSDIR := debian/build/tools
 build-tools:
        $(MAKE) V=$(VERBOSE) O=$(TOOLSDIR) CROSS_COMPILE=$(CROSS_COMPILE) 
tools-only_defconfig
        cp $(TOOLSDIR)/.config $(TOOLSDIR)/config

Reply via email to