# HG changeset patch # User Rob Landley # Date 1411699239 18000 # Node ID 00e528cdad9583fe9765cf01250812e1f2dadfa0 # Parent ee7b1eda1a633316e1fc7a46c92015115ed4e9d3 Upgrade toybox version. diff -r ee7b1eda1a63 -r 00e528cdad95 download.sh --- a/download.sh Mon Sep 15 01:28:01 2014 -0500 +++ b/download.sh Thu Sep 25 21:40:39 2014 -0500 @@ -59,8 +59,8 @@ # BusyBox. Adding a native toolchain requires binutils and gcc (above) plus # make and bash. -URL=http://landley.net/toybox/downloads/toybox-0.4.8.tar.bz2 \ -SHA1=945cb4f04eb6dda9a4d8b14c52806ec6c6e64793 \ +URL=http://landley.net/toybox/downloads/toybox-0.4.9.tar.bz2 \ +SHA1=563ceace2c7e3af759cc6749f4ff24f6ea5be75a \ maybe_fork "download || dienow" URL=http://www.busybox.net/downloads/busybox-1.22.1.tar.bz2 \ diff -r ee7b1eda1a63 -r 00e528cdad95 sources/patches/toybox-cpio.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sources/patches/toybox-cpio.patch Thu Sep 25 21:40:39 2014 -0500 @@ -0,0 +1,14 @@ +The lfs-bootstrap build control image uses cpio -p which toybox doesn't implement yet. Fix it next release, meanwhile use the old busybox one. + +diff -ru toybox/toys/posix/cpio.c toybox.bak/toys/posix/cpio.c +--- toybox/toys/posix/cpio.c 2014-07-06 23:43:29.000000000 -0500 ++++ toybox.bak/toys/posix/cpio.c 2014-09-23 12:25:26.718391645 -0500 +@@ -17,7 +17,7 @@ + + config CPIO + bool "cpio" +- default y ++ default n + help + usage: cpio -{o|t|i} [-v] [--verbose] [-F FILE] [ignored: -du -H newc] + diff -r ee7b1eda1a63 -r 00e528cdad95 sources/patches/toybox-iconv.patch --- a/sources/patches/toybox-iconv.patch Mon Sep 15 01:28:01 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -uClibc's iconv.h is just broken, so switch iconv off for now. - -Did you know that uClibc has an include/iconv.h in the source that has -a line "#error Attempted to include iconv.h when uClibc was built without -locale support." And then in the top level Makefile it has -"Makefile.in:HEADERS_RM-$(UCLIBC_HAS_LOCALE) += iconv.h bits/uClibc_ctype.h" -so that file is deleted after being installed in the case that line would -trigger. So it implements things it then prevents from ever being used. - -The correct answer this this insanity is to switch to musl. Working on it... - -diff -ru toybox/toys/pending/iconv.c toybox.bak/toys/pending/iconv.c ---- toybox/toys/pending/iconv.c 2014-04-16 19:49:15.000000000 -0500 -+++ toybox.bak/toys/pending/iconv.c 2014-09-06 10:52:43.195279885 -0500 -@@ -8,7 +8,7 @@ - - config ICONV - bool "iconv" -- default y -+ default n - help - usage: iconv [-f FROM] [-t TO] [FILE...] -