[PATCH] Ensure build works when KBUILD_OUTPUT is set, closes 11511

[Ron Yorston]

The build process for embedded scripts didn't have consistent
support for saving output to a different directory.

Signed-off-by: Ron Yorston <***@pobox.com>
---
Makefile | 4 ++--
scripts/embedded_scripts | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index c19280476..4b5a01df9 100644
--- a/Makefile
+++ b/Makefile
@@ -361,7 +361,7 @@ scripts/basic/%: scripts_basic ;

# This target generates Kbuild's and Config.in's from *.c files
PHONY += gen_build_files
-gen_build_files: $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) $(wildcard embed/*)
+gen_build_files: $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) $(wildcard $(srctree)/embed/*)
$(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree)

# bbox: we have helpers in applets/
@@ -853,7 +853,7 @@ quiet_cmd_split_autoconf = SPLIT include/autoconf.h -> include/config/*
quiet_cmd_gen_embedded_scripts = GEN include/embedded_scripts.h
cmd_gen_embedded_scripts = $(srctree)/scripts/embedded_scripts include/embedded_scripts.h $(srctree)/embed $(srctree)/applets_sh
#bbox# piggybacked generation of few .h files
-include/config/MARKER: scripts/basic/split-include include/autoconf.h $(wildcard embed/*) scripts/embedded_scripts
+include/config/MARKER: scripts/basic/split-include include/autoconf.h $(wildcard $(srctree)/embed/*) $(srctree)/scripts/embedded_scripts
$(call cmd,split_autoconf)
$(call cmd,gen_bbconfigopts)
$(call cmd,gen_common_bufsiz)
diff --git a/scripts/embedded_scripts b/scripts/embedded_scripts
index b7a023ce0..c2e7c6961 100755
--- a/scripts/embedded_scripts
+++ b/scripts/embedded_scripts
@@ -20,7 +20,7 @@ if [ -d "$custom_loc" ]
then
custom_scripts=$(cd $custom_loc; ls * 2>/dev/null)
fi
-all_scripts=$(applets/busybox.mkscripts)
+all_scripts=$($srctree/applets/busybox.mkscripts)

# all_scripts includes applet scripts and custom scripts, sort them out
applet_scripts=""

[Denys Vlasenko]

Applied, thanks!

Post by Ron Yorston
The build process for embedded scripts didn't have consistent
support for saving output to a different directory.
---
Makefile | 4 ++--
scripts/embedded_scripts | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index c19280476..4b5a01df9 100644
--- a/Makefile
+++ b/Makefile
@@ -361,7 +361,7 @@ scripts/basic/%: scripts_basic ;
# This target generates Kbuild's and Config.in's from *.c files
PHONY += gen_build_files
-gen_build_files: $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) $(wildcard embed/*)
+gen_build_files: $(wildcard $(srctree)/*/*.c) $(wildcard $(srctree)/*/*/*.c) $(wildcard $(srctree)/embed/*)
$(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree)
# bbox: we have helpers in applets/
@@ -853,7 +853,7 @@ quiet_cmd_split_autoconf = SPLIT include/autoconf.h -> include/config/*
quiet_cmd_gen_embedded_scripts = GEN include/embedded_scripts.h
cmd_gen_embedded_scripts = $(srctree)/scripts/embedded_scripts include/embedded_scripts.h $(srctree)/embed $(srctree)/applets_sh
#bbox# piggybacked generation of few .h files
-include/config/MARKER: scripts/basic/split-include include/autoconf.h $(wildcard embed/*) scripts/embedded_scripts
+include/config/MARKER: scripts/basic/split-include include/autoconf.h $(wildcard $(srctree)/embed/*) $(srctree)/scripts/embedded_scripts
$(call cmd,split_autoconf)
$(call cmd,gen_bbconfigopts)
$(call cmd,gen_common_bufsiz)
diff --git a/scripts/embedded_scripts b/scripts/embedded_scripts
index b7a023ce0..c2e7c6961 100755
--- a/scripts/embedded_scripts
+++ b/scripts/embedded_scripts
@@ -20,7 +20,7 @@ if [ -d "$custom_loc" ]
then
custom_scripts=$(cd $custom_loc; ls * 2>/dev/null)
fi
-all_scripts=$(applets/busybox.mkscripts)
+all_scripts=$($srctree/applets/busybox.mkscripts)
# all_scripts includes applet scripts and custom scripts, sort them out
applet_scripts=""
--
2.19.1
_______________________________________________
busybox mailing list
http://lists.busybox.net/mailman/listinfo/busybox