Patchwork Makefile: revert BUILD_DIR export

login
register
mail settings
Submitter Gustavo Zacarias
Date Oct. 24, 2013, 6:11 p.m.
Message ID <1382638285-8118-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/285999/
State Accepted
Commit 4513d785156f87707687081aeb8582c56b684cc5
Headers show

Comments

Gustavo Zacarias - Oct. 24, 2013, 6:11 p.m.
Revert commit feb0877015cc0c644129e69276b3000c83742750
U-Boot uses $(BUILD_DIR) and causes issues, other packages might as
well. Fixes:
http://autobuild.buildroot.net/results/1f6/1f65289d5c284caa82a4e9137613f792797ee08a/
http://autobuild.buildroot.net/results/6a5/6a5f77483e908dc96d08824cf9113402431bace7/

It should probably be named somewhat more uniquely.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 Makefile                         | 1 -
 docs/manual/customize-rootfs.txt | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)
Peter Korsgaard - Oct. 25, 2013, 6:10 a.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 > Revert commit feb0877015cc0c644129e69276b3000c83742750
 > U-Boot uses $(BUILD_DIR) and causes issues, other packages might as
 > well. Fixes:
 > http://autobuild.buildroot.net/results/1f6/1f65289d5c284caa82a4e9137613f792797ee08a/
 > http://autobuild.buildroot.net/results/6a5/6a5f77483e908dc96d08824cf9113402431bace7/

 > It should probably be named somewhat more uniquely.

Committed, thanks.

Patch

diff --git a/Makefile b/Makefile
index 9528703..f266e2d 100644
--- a/Makefile
+++ b/Makefile
@@ -291,7 +291,6 @@  export STAGING_DIR
 export HOST_DIR
 export BINARIES_DIR
 export BASE_DIR
-export BUILD_DIR
 
 ################################################################################
 #
diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt
index 158389c..49a6b4b 100644
--- a/docs/manual/customize-rootfs.txt
+++ b/docs/manual/customize-rootfs.txt
@@ -41,7 +41,6 @@  there are a few ways to customize the resulting target filesystem.
     - +BUILDROOT_CONFIG+: the path to the Buildroot .config file
     - +HOST_DIR+, +STAGING_DIR+, +TARGET_DIR+: see
       xref:generic-package-reference[]
-    - +BUILD_DIR+: the directory where packages are extracted and built
     - +BINARIES_DIR+: the place where all binary files (aka images) are
       stored
     - +BASE_DIR+: the base output directory
@@ -80,7 +79,7 @@  in one of these _post-image scripts_ will require special handling
 Just like for the _post-build scripts_ mentioned above, you also have
 access to the following environment variables from your _post-image
 scripts_: +BUILDROOT_CONFIG+, +HOST_DIR+, +STAGING_DIR+, +TARGET_DIR+,
-+BUILD_DIR+, +BINARIES_DIR+ and +BASE_DIR+.
++BINARIES_DIR+ and +BASE_DIR+.
 
 Additionally, each of the +BR2_ROOTFS_POST_BUILD_SCRIPT+ and
 +BR2_ROOTFS_POST_IMAGE_SCRIPT+ scripts will be passed the arguments