Merge branch 'busybox' into merge

1 files changed, 6 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 966578a0f..40ed634a6 100644
--- a/Makefile
+++ b/Makefile
@@ -612,7 +612,8 @@ quiet_cmd_busybox__ ?= LINK    $@
       "$(LDFLAGS) $(EXTRA_LDFLAGS)" \
       "$(core-y)" \
       "$(libs-y)" \
-      "$(LDLIBS)"
+      "$(LDLIBS)" \
+      && $(srctree)/scripts/generate_BUFSIZ.sh --post include/common_bufsiz.h
 
 # Generate System.map
 quiet_cmd_sysmap = SYSMAP
@@ -846,12 +847,15 @@ export CPPFLAGS_busybox.lds += -P -C -U$(ARCH)
 #       Split autoconf.h into include/linux/config/*
 quiet_cmd_gen_bbconfigopts = GEN     include/bbconfigopts.h
       cmd_gen_bbconfigopts = $(srctree)/scripts/mkconfigs include/bbconfigopts.h include/bbconfigopts_bz2.h
+quiet_cmd_gen_common_bufsiz = GEN     include/common_bufsiz.h
+      cmd_gen_common_bufsiz = $(srctree)/scripts/generate_BUFSIZ.sh include/common_bufsiz.h
 quiet_cmd_split_autoconf   = SPLIT   include/autoconf.h -> include/config/*
       cmd_split_autoconf   = scripts/basic/split-include include/autoconf.h include/config
 #bbox# piggybacked generation of few .h files
 include/config/MARKER: scripts/basic/split-include include/autoconf.h
         $(call cmd,split_autoconf)
         $(call cmd,gen_bbconfigopts)
+        $(call cmd,gen_common_bufsiz)
         @touch $@
 
 # Generate some files
@@ -967,6 +971,7 @@ CLEAN_FILES +=	busybox$(EXEEXT) busybox_unstripped* busybox.links \
 MRPROPER_DIRS  += include/config include2
 MRPROPER_FILES += .config .config.old include/asm .version .old_version \
                   include/NUM_APPLETS.h \
+                  include/common_bufsiz.h \
                   include/autoconf.h \
                   include/bbconfigopts.h \
                   include/bbconfigopts_bz2.h \