aboriginal

changeset 1688:00e528cdad95 1.2.9

Upgrade toybox version.
author Rob Landley <rob@landley.net>
date Thu, 25 Sep 2014 21:40:39 -0500
parents ee7b1eda1a63
children a2822a74252c
files download.sh sources/patches/toybox-cpio.patch sources/patches/toybox-iconv.patch
diffstat 3 files changed, 15 insertions(+), 24 deletions(-) [+]
line diff
     1.1 --- a/download.sh	Mon Sep 15 01:28:01 2014 -0500
     1.2 +++ b/download.sh	Thu Sep 25 21:40:39 2014 -0500
     1.3 @@ -59,8 +59,8 @@
     1.4  # BusyBox.  Adding a native toolchain requires binutils and gcc (above) plus
     1.5  # make and bash.
     1.6  
     1.7 -URL=http://landley.net/toybox/downloads/toybox-0.4.8.tar.bz2 \
     1.8 -SHA1=945cb4f04eb6dda9a4d8b14c52806ec6c6e64793 \
     1.9 +URL=http://landley.net/toybox/downloads/toybox-0.4.9.tar.bz2 \
    1.10 +SHA1=563ceace2c7e3af759cc6749f4ff24f6ea5be75a \
    1.11  maybe_fork "download || dienow"
    1.12  
    1.13  URL=http://www.busybox.net/downloads/busybox-1.22.1.tar.bz2 \
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/sources/patches/toybox-cpio.patch	Thu Sep 25 21:40:39 2014 -0500
     2.3 @@ -0,0 +1,14 @@
     2.4 +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.
     2.5 +
     2.6 +diff -ru toybox/toys/posix/cpio.c toybox.bak/toys/posix/cpio.c
     2.7 +--- toybox/toys/posix/cpio.c	2014-07-06 23:43:29.000000000 -0500
     2.8 ++++ toybox.bak/toys/posix/cpio.c	2014-09-23 12:25:26.718391645 -0500
     2.9 +@@ -17,7 +17,7 @@
    2.10 + 
    2.11 + config CPIO
    2.12 +   bool "cpio"
    2.13 +-  default y
    2.14 ++  default n
    2.15 +   help
    2.16 +     usage: cpio -{o|t|i} [-v] [--verbose] [-F FILE] [ignored: -du -H newc]
    2.17 + 
     3.1 --- a/sources/patches/toybox-iconv.patch	Mon Sep 15 01:28:01 2014 -0500
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,23 +0,0 @@
     3.4 -uClibc's iconv.h is just broken, so switch iconv off for now.
     3.5 -
     3.6 -Did you know that uClibc has an include/iconv.h in the source that has
     3.7 -a line "#error Attempted to include iconv.h when uClibc was built without
     3.8 -locale support." And then in the top level Makefile it has
     3.9 -"Makefile.in:HEADERS_RM-$(UCLIBC_HAS_LOCALE) += iconv.h bits/uClibc_ctype.h"
    3.10 -so that file is deleted after being installed in the case that line would
    3.11 -trigger. So it implements things it then prevents from ever being used.
    3.12 -
    3.13 -The correct answer this this insanity is to switch to musl. Working on it...
    3.14 -
    3.15 -diff -ru toybox/toys/pending/iconv.c toybox.bak/toys/pending/iconv.c
    3.16 ---- toybox/toys/pending/iconv.c	2014-04-16 19:49:15.000000000 -0500
    3.17 -+++ toybox.bak/toys/pending/iconv.c	2014-09-06 10:52:43.195279885 -0500
    3.18 -@@ -8,7 +8,7 @@
    3.19 - 
    3.20 - config ICONV
    3.21 -   bool "iconv"
    3.22 --  default y
    3.23 -+  default n
    3.24 -   help
    3.25 -     usage: iconv [-f FROM] [-t TO] [FILE...]
    3.26 -