From 1300cb55621d1565a1b09e907963d77f272eacb4 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 14 Jan 2013 10:02:29 +0100 Subject: Makefile: don't export O to the environment Several projects use the kernel style O= syntax to build out of tree, and atleast uClibc doesn't check that it was explictly passed on the command line, so setting it in the environment breaks the build. Signed-off-by: Peter Korsgaard --- Makefile | 2 +- docs/manual/customize-rootfs.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 16b5ef41b..f40863247 100644 --- a/Makefile +++ b/Makefile @@ -291,7 +291,7 @@ export TARGET_DIR export STAGING_DIR export HOST_DIR export BINARIES_DIR -export BASE_DIR O # O and BASE_DIR are the same +export BASE_DIR ############################################################# # diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt index 4d3b55970..6399699bd 100644 --- a/docs/manual/customize-rootfs.txt +++ b/docs/manual/customize-rootfs.txt @@ -43,7 +43,7 @@ there are a few ways to customize the resulting target filesystem. xref:generic-package-reference[] - +BINARIES_DIR+: the place where all binary files (aka images) are stored - - +BASE_DIR+ (or +O+): the base output directory + - +BASE_DIR+: the base output directory * A special package, 'customize', stored in +package/customize+ can be used. You can put all the files that you want to see in the final -- cgit v1.2.3