[Nougat bringup][busybox] fix compiling error

1, make busybox ok;
2, mm in external/busybox not right,
        maybe need futher improving.

Change-Id: I3b0e6ff5debf0f12d76ee7a770b25c57e809cc40

5 files changed, 13 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 4de5690..37545bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,7 @@ Config.in
 core
 .gdb_history
 .gdbinit
+
+#ctags
+tags
+ctags
diff --git a/Android.mk b/Android.mk
index 1ba2aef..46ce46e 100755
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,4 @@
+####busybox #######
 LOCAL_PATH := $(call my-dir)
 BB_PATH := $(LOCAL_PATH)
 
@@ -55,19 +56,19 @@ busybox_prepare_full := $(bb_gen)/full/.config
 $(busybox_prepare_full): $(BB_PATH)/busybox-full.config
 	@echo -e ${CL_YLW}"Prepare config for busybox binary"${CL_RST}
 	@rm -rf $(bb_gen)/full
-	@rm -f $(shell find $(abspath $(call intermediates-dir-for,EXECUTABLES,busybox)) -name "*.o")
+	@rm -f $(addsuffix /*.o, $(abspath $(call intermediates-dir-for,EXECUTABLES,busybox)))
 	@mkdir -p $(@D)
 	@cat $^ > $@ && echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" >> $@
-	+make -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS)
+	$(MAKE) -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS)
 
 busybox_prepare_minimal := $(bb_gen)/minimal/.config
 $(busybox_prepare_minimal): $(BB_PATH)/busybox-minimal.config
 	@echo -e ${CL_YLW}"Prepare config for libbusybox"${CL_RST}
 	@rm -rf $(bb_gen)/minimal
-	@rm -f $(shell find $(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libbusybox)) -name "*.o")
+	@rm -f $(addsuffix /*.o, $(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libbusybox)))
 	@mkdir -p $(@D)
 	@cat $^ > $@ && echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" >> $@
-	+make -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS)
+	$(MAKE) -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS)
 
 KERNEL_MODULES_DIR ?= /system/lib/modules
 BUSYBOX_CONFIG := minimal full
diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c
index 0bbdef0..10dd0de 100755
--- a/debianutils/mktemp.c
+++ b/debianutils/mktemp.c
@@ -97,8 +97,8 @@ int mktemp_main(int argc UNUSED_PARAM, char **argv)
 		chp = concat_path_file(path, chp);
 
 	if (opts & OPT_u) {
-		//chp = mktemp(chp);
-		chp = mkstemp(chp);
+		chp = mktemp(chp);
+		/*chp = mkstemp(chp);*/
 		if (chp[0] == '\0')
 			goto error;
 	} else if (opts & OPT_d) {
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 6c1c0d3..1e9d11d 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -649,7 +649,7 @@ pid_t FAST_FUNC xfork(void)
 	pid_t pid;
 	pid = fork();
 	if (pid < 0) /* wtf? */
-		bb_perror_msg_and_die("vfork"+1);
+		bb_perror_msg_and_die("%s", "vfork"+1);
 	return pid;
 }
 #endif
diff --git a/networking/inetd.c b/networking/inetd.c
index b52d8d3..aebb917 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -1328,7 +1328,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
 					pid = vfork();
 
 				if (pid < 0) { /* fork error */
-					bb_perror_msg("vfork"+1);
+					bb_perror_msg("%s", "vfork"+1);
 					sleep(1);
 					restore_sigmask(&omask);
 					maybe_close(new_udp_fd);