diff options
| author | Ron Yorston <rmy@pobox.com> | 2018-11-18 07:40:40 +0000 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-11-18 19:34:39 +0100 |
| commit | af694a4b290e9c664919c8c7bcc98a89dd2fbb7d (patch) | |
| tree | 81184f076fe0adf4483a2b42f48cf7c2ca61e1df | |
| parent | d1b2ae2d04eae05d76ad3c1a07e9092c7d46c773 (diff) | |
Ensure build works when KBUILD_OUTPUT is set, closes 11511
The build process for embedded scripts didn't have consistent
support for saving output to a different directory.
Signed-off-by: Ron Yorston <rmy@pobox.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | scripts/embedded_scripts | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -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="" |