From 90deb9f866f17181f3cc4296e0b8d5de5187609e Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sun, 19 Apr 2009 02:24:54 +0200 Subject: squashfs-tools: Added release 4.0 (for SquashFS 4.0 in Linux 2.6.29). Added with DEFAULT_PREFERENCE -1. Be aware that squashfs release 4.0 is now upstream in Linux 2.6.29. The filesystem layout has changed from the 3.x releases. Distro's need to carefully select the (cross and native) version depending on the kernel release, which again might be different for the machines supported. Signed-off-by: Leon Woestenberg --- .../squashfs-tools-4.0/Makefile.patch | 60 ++++++++++++++++++++++ .../squashfs-tools/squashfs-tools-native_4.0.bb | 11 ++++ recipes/squashfs-tools/squashfs-tools_4.0.bb | 12 +++++ 3 files changed, 83 insertions(+) create mode 100644 recipes/squashfs-tools/squashfs-tools-4.0/Makefile.patch create mode 100644 recipes/squashfs-tools/squashfs-tools-native_4.0.bb create mode 100644 recipes/squashfs-tools/squashfs-tools_4.0.bb (limited to 'recipes') diff --git a/recipes/squashfs-tools/squashfs-tools-4.0/Makefile.patch b/recipes/squashfs-tools/squashfs-tools-4.0/Makefile.patch new file mode 100644 index 0000000000..2c88aba2ae --- /dev/null +++ b/recipes/squashfs-tools/squashfs-tools-4.0/Makefile.patch @@ -0,0 +1,60 @@ +Index: squashfs-tools/Makefile +=================================================================== +--- squashfs-tools.orig/Makefile 2009-04-19 01:47:43.000000000 +0200 ++++ 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 diff --git a/recipes/squashfs-tools/squashfs-tools-native_4.0.bb b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb new file mode 100644 index 0000000000..87ba761ce4 --- /dev/null +++ b/recipes/squashfs-tools/squashfs-tools-native_4.0.bb @@ -0,0 +1,11 @@ +require squashfs-tools_${PV}.bb +PR = "r0" + +inherit native + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/squashfs-tools-${PV}', '${FILE_DIRNAME}/squashfs-tools', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +PACKAGES = "" + +do_stage () { + install -m 0755 mksquashfs ${STAGING_BINDIR}/ +} diff --git a/recipes/squashfs-tools/squashfs-tools_4.0.bb b/recipes/squashfs-tools/squashfs-tools_4.0.bb new file mode 100644 index 0000000000..8299cd6fdf --- /dev/null +++ b/recipes/squashfs-tools/squashfs-tools_4.0.bb @@ -0,0 +1,12 @@ +require squashfs-tools.inc +PR = "r0" + +DEFAULT_PREFERENCE = "-1" + +# some release have .tgz, some have .tar.gz, so keep that outside the .inc file + +#http://ovh.dl.sourceforge.net/sourceforge/squashfs/squashfs4.0.tar.gz + +SRC_URI = "${SOURCEFORGE_MIRROR}/squashfs/squashfs${@bb.data.getVar('PV',d,1).replace('r','-r')}.tar.gz \ +file://Makefile.patch;patch=1" + -- cgit v1.2.3