Mercurial > hg > aboriginal
changeset 1265:918501f802d1
Update squashfs and kernel to current versions.
author | Rob Landley <rob@landley.net> |
---|---|
date | Thu, 21 Oct 2010 19:09:51 -0500 |
parents | 5c7b6fb032ba |
children | 68da5da2a403 |
files | download.sh host-tools.sh sources/patches/squashfs-tools-4.0-uclibc-get_nprocs.patch |
diffstat | 3 files changed, 7 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/download.sh Thu Oct 07 23:59:05 2010 -0500 +++ b/download.sh Thu Oct 21 19:09:51 2010 -0500 @@ -21,8 +21,8 @@ # Building a cross compile toolchain requires linux headers, uClibc, # binutils, and gcc. -URL=http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.35.tar.bz2 \ -SHA1=4cb1fbfbeedcd658ca37739679c65dfaa136bf4e \ +URL=http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.36.tar.bz2 \ +SHA1=b546ab66458d7d614151d80adbc03b4d28977ae2 \ #UNSTABLE=http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.32-rc7.tar.bz2 \ maybe_fork "download || dienow" @@ -100,8 +100,8 @@ SHA1=543fa9abff0442edca308772d6cef85557677e02 \ maybe_fork "download || dienow" -URL=http://downloads.sf.net/squashfs/squashfs4.0.tar.gz \ -SHA1=3efe764ac27c507ee4a549fc6507bc86ea0660dd \ +URL=http://downloads.sf.net/squashfs/squashfs4.1.tar.gz \ +SHA1=7f9b1f9839b3638882f636fd170fd817d650f856 \ RENAME="s/(squashfs)(.*)/\1-\2/" \ maybe_fork "download || dienow"
--- a/host-tools.sh Thu Oct 07 23:59:05 2010 -0500 +++ b/host-tools.sh Thu Oct 21 19:09:51 2010 -0500 @@ -202,6 +202,9 @@ setupfor squashfs && cd squashfs-tools && + # Disable xattr support, uClibc doesn't support it and it's deeply pointless + # anyway. (I left extended attributes behind with OS/2, thanks.) + sed -i "/^XATTR_/d" Makefile && CC="$CC -I ../.. -L ../.." make -j $CPUS && cp mksquashfs unsquashfs "${STAGE_DIR}" && rm ../../{z*.h,libz.a}
--- a/sources/patches/squashfs-tools-4.0-uclibc-get_nprocs.patch Thu Oct 07 23:59:05 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -uclibc does not have get_nprocs() so build of squashfs host tool fails - ---- a/squashfs-tools/mksquashfs.c Wed Dec 2 10:30:31 2009 -+++ b/squashfs-tools/mksquashfs.c Wed Dec 2 10:31:34 2009 -@@ -3705,7 +3705,7 @@ - processors = 1; - } - #else -- processors = get_nprocs(); -+ processors = sysconf(_SC_NPROCESSORS_ONLN); - #endif - } - ---- a/squashfs-tools/unsquashfs.c Wed Dec 2 10:30:31 2009 -+++ b/squashfs-tools/unsquashfs.c Wed Dec 2 10:31:34 2009 -@@ -1811,7 +1811,7 @@ - processors = 1; - } - #else -- processors = get_nprocs(); -+ processors = sysconf(_SC_NPROCESSORS_ONLN); - #endif - } -