[Buildroot] [PATCH 1/2] busybox 1.18.3: add wget and build system patches

[Buildroot] [PATCH 1/2] busybox 1.18.3: add wget and build system patches

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../busybox-1.18.3/busybox-1.18.3-buildsys.patch   |   10 +++
 .../busybox-1.18.3/busybox-1.18.3-wget.patch       |   69 ++++++++++++++++++++
 2 files changed, 79 insertions(+), 0 deletions(-)
 create mode 100644 package/busybox/busybox-1.18.3/busybox-1.18.3-buildsys.patch
 create mode 100644 package/busybox/busybox-1.18.3/busybox-1.18.3-wget.patch

diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-buildsys.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-buildsys.patch
new file mode 100644
index 0000000..330b73f
--- /dev/null
+++ b/package/busybox/busybox-1.18.3/busybox-1.18.3-buildsys.patch
@@ -0,0 +1,10 @@
+--- busybox-1.18.3/Config.in
++++ busybox-1.18.3-buildsys/Config.in
+@@ -126,7 +126,6 @@ config FEATURE_INSTALLER
+ config INSTALL_NO_USR
+ 	bool "Don't use /usr"
+ 	default n
+-	depends on FEATURE_INSTALLER
+ 	help
+ 	  Disable use of /usr. busybox --install and "make install"
+ 	  will install applets only to /bin and /sbin,
diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-wget.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-wget.patch
new file mode 100644
index 0000000..c7ea736
--- /dev/null
+++ b/package/busybox/busybox-1.18.3/busybox-1.18.3-wget.patch
@@ -0,0 +1,69 @@
+--- busybox-1.18.3/networking/wget.c
++++ busybox-1.18.3-wget/networking/wget.c
+@@ -446,7 +446,7 @@ static FILE* prepare_ftp_session(FILE **
+ 
+ static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)
+ {
+-	char buf[512];
++	char buf[4*1024]; /* made bigger to speed up local xfers */
+ #if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
+ # if ENABLE_FEATURE_WGET_TIMEOUT
+ 	unsigned second_cnt;
+@@ -506,8 +506,11 @@ static void NOINLINE retrieve_file_data(
+ 			G.transferred += n;
+ 			progress_meter(PROGRESS_BUMP);
+ #endif
+-			if (G.got_clen)
++			if (G.got_clen) {
+ 				G.content_len -= n;
++				if (G.content_len == 0)
++					break;
++			}
+ 		}
+ 
+ 		if (!G.chunked)
+@@ -706,6 +709,11 @@ int wget_main(int argc UNUSED_PARAM, cha
+ 		fprintf(sfp, "Host: %s\r\nUser-Agent: %s\r\n",
+ 			target.host, user_agent);
+ 
++		/* Ask server to close the connection as soon as we are done
++		 * (IOW: we do not intend to send more requests)
++		 */
++		fprintf(sfp, "Connection: close\r\n");
++
+ #if ENABLE_FEATURE_WGET_AUTHENTICATION
+ 		if (target.user) {
+ 			fprintf(sfp, "Proxy-Authorization: Basic %s\r\n"+6,
+@@ -719,22 +727,25 @@ int wget_main(int argc UNUSED_PARAM, cha
+ 
+ 		if (G.beg_range)
+ 			fprintf(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range);
++
+ #if ENABLE_FEATURE_WGET_LONG_OPTIONS
+ 		if (extra_headers)
+ 			fputs(extra_headers, sfp);
+ 
+ 		if (opt & WGET_OPT_POST_DATA) {
+ 			char *estr = URL_escape(post_data);
+-			fprintf(sfp, "Content-Type: application/x-www-form-urlencoded\r\n");
+-			fprintf(sfp, "Content-Length: %u\r\n" "\r\n" "%s",
+-					(int) strlen(estr), estr);
+-			/*fprintf(sfp, "Connection: Keep-Alive\r\n\r\n");*/
+-			/*fprintf(sfp, "%s\r\n", estr);*/
++			fprintf(sfp,
++				"Content-Type: application/x-www-form-urlencoded\r\n"
++				"Content-Length: %u\r\n"
++				"\r\n"
++				"%s",
++				(int) strlen(estr), estr
++			);
+ 			free(estr);
+ 		} else
+ #endif
+-		{ /* If "Connection:" is needed, document why */
+-			fprintf(sfp, /* "Connection: close\r\n" */ "\r\n");
++		{
++			fprintf(sfp, "\r\n");
+ 		}
+ 
+ 		fflush(sfp);
-- 
1.7.3.4

[Buildroot] [PATCH 2/2] target gcc: fix recompilation issue

[Gustavo Zacarias]

gcc_target wants uclibc_target which is now first stage uclibc (not
real, from the NPTL build stage addition).
This triggers gcc-final to be rebuilt (albeit cached) and reinstalled,
thus touching all the stamps around and triggering a rebuild of
gcc_target.
Switch to $(STAMP_DIR)/gcc_libs_target_installed instead so that we only
depend on the last stage of cross gcc being installed to rebuild.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 toolchain/gcc/gcc-uclibc-4.x.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 2c857dc..96bebd6 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -558,7 +558,7 @@ $(TARGET_DIR)/usr/bin/gcc: $(GCC_BUILD_DIR4)/.compiled
 	#rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
 	touch -c $@
 
-gcc_target: uclibc_target $(GCC_TARGET_PREREQ) binutils $(TARGET_DIR)/usr/bin/gcc
+gcc_target: $(STAMP_DIR)/gcc_libs_target_installed $(GCC_TARGET_PREREQ) binutils $(TARGET_DIR)/usr/bin/gcc
 
 gcc_target-clean:
 	rm -rf $(GCC_BUILD_DIR4)
-- 
1.7.3.4

[Buildroot] [PATCH 1/2] busybox 1.18.3: add wget and build system patches

[Peter Korsgaard]

>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/2] target gcc: fix recompilation issue

[Peter Korsgaard]

>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> gcc_target wants uclibc_target which is now first stage uclibc (not
 Gustavo> real, from the NPTL build stage addition).
 Gustavo> This triggers gcc-final to be rebuilt (albeit cached) and reinstalled,
 Gustavo> thus touching all the stamps around and triggering a rebuild of
 Gustavo> gcc_target.
 Gustavo> Switch to $(STAMP_DIR)/gcc_libs_target_installed instead so that we only
 Gustavo> depend on the last stage of cross gcc being installed to rebuild.

Committed, thanks.

-- 
Bye, Peter Korsgaard