diff --git a/packages/toolchain/sysutils/squashfs/build b/packages/toolchain/sysutils/squashfs/build index 67a94e93aa..7dc6ccfa9d 100755 --- a/packages/toolchain/sysutils/squashfs/build +++ b/packages/toolchain/sysutils/squashfs/build @@ -7,7 +7,8 @@ $SCRIPTS/build toolchain setup_toolchain host cd $BUILD/$1*/squashfs-tools + make mksquashfs mkdir -p $ROOT/$TOOLCHAIN/bin -cp mksquashfs $ROOT/$TOOLCHAIN/bin + cp mksquashfs $ROOT/$TOOLCHAIN/bin diff --git a/packages/toolchain/sysutils/squashfs/patches/squashfs-4.0-multi_core_fix.diff b/packages/toolchain/sysutils/squashfs/patches/squashfs-4.0-multi_core_fix.diff deleted file mode 100644 index ee6cd73198..0000000000 --- a/packages/toolchain/sysutils/squashfs/patches/squashfs-4.0-multi_core_fix.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur squashfs4.0-old/squashfs-tools/mksquashfs.c squashfs4.0-new/squashfs-tools/mksquashfs.c ---- squashfs4.0-old/squashfs-tools/mksquashfs.c 2009-04-05 14:22:48.000000000 -0700 -+++ squashfs4.0-new/squashfs-tools/mksquashfs.c 2009-09-14 14:25:37.000000000 -0700 -@@ -1733,8 +1733,8 @@ - entry->buffer->block = bytes; - bytes += compressed_size; - fragments_outstanding --; -- pthread_mutex_unlock(&fragment_mutex); - queue_put(to_writer, entry->buffer); -+ pthread_mutex_unlock(&fragment_mutex); - pthread_mutex_lock(&fragment_mutex); - TRACE("fragment_locked writing fragment %d, compressed size %d" - "\n", entry->fragment, compressed_size); -@@ -2426,8 +2426,8 @@ - write_buffer->block = bytes; - bytes += compressed_size; - fragments_outstanding --; -- pthread_mutex_unlock(&fragment_mutex); - queue_put(to_writer, write_buffer); -+ pthread_mutex_unlock(&fragment_mutex); - TRACE("Writing fragment %lld, uncompressed size %d, " - "compressed size %d\n", file_buffer->block, - file_buffer->size, compressed_size); diff --git a/packages/toolchain/sysutils/squashfs/patches/squashfs_disable_lzma.diff b/packages/toolchain/sysutils/squashfs/patches/squashfs_disable_lzma.diff new file mode 100644 index 0000000000..8c19ae39e4 --- /dev/null +++ b/packages/toolchain/sysutils/squashfs/patches/squashfs_disable_lzma.diff @@ -0,0 +1,12 @@ +diff -Naur squashfs4.0-20091205/squashfs-tools/Makefile squashfs4.0-20091205.patch/squashfs-tools/Makefile +--- squashfs4.0-20091205/squashfs-tools/Makefile 2009-10-14 05:32:57.000000000 +0200 ++++ squashfs4.0-20091205.patch/squashfs-tools/Makefile 2009-12-05 14:45:55.389177120 +0100 +@@ -2,7 +2,7 @@ + # Building LZMA support + # Download LZMA sdk (4.65 used in development, other versions may work), + # set LZMA_DIR to unpacked source, and uncomment next line +-LZMA_SUPPORT = 1 ++#LZMA_SUPPORT = 1 + LZMA_DIR = ../../../LZMA/lzma465 + + #Compression default. diff --git a/packages/toolchain/sysutils/squashfs/url b/packages/toolchain/sysutils/squashfs/url index a3da5a8168..ab8bb8b165 100644 --- a/packages/toolchain/sysutils/squashfs/url +++ b/packages/toolchain/sysutils/squashfs/url @@ -1 +1 @@ -http://switch.dl.sourceforge.net/sourceforge/squashfs/squashfs4.0.tar.gz +http://sources.openelec.tv/svn/squashfs4.0-20091205.tar.bz2