From 7e7fc9ae5f92a9bd01c2dbcf2406005445c6796d Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Tue, 22 Feb 2011 00:41:02 +0100 Subject: [PATCH] squashfs: change from lzma to xz support Signed-off-by: Stephan Raue --- packages/toolchain/sysutils/squashfs/build | 9 ++--- packages/toolchain/sysutils/squashfs/meta | 7 ++-- ...ch => squashfs-a56f344-defaults-0.1.patch} | 34 +++++++++---------- 3 files changed, 23 insertions(+), 27 deletions(-) rename packages/toolchain/sysutils/squashfs/patches/{squashfs-4.1-defaults-0.1.patch => squashfs-a56f344-defaults-0.1.patch} (57%) diff --git a/packages/toolchain/sysutils/squashfs/build b/packages/toolchain/sysutils/squashfs/build index 9706da1080..a810a07d98 100755 --- a/packages/toolchain/sysutils/squashfs/build +++ b/packages/toolchain/sysutils/squashfs/build @@ -22,17 +22,12 @@ . config/options $1 -$SCRIPTS/unpack lzma - -LZMA_DIR=`ls -d $ROOT/$BUILD/lzma*` - setup_toolchain host cd $BUILD/$1*/squashfs-tools - make mksquashfs \ - LZMA_SUPPORT=1 LZMA_DIR=$LZMA_DIR \ - INCLUDEDIR="-I. -I$ROOT/$TOOLCHAIN/include -I$LZMA_DIR/C" + XZ_SUPPORT=1 \ + INCLUDEDIR="-I. -I$ROOT/$TOOLCHAIN/include" mkdir -p $ROOT/$TOOLCHAIN/bin cp mksquashfs $ROOT/$TOOLCHAIN/bin diff --git a/packages/toolchain/sysutils/squashfs/meta b/packages/toolchain/sysutils/squashfs/meta index b7392944b0..f7cc61d63e 100644 --- a/packages/toolchain/sysutils/squashfs/meta +++ b/packages/toolchain/sysutils/squashfs/meta @@ -19,14 +19,15 @@ ################################################################################ PKG_NAME="squashfs" -PKG_VERSION="4.1" +PKG_VERSION="a56f344" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://squashfs.sourceforge.net/" -PKG_URL="$SOURCEFORGE_SRC/squashfs/squashfs/${PKG_NAME}${PKG_VERSION}/${PKG_NAME}${PKG_VERSION}.tar.gz" +#PKG_URL="$SOURCEFORGE_SRC/squashfs/squashfs/${PKG_NAME}${PKG_VERSION}/${PKG_NAME}${PKG_VERSION}.tar.gz" +PKG_URL="$OPENELEC_SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="ccache" +PKG_BUILD_DEPENDS="ccache xz" PKG_PRIORITY="optional" PKG_SECTION="toolchain/sysutils" PKG_SHORTDESC="squashfs-tools: A compressed read-only filesystem for Linux" diff --git a/packages/toolchain/sysutils/squashfs/patches/squashfs-4.1-defaults-0.1.patch b/packages/toolchain/sysutils/squashfs/patches/squashfs-a56f344-defaults-0.1.patch similarity index 57% rename from packages/toolchain/sysutils/squashfs/patches/squashfs-4.1-defaults-0.1.patch rename to packages/toolchain/sysutils/squashfs/patches/squashfs-a56f344-defaults-0.1.patch index 57ac724d08..e53e3317c3 100644 --- a/packages/toolchain/sysutils/squashfs/patches/squashfs-4.1-defaults-0.1.patch +++ b/packages/toolchain/sysutils/squashfs/patches/squashfs-a56f344-defaults-0.1.patch @@ -1,7 +1,7 @@ -diff -Naur squashfs4.1/squashfs-tools/Makefile squashfs4.1.patch/squashfs-tools/Makefile ---- squashfs4.1/squashfs-tools/Makefile 2010-09-21 00:11:47.000000000 +0200 -+++ squashfs4.1.patch/squashfs-tools/Makefile 2010-10-12 19:13:52.504611650 +0200 -@@ -64,7 +64,7 @@ +diff -Naur squashfs-a56f344/squashfs-tools/Makefile squashfs-a56f344.patch/squashfs-tools/Makefile +--- squashfs-a56f344/squashfs-tools/Makefile 2011-02-21 23:58:19.000000000 +0100 ++++ squashfs-a56f344.patch/squashfs-tools/Makefile 2011-02-22 00:05:33.197451875 +0100 +@@ -77,7 +77,7 @@ # If your C library or build/target environment doesn't support XATTRs then # comment out the next line to build Mksquashfs and Unsquashfs without XATTR # support @@ -10,7 +10,7 @@ diff -Naur squashfs4.1/squashfs-tools/Makefile squashfs4.1.patch/squashfs-tools/ # Select whether you wish xattrs to be stored by Mksquashfs and extracted # by Unsquashfs by default. If selected users can disable xattr support by -@@ -72,7 +72,7 @@ +@@ -85,7 +85,7 @@ # # If unselected, Mksquashfs/Unsquashfs won't store and extract xattrs by # default. Users can enable xattrs by using the -xattrs option. @@ -19,7 +19,7 @@ diff -Naur squashfs4.1/squashfs-tools/Makefile squashfs4.1.patch/squashfs-tools/ ############################################### -@@ -87,7 +87,7 @@ +@@ -100,7 +100,7 @@ UNSQUASHFS_OBJS = unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o \ unsquash-4.o swap.o compressor.o @@ -27,22 +27,22 @@ diff -Naur squashfs4.1/squashfs-tools/Makefile squashfs4.1.patch/squashfs-tools/ +CFLAGS += $(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -D_GNU_SOURCE -DCOMP_DEFAULT=\"$(COMP_DEFAULT)\" -O2 -Wall - LIBS = -@@ -175,7 +175,7 @@ + LIBS = -lpthread -lm +@@ -196,7 +196,7 @@ all: mksquashfs unsquashfs mksquashfs: $(MKSQUASHFS_OBJS) -- $(CC) $(MKSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(MKSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@ +- $(CC) $(MKSQUASHFS_OBJS) $(LIBS) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(MKSQUASHFS_OBJS) $(LIBS) -o $@ - mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h \ - squashfs_swap.h xattr.h -@@ -195,7 +195,7 @@ - read_xattrs.o: xattr.h + mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h sort.h squashfs_swap.h \ + xattr.h pseudo.h compressor.h +@@ -227,7 +227,7 @@ + xz_wrapper.o: xz_wrapper.c compressor.h squashfs_fs.h unsquashfs: $(UNSQUASHFS_OBJS) -- $(CC) $(UNSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@ -+ $(CC) $(CFLAGS) $(LDFLAGS) $(UNSQUASHFS_OBJS) -lpthread -lm $(LIBS) -o $@ +- $(CC) $(UNSQUASHFS_OBJS) $(LIBS) -o $@ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(UNSQUASHFS_OBJS) $(LIBS) -o $@ unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h \ - squashfs_compat.h global.h xattr.h + squashfs_compat.h xattr.h read_fs.h compressor.h