emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure build works when KBUILD_OUTPUT is set, closes 11511

Browse Source 
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>
This commit is contained in:
Ron Yorston 2018-11-18 07:40:40 +00:00 committed by Denys Vlasenko
parent d1b2ae2d04
commit af694a4b29
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -361,7 +361,7 @@ scripts/basic/%: scripts_basic ;
# This target generates Kbuild's and Config.in's from *.c files # This target generates Kbuild's and Config.in's from *.c files
PHONY += gen_build_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) $(Q)$(srctree)/scripts/gen_build_files.sh $(srctree) $(objtree)
# bbox: we have helpers in applets/ # 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 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 cmd_gen_embedded_scripts = $(srctree)/scripts/embedded_scripts include/embedded_scripts.h $(srctree)/embed $(srctree)/applets_sh
#bbox# piggybacked generation of few .h files #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,split_autoconf)
$(call cmd,gen_bbconfigopts) $(call cmd,gen_bbconfigopts)
$(call cmd,gen_common_bufsiz) $(call cmd,gen_common_bufsiz)

2
scripts/embedded_scripts
View File

@ -20,7 +20,7 @@ if [ -d "$custom_loc" ]
then then
custom_scripts=$(cd $custom_loc; ls * 2>/dev/null) custom_scripts=$(cd $custom_loc; ls * 2>/dev/null)
fi fi
all_scripts=$(applets/busybox.mkscripts) all_scripts=$($srctree/applets/busybox.mkscripts)
# all_scripts includes applet scripts and custom scripts, sort them out # all_scripts includes applet scripts and custom scripts, sort them out
applet_scripts="" applet_scripts=""