Commit 785fef10 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

squashfs: bump 4.x, add lzo support 



We'll need libattr/xz packages in BR to enable support for those.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 3df6b56f

CHANGES

+5 −3
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 


	Toolchain: ARM cortex A9 support



	Fs: Squashfs 4.1 with lzo support



	Old-style package hooks (*_HOOK_POST_*) removed. Use the more

	generic new-style ones instead.
@@ -22,9 +24,9 @@ 
	lite, m4, mdadm, metacity, mysql_client, nano, nbd, ncftp,

	neon, netperf, ntfsprogs, openntpd, openssh, openvpn, oprofile,

	pango, pcre, php, prboom, radvd, qt, samba, sdl_sound,

	shared-mime-info, speex, sqlite, strace, taglib, tcpdump,

	tiff, tn5250, udev, udpcast, usbmount, usbutils, which,

	xlib_libX11, zlib

	shared-mime-info, speex, sqlite, squashfs, strace, taglib,

	tcpdump, tiff, tn5250, udev, udpcast, usbmount, usbutils,

	which, xlib_libX11, zlib



	Removed packages: dillo, libglib12, libgtk12, microwin,

	pcmcia

fs/squashfs/Config.in

+16 −1
Original line number Diff line number Diff line
@@ -19,5 +19,20 @@ config BR2_TARGET_ROOTFS_SQUASHFS3 
       bool "3.x"



endchoice

endif



choice

	prompt "Compression algorithm"

	default BR2_TARGET_ROOTFS_SQUASHFS4_GZIP

	depends on BR2_TARGET_ROOTFS_SQUASHFS4

	help

	  Select the squashfs compression algorithm to use when

	  generating the filesystem.



config BR2_TARGET_ROOTFS_SQUASHFS4_GZIP

       bool "gzip"



config BR2_TARGET_ROOTFS_SQUASHFS4_LZO

       bool "lzo"



endchoice

endif

fs/squashfs/squashfs.mk

+7 −0
Original line number Diff line number Diff line
@@ -6,6 +6,13 @@ 


ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4),y)

ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs



ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y)

ROOTFS_SQUASHFS_ARGS += -comp lzo

else

ROOTFS_SQUASHFS_ARGS += -comp gzip

endif



else

ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs3

package/squashfs/Config.in

+17 −0
Original line number Diff line number Diff line
@@ -6,5 +6,22 @@ config BR2_PACKAGE_SQUASHFS 


	  http://squashfs.sourceforge.net/



if BR2_PACKAGE_SQUASHFS



config BR2_PACKAGE_SQUASHFS_GZIP

       bool "gzip support"

       default y

       select BR2_PACKAGE_GZIP

       help

         Support GZIP compression algorithm



config BR2_PACKAGE_SQUASHFS_LZO

       bool "lzo support"

       select BR2_PACKAGE_LZO

       help

         Support LZO compression algorithm



endif



comment "squashfs requires a toolchain with LARGEFILE support"

	depends on !BR2_LARGEFILE

package/squashfs/squashfs-4.0-build-system-fix.patch

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
Index: a/squashfs-tools/Makefile

===================================================================

--- a/squashfs-tools.orig/Makefile	2009-04-19 01:47:43.000000000 +0200

+++ b/squashfs-tools/Makefile	2009-04-19 01:52:36.000000000 +0200

@@ -1,36 +1,48 @@

 INSTALL_DIR = /usr/local/bin

 

 INCLUDEDIR = .

+CFLAGS_R = -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE

+LIBS = -lz -lpthread

 

 CFLAGS := -I$(INCLUDEDIR) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -O2

 

 all: mksquashfs unsquashfs

 

 mksquashfs: mksquashfs.o read_fs.o sort.o swap.o pseudo.o

-	$(CC) mksquashfs.o read_fs.o sort.o swap.o pseudo.o -lz -lpthread -lm -o $@

+	$(CC) $(LDFLAGS) mksquashfs.o read_fs.o sort.o swap.o pseudo.o -lz -lpthread -lm -o $@

 

 mksquashfs.o: mksquashfs.c squashfs_fs.h mksquashfs.h global.h sort.h squashfs_swap.h Makefile

+	$(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<

 

 read_fs.o: read_fs.c squashfs_fs.h read_fs.h global.h squashfs_swap.h Makefile

+	$(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<

 

 sort.o: sort.c squashfs_fs.h global.h sort.h Makefile

+	$(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<

 

 swap.o: swap.c Makefile

+	$(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<

 

 pseudo.o: pseudo.c pseudo.h Makefile

+	$(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<

 

 unsquashfs: unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o

-	$(CC) unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o -lz -lpthread -lm -o $@

+	$(CC) $(LDFLAGS) unsquashfs.o unsquash-1.o unsquash-2.o unsquash-3.o unsquash-4.o swap.o -lz -lpthread -lm -o $@

 

-unsquashfs.o: unsquashfs.h unsquashfs.c squashfs_fs.h squashfs_swap.h squashfs_compat.h global.h Makefile

+unsquashfs.o: unsquashfs.c unsquashfs.h squashfs_fs.h squashfs_swap.h squashfs_compat.h global.h Makefile

+	$(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<

 

-unsquash-1.o: unsquashfs.h unsquash-1.c squashfs_fs.h squashfs_compat.h global.h Makefile

+unsquash-1.o: unsquash-1.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile

+	$(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<

 

-unsquash-2.o: unsquashfs.h unsquash-2.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile

+unsquash-2.o: unsquash-2.c unsquashfs.h unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile

+	$(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<

 

-unsquash-3.o: unsquashfs.h unsquash-3.c squashfs_fs.h squashfs_compat.h global.h Makefile

+unsquash-3.o: unsquash-3.c unsquashfs.h squashfs_fs.h squashfs_compat.h global.h Makefile

+	$(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<

 

-unsquash-4.o: unsquashfs.h unsquash-4.c squashfs_fs.h squashfs_swap.h global.h Makefile

+unsquash-4.o: unsquash-4.c unsquashfs.h squashfs_fs.h squashfs_swap.h global.h Makefile

+	$(CC) $(CFLAGS_R) $(CFLAGS) -c -o $@ $<

 

 clean:

 	-rm -f *.o mksquashfs unsquashfs