Merge branch 'fs-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot

32 files changed, 2199 insertions, 363 deletions

diff --git a/package/Config.in b/package/Config.in
index 6a695cbf4..0dac9498f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -146,6 +146,8 @@ endmenu
 
 menu "Hardware handling"
 source "package/acpid/Config.in"
+source "package/cdrkit/Config.in"
+source "package/cramfs/Config.in"
 source "package/dbus/Config.in"
 source "package/dbus-glib/Config.in"
 source "package/dbus-python/Config.in"
@@ -159,6 +161,8 @@ source "package/eeprog/Config.in"
 source "package/fconfig/Config.in"
 source "package/fis/Config.in"
 source "package/gadgetfs-test/Config.in"
+source "package/genext2fs/Config.in"
+source "package/genromfs/Config.in"
 source "package/gvfs/Config.in"
 source "package/hal/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
@@ -184,6 +188,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/sfdisk/Config.in"
 endif
 source "package/smartmontools/Config.in"
+source "package/squashfs/Config.in"
 source "package/sshfs/Config.in"
 source "package/sysstat/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
@@ -291,6 +296,7 @@ source "package/libupnp/Config.in"
 endmenu
 
 menu "Other"
+source "package/libcap/Config.in"
 source "package/libdaemon/Config.in"
 source "package/libelf/Config.in"
 source "package/libevent/Config.in"
diff --git a/package/Makefile.in b/package/Makefile.in
index 2bd364013..efb4dec34 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -109,7 +109,6 @@ TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 
 # Quotes are needed for spaces et al in path components.
 TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
-IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ROOTFS_SUFFIX)
 GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
 REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
 TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
@@ -119,9 +118,6 @@ TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
 TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
 TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
-#IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX)
-IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ROOTFS_SUFFIX)
-
 REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
 GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
 KERNEL_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
diff --git a/package/busybox/initramfs.mk b/package/busybox/initramfs.mk
index afb80f9f3..394f483e5 100644
--- a/package/busybox/initramfs.mk
+++ b/package/busybox/initramfs.mk
@@ -7,7 +7,7 @@ ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)
 
 BUSYBOX_INITRAMFS_DIR:=$(BUSYBOX_DIR)-initramfs
 BR2_INITRAMFS_DIR:=$(BUILD_DIR)/initramfs
-BB_INITRAMFS_TARGET:=$(IMAGE).initramfs_lst
+BB_INITRAMFS_TARGET:=rootfs.initramfs_lst
 
 $(BUSYBOX_INITRAMFS_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
 	rm -rf $(BUILD_DIR)/tmp $(BUSYBOX_INITRAMFS_DIR)
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index 98de5326d..43ab5f265 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -3,65 +3,55 @@
 # bzip2
 #
 #############################################################
-BZIP2_VERSION:=1.0.4
+BZIP2_VERSION:=1.0.5
 BZIP2_SOURCE:=bzip2-$(BZIP2_VERSION).tar.gz
 BZIP2_SITE:=http://www.bzip.org/$(BZIP2_VERSION)
-BZIP2_DIR:=$(BUILD_DIR)/bzip2-$(BZIP2_VERSION)
-BZIP2_CAT:=$(ZCAT)
-BZIP2_BINARY:=$(BZIP2_DIR)/bzip2
-BZIP2_TARGET_BINARY:=$(TARGET_DIR)/usr/bin/bzmore
+BZIP2_STAGING_INSTALL=YES
 
-$(DL_DIR)/$(BZIP2_SOURCE):
-	 $(call DOWNLOAD,$(BZIP2_SITE),$(BZIP2_SOURCE))
+define BZIP2_FIX_MAKEFILE
+	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile
+	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION) \
+	    libbz2.so,g" $(@D)/Makefile-libbz2_so
+	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(@D)/Makefile
+	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(@D)/Makefile-libbz2_so
+endef
 
-bzip2-source: $(DL_DIR)/$(BZIP2_SOURCE)
+BZIP2_POST_PATCH_HOOKS += BZIP2_FIX_MAKEFILE
+
+define BZIP2_NOLARGEFILE_FIX_MAKEFILE
+	$(SED) "s,^BIGFILES,#BIGFILES,g" $(@D)/Makefile
+	$(SED) "s,^BIGFILES,#BIGFILES,g" $(@D)/Makefile-libbz2_so
+endef
 
-$(BZIP2_DIR)/.unpacked: $(DL_DIR)/$(BZIP2_SOURCE)
-	$(BZIP2_CAT) $(DL_DIR)/$(BZIP2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(BZIP2_DIR)/Makefile
-	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION) \
-	    libbz2.so,g" $(BZIP2_DIR)/Makefile-libbz2_so
 ifneq ($(BR2_LARGEFILE),y)
-	$(SED) "s,^BIGFILES,#BIGFILES,g" $(BZIP2_DIR)/Makefile
-	$(SED) "s,^BIGFILES,#BIGFILES,g" $(BZIP2_DIR)/Makefile-libbz2_so
+BZIP2_POST_PATCH_HOOKS += BZIP2_NOLARGEFILE_FIX_MAKEFILE
 endif
-	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile
-	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(BZIP2_DIR)/Makefile-libbz2_so
-	touch $@
 
-$(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION): $(BZIP2_DIR)/.unpacked
-	$(TARGET_CONFIGURE_OPTS) \
-	$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) \
-		-C $(BZIP2_DIR) -f Makefile-libbz2_so
-	$(TARGET_CONFIGURE_OPTS) \
-	$(MAKE) CC=$(TARGET_CC) RANLIB=$(TARGET_RANLIB) AR=$(TARGET_AR) \
-		-C $(BZIP2_DIR) libbz2.a
-	cp $(BZIP2_DIR)/bzlib.h $(STAGING_DIR)/usr/include/
-	cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/
-	cp $(BZIP2_DIR)/libbz2.a $(STAGING_DIR)/usr/lib/
+define BZIP2_BUILD_CMDS
+	$(TARGET_MAKE_ENV) \
+	$(MAKE) -C $(@D) -f Makefile-libbz2_so \
+	CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" AR="$(TARGET_AR)"
+	$(TARGET_MAKE_ENV) \
+	$(MAKE) -C $(@D) \
+	CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" AR="$(TARGET_AR)" \
+	libbz2.a bzip2 bzip2recover
+endef
+
+define BZIP2_INSTALL_STAGING_CMDS
+	cp $(@D)/bzlib.h $(STAGING_DIR)/usr/include/
+	cp $(@D)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/
+	cp $(@D)/libbz2.a $(STAGING_DIR)/usr/lib/
 	(cd $(STAGING_DIR)/usr/lib/; \
 		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \
-	)
-	(cd $(STAGING_DIR)/usr/lib; \
 		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
 		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1; \
 	)
+endef
 
-$(BZIP2_BINARY): $(STAGING_DIR)/usr/lib/libbz2.so.$(BZIP2_VERSION)
-	$(TARGET_CONFIGURE_OPTS) \
-	$(MAKE) CC=$(TARGET_CC) -C $(BZIP2_DIR) bzip2 bzip2recover
-	touch -c $@
-
-$(BZIP2_TARGET_BINARY): $(BZIP2_BINARY)
-	(cd $(TARGET_DIR)/usr/bin; \
-		rm -f bzip2 bunzip2 bzcat bzip2recover \
-			bzgrep bzegrep bzfgrep bzmore bzless bzdiff bzcmp; \
-	)
-	$(TARGET_CONFIGURE_OPTS) \
-	$(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(BZIP2_DIR) install
-	rm -f $(TARGET_DIR)/usr/lib/libbz2.a
-	rm -f $(TARGET_DIR)/usr/include/bzlib.h
-	cp $(BZIP2_DIR)/libbz2.so.$(BZIP2_VERSION) $(TARGET_DIR)/usr/lib/
+define B2IP_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
+	$(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install
+	cp $(@D)/libbz2.so.$(BZIP2_VERSION) $(TARGET_DIR)/usr/lib/
 	(cd $(TARGET_DIR)/usr/lib; \
 		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \
 		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \
@@ -74,47 +64,37 @@ $(BZIP2_TARGET_BINARY): $(BZIP2_BINARY)
 		ln -snf bzgrep bzegrep; \
 		ln -snf bzgrep bzfgrep; \
 	)
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-	rm -rf $(TARGET_DIR)/usr/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-	rm -rf $(TARGET_DIR)/usr/man
-endif
-	rm -rf $(TARGET_DIR)/share/locale
-	rm -rf $(TARGET_DIR)/usr/share/doc
-
-$(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/usr/lib/libbz2.a
-	mkdir -p $(TARGET_DIR)/usr/include
-	cp $(STAGING_DIR)/usr/include/bzlib.h $(TARGET_DIR)/usr/include/
-	cp $(STAGING_DIR)/usr/lib/libbz2.a $(TARGET_DIR)/usr/lib/
-	rm -f $(TARGET_DIR)/lib/libbz2.so
-	(cd $(TARGET_DIR)/usr/lib; \
-		ln -fs /usr/lib/libbz2.so.1.0 libbz2.so; \
-	)
-	-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libbz2.so.1.0
-	touch -c $@
-
-bzip2-headers: $(TARGET_DIR)/usr/lib/libbz2.a
-
-bzip2: $(BZIP2_TARGET_BINARY)
+endef
 
-bzip2-clean:
+define BZIP2_CLEAN_CMDS
 	rm -f $(addprefix $(TARGET_DIR),/lib/libbz2.* \
 					/usr/lib/libbz2.* \
 					/usr/include/bzlib.h)
 	rm -f $(addprefix $(STAGING_DIR),/lib/libbz2.* \
 					/usr/lib/libbz2.* \
 					/usr/include/bzlib.h)
-	-$(MAKE) -C $(BZIP2_DIR) clean
+	-$(MAKE) -C $(@D) clean
+endef
 
-bzip2-dirclean:
-	rm -rf $(BZIP2_DIR)
+define HOST_BZIP2_FIX_MAKEFILE
+	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile
+	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION) \
+	    libbz2.so,g" $(@D)/Makefile-libbz2_so
+	$(SED) "s:-O2:$(HOST_CFLAGS):" $(@D)/Makefile
+	$(SED) "s:-O2:$(HOST_CFLAGS):" $(@D)/Makefile-libbz2_so
+endef
 
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_BZIP2),y)
-TARGETS+=bzip2
-endif
+HOST_BZIP2_POST_PATCH_HOOKS += HOST_BZIP2_FIX_MAKEFILE
+
+define HOST_BZIP2_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) -f Makefile-libbz2_so
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) libbz2.a bzip2 bzip2recover
+endef
+
+define HOST_BZIP2_INSTALL_CMDS
+	$(HOST_MAKE_ENV) \
+	$(MAKE) PREFIX=$(HOST_DIR)/usr -C $(@D) install
+endef
+
+$(eval $(call GENTARGETS,package,bzip2))
+$(eval $(call GENTARGETS,package,bzip2,host))
\ No newline at end of file
diff --git a/package/cdrkit/Config.in b/package/cdrkit/Config.in
new file mode 100644
index 000000000..2e255819a
--- /dev/null
+++ b/package/cdrkit/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_CDRKIT
+       # Needed for libbz
+       select BR2_PACKAGE_BZIP2
+       select BR2_PACKAGE_LIBCAP
+       bool "cdrkit"
+       help
+         cdrkit is a suite of programs for recording CDs and DVDs,
+         blanking CD-RW media, creating ISO-9660 filesystem images,
+         extracting audio CD data, and more.
+
+	 http://www.cdrkit.org/
diff --git a/package/cdrkit/cdrkit.mk b/package/cdrkit/cdrkit.mk
new file mode 100644
index 000000000..a6a2e80c5
--- /dev/null
+++ b/package/cdrkit/cdrkit.mk
@@ -0,0 +1,63 @@
+CDRKIT_VERSION=1.1.10
+CDRKIT_SOURCE=cdrkit-$(CDRKIT_VERSION).tar.gz
+CDRKIT_SITE=http://www.cdrkit.org/releases/
+
+CDRKIT_DEPENDENCIES=libcap bzip2 host-cmake
+HOST_CDRKIT_DEPENDENCIES=host-libcap host-cmake host-bzip2
+
+ifeq ($(BR2_ENDIAN),"BIG")
+CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=1
+else
+CMAKE_ENDIAN_OPT=-DBITFIELDS_HTOL=0
+endif
+
+define CDRKIT_CONFIGURE_CMDS
+ -mkdir $(@D)/build
+ (cd $(@D)/build ; \
+	$(HOST_DIR)/usr/bin/cmake .. \
+		-Wno-dev \
+		-DCMAKE_SYSTEM_NAME:STRING="Linux" \
+		-DCMAKE_C_COMPILER:FILEPATH="$(TARGET_CC)" \
+		-DCMAKE_CXX_COMPILER:FILEPATH="$(TARGET_CXX)" \
+		-DCMAKE_C_FLAGS:STRING="$(TARGET_CFLAGS)" \
+		-DCMAKE_EXE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
+		-DCMAKE_MODULE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
+		-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
+		-DCMAKE_FIND_ROOT_PATH:PATH="$(STAGING_DIR)" \
+		-DCMAKE_INSTALL_PREFIX:PATH="$(TARGET_DIR)/usr" \
+		$(CMAKE_ENDIAN_OPT) \
+ )
+endef
+
+define CDRKIT_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/build
+endef
+
+define CDRKIT_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/build install
+endef
+
+define HOST_CDRKIT_CONFIGURE_CMDS
+ -mkdir $(@D)/build
+ (cd $(@D)/build ; \
+	$(HOST_DIR)/usr/bin/cmake .. \
+		-Wno-dev \
+		-DCMAKE_C_FLAGS="$(HOST_CFLAGS)" \
+		-DCMAKE_EXE_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \
+		-DCMAKE_MODULE_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \
+		-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \
+		-DCMAKE_INSTALL_PREFIX:STRING="$(HOST_DIR)/usr" \
+ )
+endef
+
+define HOST_CDRKIT_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/build
+endef
+
+define HOST_CDRKIT_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/build  install
+endef
+
+$(eval $(call GENTARGETS,package,cdrkit))
+$(eval $(call GENTARGETS,package,cdrkit,host))
+
diff --git a/package/cloop/cloop.mk b/package/cloop/cloop.mk
new file mode 100644
index 000000000..f1c1e1c4e
--- /dev/null
+++ b/package/cloop/cloop.mk
@@ -0,0 +1,18 @@
+CLOOP_VERSION=2.631-1
+CLOOP_SOURCE=cloop_$(CLOOP_VERSION).tar.gz
+CLOOP_SITE=http://debian-knoppix.alioth.debian.org/sources/
+
+HOST_CLOOP_DEPENDENCIES = host-zlib
+
+define HOST_CLOOP_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE1) \
+   CFLAGS="$(HOST_CFLAGS) -Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DUSE_ERROR_SILENT" -C $(@D) APPSONLY=yes
+endef
+
+define HOST_CLOOP_INSTALL_CMDS
+ install -m 755 $(@D)/create_compressed_fs $(HOST_DIR)/usr/bin
+ install -m 755 $(@D)/extract_compressed_fs $(HOST_DIR)/usr/bin
+endef
+
+$(eval $(call GENTARGETS,package,cloop))
+$(eval $(call GENTARGETS,package,cloop,host))
\ No newline at end of file
diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk
new file mode 100644
index 000000000..42d4ff5ed
--- /dev/null
+++ b/package/cmake/cmake.mk
@@ -0,0 +1,20 @@
+CMAKE_VERSION=2.8.0
+CMAKE_SOURCE=cmake-$(CMAKE_VERSION).tar.gz
+CMAKE_SITE=http://www.cmake.org/files/v2.8/
+
+define HOST_CMAKE_CONFIGURE_CMDS
+ (cd $(@D); \
+   ./bootstrap --prefix=$(HOST_DIR)/usr --parallel=$(BR2_JLEVEL) \
+ )
+endef
+
+define HOST_CMAKE_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_CMAKE_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+$(eval $(call GENTARGETS,package,cmake))
+$(eval $(call GENTARGETS,package,cmake,host))
\ No newline at end of file
diff --git a/package/cramfs/Config.in b/package/cramfs/Config.in
new file mode 100644
index 000000000..553fb8a73
--- /dev/null
+++ b/package/cramfs/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_CRAMFS
+       bool "cramfs"
+       help
+         cramfs is a comporessed read-only filesystem. This package
+         contains the tools to generate and check a cramfs filesystem.
+
+	 http://sourceforge.net/projects/cramfs/
\ No newline at end of file
diff --git a/package/cramfs/cramfs-01-devtable.patch b/package/cramfs/cramfs-01-devtable.patch
new file mode 100644
index 000000000..884eb8cb8
--- /dev/null
+++ b/package/cramfs/cramfs-01-devtable.patch
@@ -0,0 +1,1269 @@
+--- cramfs-1.1.orig/cramfsck.c	2002-02-22 17:00:42.000000000 -0700
++++ cramfs-1.1/cramfsck.c	2002-12-21 01:25:17.000000000 -0700
+@@ -51,10 +51,11 @@
+ #include <utime.h>
+ #include <sys/ioctl.h>
+ #define _LINUX_STRING_H_
+-#include <linux/fs.h>
+-#include <linux/cramfs_fs.h>
++#include "linux/cramfs_fs.h"
+ #include <zlib.h>
+ 
++#define BLKGETSIZE	_IO(0x12,96) /* return device size /512 (long *arg) */
++
+ /* Exit codes used by fsck-type programs */
+ #define FSCK_OK          0	/* No errors */
+ #define FSCK_NONDESTRUCT 1	/* File system errors corrected */
+@@ -75,7 +76,7 @@
+ static int opt_verbose = 0;	/* 1 = verbose (-v), 2+ = very verbose (-vv) */
+ #ifdef INCLUDE_FS_TESTS
+ static int opt_extract = 0;		/* extract cramfs (-x) */
+-static char *extract_dir = "root";	/* extraction directory (-x) */
++static char *extract_dir = "/";	/* extraction directory (-x) */
+ static uid_t euid;			/* effective UID */
+ 
+ /* (cramfs_super + start) <= start_dir < end_dir <= start_data <= end_data */
+@@ -155,7 +156,7 @@
+ 	}
+ 
+ 	if (*length < sizeof(struct cramfs_super)) {
+-		die(FSCK_UNCORRECTED, 0, "file length too short");
++		die(FSCK_UNCORRECTED, 0, "filesystem smaller than a cramfs superblock!");
+ 	}
+ 
+ 	/* find superblock */
+@@ -190,7 +191,8 @@
+ 			die(FSCK_UNCORRECTED, 0, "zero file count");
+ 		}
+ 		if (*length < super.size) {
+-			die(FSCK_UNCORRECTED, 0, "file length too short");
++			die(FSCK_UNCORRECTED, 0, "file length too short, %lu is smaller than %lu",
++				*length, super.size);
+ 		}
+ 		else if (*length > super.size) {
+ 			fprintf(stderr, "warning: file extends past end of filesystem\n");
+@@ -267,11 +269,11 @@
+ #ifdef INCLUDE_FS_TESTS
+ static void print_node(char type, struct cramfs_inode *i, char *name)
+ {
+-	char info[10];
++	char info[11];
+ 
+ 	if (S_ISCHR(i->mode) || (S_ISBLK(i->mode))) {
+ 		/* major/minor numbers can be as high as 2^12 or 4096 */
+-		snprintf(info, 10, "%4d,%4d", major(i->size), minor(i->size));
++		snprintf(info, 11, "%4d,%4d", major(i->size), minor(i->size));
+ 	}
+ 	else {
+ 		/* size be as high as 2^24 or 16777216 */
+@@ -445,8 +447,10 @@
+ 	}
+ 	/* TODO: Do we need to check end_dir for empty case? */
+ 	memcpy(newpath, path, pathlen);
+-	newpath[pathlen] = '/';
+-	pathlen++;
++	if (pathlen > 1) {
++	    newpath[pathlen] = '/';
++	    pathlen++;
++	}
+ 	if (opt_verbose) {
+ 		print_node('d', i, path);
+ 	}
+--- cramfs-1.1.orig/device_table.txt	1969-12-31 17:00:00.000000000 -0700
++++ cramfs-1.1/device_table.txt	2003-01-01 05:13:44.000000000 -0700
+@@ -0,0 +1,129 @@
++# When building a target filesystem, it is desirable to not have to
++# become root and then run 'mknod' a thousand times.  Using a device 
++# table you can create device nodes and directories "on the fly".
++#
++# This is a sample device table file for use with mkcramfs.  You can
++# do all sorts of interesting things with a device table file.  For
++# example, if you want to adjust the permissions on a particular file
++# you can just add an entry like:
++#   /sbin/foobar	f	2755	0	0	-	-	-	-	-
++# and (assuming the file /sbin/foobar exists) it will be made setuid
++# root (regardless of what its permissions are on the host filesystem.
++# Furthermore, you can use a single table entry to create a many device
++# minors.  For example, if I wanted to create /dev/hda and /dev/hda[0-15]
++# I could just use the following two table entries:
++#   /dev/hda	b	640	0	0	3	0	0	0	-
++#   /dev/hda	b	640	0	0	3	1	1	1	15
++# 
++# Device table entries take the form of:
++# <name>    <type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
++# where name is the file name,  type can be one of: 
++#	f	A regular file
++#	d	Directory
++#	c	Character special device file
++#	b	Block special device file
++#	p	Fifo (named pipe)
++# uid is the user id for the target file, gid is the group id for the
++# target file.  The rest of the entries (major, minor, etc) apply only 
++# to device special files.
++
++# Have fun
++# -Erik Andersen <andersen@codepoet.org>
++#
++
++#<name>		<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
++/dev		d	755	0	0	-	-	-	-	-
++/dev/mem	c	640	0	0	1	1	0	0	-
++/dev/kmem	c	640	0	0	1	2	0	0	-
++/dev/null	c	640	0	0	1	3	0	0	-
++/dev/zero	c	640	0	0	1	5	0	0	-
++/dev/random	c	640	0	0	1	8	0	0	-
++/dev/urandom	c	640	0	0	1	9	0	0	-
++/dev/tty	c	666	0	0	5	0	0	0	-
++/dev/tty	c	666	0	0	4	0	0	1	6
++/dev/console	c	640	0	0	5	1	0	0	-
++/dev/ram	b	640	0	0	1	1	0	0	-
++/dev/ram	b	640	0	0	1	0	0	1	4
++/dev/loop	b	640	0	0	7	0	0	1	2
++/dev/ptmx	c	666	0	0	5	2	0	0	-
++#/dev/ttyS	c	640	0	0	4	64	0	1	4
++#/dev/psaux	c	640	0	0	10	1	0	0	-
++#/dev/rtc	c	640	0	0	10	135	0	0	-
++
++# Adjust permissions on some normal files
++#/etc/shadow	f	600	0	0	-	-	-	-	-
++#/bin/tinylogin	f	4755	0	0	-	-	-	-	-
++
++# User-mode Linux stuff
++/dev/ubda	b	640	0	0	98	0	0	0	-
++/dev/ubda	b	640	0	0	98	1	1	1	15
++
++# IDE Devices
++/dev/hda	b	640	0	0	3	0	0	0	-
++/dev/hda	b	640	0	0	3	1	1	1	15
++/dev/hdb	b	640	0	0	3	64	0	0	-
++/dev/hdb	b	640	0	0	3	65	1	1	15
++#/dev/hdc	b	640	0	0	22	0	0	0	-
++#/dev/hdc	b	640	0	0	22	1	1	1	15
++#/dev/hdd	b	640	0	0	22	64	0	0	-
++#/dev/hdd	b	640	0	0	22	65	1	1	15
++#/dev/hde	b	640	0	0	33	0	0	0	-
++#/dev/hde	b	640	0	0	33	1	1	1	15
++#/dev/hdf	b	640	0	0	33	64	0	0	-
++#/dev/hdf	b	640	0	0	33	65	1	1	15
++#/dev/hdg	b	640	0	0	34	0	0	0	-
++#/dev/hdg	b	640	0	0	34	1	1	1	15
++#/dev/hdh	b	640	0	0	34	64	0	0	-
++#/dev/hdh	b	640	0	0	34	65	1	1	15
++
++# SCSI Devices
++#/dev/sda	b	640	0	0	8	0	0	0	-
++#/dev/sda	b	640	0	0	8	1	1	1	15
++#/dev/sdb	b	640	0	0	8	16	0	0	-
++#/dev/sdb	b	640	0	0	8	17	1	1	15
++#/dev/sdc	b	640	0	0	8	32	0	0	-
++#/dev/sdc	b	640	0	0	8	33	1	1	15
++#/dev/sdd	b	640	0	0	8	48	0	0	-
++#/dev/sdd	b	640	0	0	8	49	1	1	15
++#/dev/sde	b	640	0	0	8	64	0	0	-
++#/dev/sde	b	640	0	0	8	65	1	1	15
++#/dev/sdf	b	640	0	0	8	80	0	0	-
++#/dev/sdf	b	640	0	0	8	81	1	1	15
++#/dev/sdg	b	640	0	0	8	96	0	0	-
++#/dev/sdg	b	640	0	0	8	97	1	1	15
++#/dev/sdh	b	640	0	0	8	112	0	0	-
++#/dev/sdh	b	640	0	0	8	113	1	1	15
++#/dev/sg		c	640	0	0	21	0	0	1	15
++#/dev/scd	b	640	0	0	11	0	0	1	15
++#/dev/st		c	640	0	0	9	0	0	1	8
++#/dev/nst	c	640	0	0	9	128	0	1	8
++#/dev/st	c	640	0	0	9	32	1	1	4
++#/dev/st	c	640	0	0	9	64	1	1	4
++#/dev/st	c	640	0	0	9	96	1	1	4
++
++# Floppy disk devices
++#/dev/fd		b	640	0	0	2	0	0	1	2
++#/dev/fd0d360	b	640	0	0	2	4	0	0	-
++#/dev/fd1d360	b	640	0	0	2	5	0	0	-
++#/dev/fd0h1200	b	640	0	0	2	8	0	0	-
++#/dev/fd1h1200	b	640	0	0	2	9	0	0	-
++#/dev/fd0u1440	b	640	0	0	2	28	0	0	-
++#/dev/fd1u1440	b	640	0	0	2	29	0	0	-
++#/dev/fd0u2880	b	640	0	0	2	32	0	0	-
++#/dev/fd1u2880	b	640	0	0	2	33	0	0	-
++
++# All the proprietary cdrom devices in the world
++#/dev/aztcd	b	640	0	0	29	0	0	0	-
++#/dev/bpcd	b	640	0	0	41	0	0	0	-
++#/dev/capi20	c	640	0	0	68	0	0	1	2
++#/dev/cdu31a	b	640	0	0	15	0	0	0	-
++#/dev/cdu535	b	640	0	0	24	0	0	0	-
++#/dev/cm206cd	b	640	0	0	32	0	0	0	-
++#/dev/sjcd	b	640	0	0	18	0	0	0	-
++#/dev/sonycd	b	640	0	0	15	0	0	0	-
++#/dev/gscd	b	640	0	0	16	0	0	0	-
++#/dev/sbpcd	b	640	0	0	25	0	0	0	-
++#/dev/sbpcd	b	640	0	0	25	0	0	1	4
++#/dev/mcd	b	640	0	0	23	0	0	0	-
++#/dev/optcd	b	640	0	0	17	0	0	0	-
++
+--- cramfs-1.1.orig/mkcramfs.c	2002-02-20 01:03:32.000000000 -0700
++++ cramfs-1.1/mkcramfs.c	2002-12-21 01:25:17.000000000 -0700
+@@ -1,3 +1,4 @@
++/* vi: set sw=8 ts=8: */
+ /*
+  * mkcramfs - make a cramfs file system
+  *
+@@ -16,12 +17,21 @@
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ * Added device table support (code taken from mkfs.jffs2.c, credit to
++ * Erik Andersen <andersen@codepoet.org>) as well as an option to squash
++ * permissions. - Russ Dill <Russ.Dill@asu.edu> September 2002
++ *
++ * Reworked, cleaned up, and updated for cramfs-1.1, December 2002
++ *  - Erik Andersen <andersen@codepoet.org>
++ *
+  */
+ 
+ /*
+  * If you change the disk format of cramfs, please update fs/cramfs/README.
+  */
+ 
++#define _GNU_SOURCE
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <sys/stat.h>
+@@ -33,8 +43,15 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <stdarg.h>
++#include <libgen.h>
++#include <ctype.h>
++#include <assert.h>
++#include <getopt.h>
+ #include <linux/cramfs_fs.h>
+ #include <zlib.h>
++#ifdef DMALLOC
++#include <dmalloc.h>
++#endif
+ 
+ /* Exit codes used by mkfs-type programs */
+ #define MKFS_OK          0	/* No errors */
+@@ -71,11 +88,17 @@
+ 		  + (1 << CRAMFS_SIZE_WIDTH) - 1 /* filesize */ \
+ 		  + (1 << CRAMFS_SIZE_WIDTH) * 4 / PAGE_CACHE_SIZE /* block pointers */ )
+ 
++
++/* The kernel assumes PAGE_CACHE_SIZE as block size. */
++#define PAGE_CACHE_SIZE (4096)
++
++
+ static const char *progname = "mkcramfs";
+ static unsigned int blksize = PAGE_CACHE_SIZE;
+ static long total_blocks = 0, total_nodes = 1; /* pre-count the root node */
+ static int image_length = 0;
+ 
++
+ /*
+  * If opt_holes is set, then mkcramfs can create explicit holes in the
+  * data, which saves 26 bytes per hole (which is a lot smaller a
+@@ -91,10 +114,12 @@
+ static int opt_holes = 0;
+ static int opt_pad = 0;
+ static int opt_verbose = 0;
++static int opt_squash = 0;
+ static char *opt_image = NULL;
+ static char *opt_name = NULL;
+ 
+ static int warn_dev, warn_gid, warn_namelen, warn_skip, warn_size, warn_uid;
++static const char *const memory_exhausted = "memory exhausted";
+ 
+ /* In-core version of inode / directory entry. */
+ struct entry {
+@@ -123,7 +148,7 @@
+ {
+ 	FILE *stream = status ? stderr : stdout;
+ 
+-	fprintf(stream, "usage: %s [-h] [-e edition] [-i file] [-n name] dirname outfile\n"
++	fprintf(stream, "usage: %s [-h] [-e edition] [-i file] [-n name] [-D file] dirname outfile\n"
+ 		" -h         print this help\n"
+ 		" -E         make all warnings errors (non-zero exit status)\n"
+ 		" -e edition set edition number (part of fsid)\n"
+@@ -133,39 +158,157 @@
+ 		" -s         sort directory entries (old option, ignored)\n"
+ 		" -v         be more verbose\n"
+ 		" -z         make explicit holes (requires >= 2.3.39)\n"
+-		" dirname    root of the directory tree to be compressed\n"
++		" -D         Use the named FILE as a device table file\n"
++		" -q         squash permissions (make everything owned by root)\n"
++		" dirname    root of the filesystem to be compressed\n"
+ 		" outfile    output file\n", progname, PAD_SIZE);
+ 
+ 	exit(status);
+ }
+ 
+-static void die(int status, int syserr, const char *fmt, ...)
++static void verror_msg(const char *s, va_list p)
++{
++	fflush(stdout);
++	fprintf(stderr, "mkcramfs: ");
++	vfprintf(stderr, s, p);
++}
++
++static void vperror_msg(const char *s, va_list p)
++{
++	int err = errno;
++
++	if (s == 0)
++		s = "";
++	verror_msg(s, p);
++	if (*s)
++		s = ": ";
++	fprintf(stderr, "%s%s\n", s, strerror(err));
++}
++
++static void perror_msg(const char *s, ...)
++{
++	va_list p;
++
++	va_start(p, s);
++	vperror_msg(s, p);
++	va_end(p);
++}
++
++static void error_msg_and_die(const char *s, ...)
++{
++	va_list p;
++
++	va_start(p, s);
++	verror_msg(s, p);
++	va_end(p);
++	putc('\n', stderr);
++	exit(MKFS_ERROR);
++}
++
++static void perror_msg_and_die(const char *s, ...)
++{
++	va_list p;
++
++	va_start(p, s);
++	vperror_msg(s, p);
++	va_end(p);
++	exit(MKFS_ERROR);
++}
++#ifndef DMALLOC
++extern char *xstrdup(const char *s)
++{
++	char *t;
++
++	if (s == NULL)
++		return NULL;
++	t = strdup(s);
++	if (t == NULL)
++		error_msg_and_die(memory_exhausted);
++	return t;
++}
++
++extern void *xmalloc(size_t size)
++{
++	void *ptr = malloc(size);
++
++	if (ptr == NULL && size != 0)
++		error_msg_and_die(memory_exhausted);
++	return ptr;
++}
++
++extern void *xcalloc(size_t nmemb, size_t size)
++{
++	void *ptr = calloc(nmemb, size);
++
++	if (ptr == NULL && nmemb != 0 && size != 0)
++		error_msg_and_die(memory_exhausted);
++	return ptr;
++}
++
++extern void *xrealloc(void *ptr, size_t size)
++{
++	ptr = realloc(ptr, size);
++	if (ptr == NULL && size != 0)
++		error_msg_and_die(memory_exhausted);
++	return ptr;
++}
++#endif
++
++static FILE *xfopen(const char *path, const char *mode)
+ {
+-	va_list arg_ptr;
+-	int save = errno;
++	FILE *fp;
++
++	if ((fp = fopen(path, mode)) == NULL)
++		perror_msg_and_die("%s", path);
++	return fp;
++}
+ 
+-	fflush(0);
+-	va_start(arg_ptr, fmt);
+-	fprintf(stderr, "%s: ", progname);
+-	vfprintf(stderr, fmt, arg_ptr);
+-	if (syserr) {
+-		fprintf(stderr, ": %s", strerror(save));
++extern int xopen(const char *pathname, int flags, mode_t mode)
++{
++	int ret;
++	
++	if (flags & O_CREAT)
++		ret = open(pathname, flags, mode);
++	else
++		ret = open(pathname, flags);
++	if (ret == -1) {
++		perror_msg_and_die("%s", pathname);
+ 	}
+-	fprintf(stderr, "\n");
+-	va_end(arg_ptr);
+-	exit(status);
++	return ret;
+ }
+ 
++extern char *xreadlink(const char *path)
++{                       
++	static const int GROWBY = 80; /* how large we will grow strings by */
++
++	char *buf = NULL;   
++	int bufsize = 0, readsize = 0;
++
++	do {
++		buf = xrealloc(buf, bufsize += GROWBY);
++		readsize = readlink(path, buf, bufsize); /* 1st try */
++		if (readsize == -1) {
++		    perror_msg("%s:%s", progname, path);
++		    return NULL;
++		}
++	}           
++	while (bufsize < readsize + 1);
++
++	buf[readsize] = '\0';
++
++	return buf;
++}       
++
+ static void map_entry(struct entry *entry)
+ {
+ 	if (entry->path) {
+ 		entry->fd = open(entry->path, O_RDONLY);
+ 		if (entry->fd < 0) {
+-			die(MKFS_ERROR, 1, "open failed: %s", entry->path);
++			error_msg_and_die("open failed: %s", entry->path);
+ 		}
+ 		entry->uncompressed = mmap(NULL, entry->size, PROT_READ, MAP_PRIVATE, entry->fd, 0);
+ 		if (entry->uncompressed == MAP_FAILED) {
+-			die(MKFS_ERROR, 1, "mmap failed: %s", entry->path);
++			error_msg_and_die("mmap failed: %s", entry->path);
+ 		}
+ 	}
+ }
+@@ -174,8 +317,9 @@
+ {
+ 	if (entry->path) {
+ 		if (munmap(entry->uncompressed, entry->size) < 0) {
+-			die(MKFS_ERROR, 1, "munmap failed: %s", entry->path);
++			error_msg_and_die("munmap failed: %s", entry->path);
+ 		}
++		entry->uncompressed=NULL;
+ 		close(entry->fd);
+ 	}
+ }
+@@ -204,7 +348,8 @@
+ 		find_identical_file(orig->next, newfile));
+ }
+ 
+-static void eliminate_doubles(struct entry *root, struct entry *orig) {
++static void eliminate_doubles(struct entry *root, struct entry *orig) 
++{
+ 	if (orig) {
+ 		if (orig->size && (orig->path || orig->uncompressed))
+ 			find_identical_file(root, orig);
+@@ -232,10 +377,7 @@
+ 
+ 	/* Set up the path. */
+ 	/* TODO: Reuse the parent's buffer to save memcpy'ing and duplication. */
+-	path = malloc(len + 1 + MAX_INPUT_NAMELEN + 1);
+-	if (!path) {
+-		die(MKFS_ERROR, 1, "malloc failed");
+-	}
++	path = xmalloc(len + 1 + MAX_INPUT_NAMELEN + 1);
+ 	memcpy(path, name, len);
+ 	endpath = path + len;
+ 	*endpath = '/';
+@@ -245,7 +387,7 @@
+ 	dircount = scandir(name, &dirlist, 0, cramsort);
+ 
+ 	if (dircount < 0) {
+-		die(MKFS_ERROR, 1, "scandir failed: %s", name);
++		error_msg_and_die("scandir failed: %s", name);
+ 	}
+ 
+ 	/* process directory */
+@@ -269,25 +411,20 @@
+ 		}
+ 		namelen = strlen(dirent->d_name);
+ 		if (namelen > MAX_INPUT_NAMELEN) {
+-			die(MKFS_ERROR, 0,
+-				"very long (%u bytes) filename found: %s\n"
+-				"please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile",
++			error_msg_and_die(
++				"Very long (%u bytes) filename `%s' found.\n"
++				" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n",
+ 				namelen, dirent->d_name);
+ 		}
+ 		memcpy(endpath, dirent->d_name, namelen + 1);
+ 
+ 		if (lstat(path, &st) < 0) {
++			perror(endpath);
+ 			warn_skip = 1;
+ 			continue;
+ 		}
+-		entry = calloc(1, sizeof(struct entry));
+-		if (!entry) {
+-			die(MKFS_ERROR, 1, "calloc failed");
+-		}
+-		entry->name = strdup(dirent->d_name);
+-		if (!entry->name) {
+-			die(MKFS_ERROR, 1, "strdup failed");
+-		}
++		entry = xcalloc(1, sizeof(struct entry));
++		entry->name = xstrdup(dirent->d_name);
+ 		/* truncate multi-byte UTF-8 filenames on character boundary */
+ 		if (namelen > CRAMFS_MAXPATHLEN) {
+ 			namelen = CRAMFS_MAXPATHLEN;
+@@ -297,24 +434,25 @@
+ 				namelen--;
+ 				/* are we reasonably certain it was UTF-8 ? */
+ 				if (entry->name[namelen] < 0x80 || !namelen) {
+-					die(MKFS_ERROR, 0, "cannot truncate filenames not encoded in UTF-8");
++					error_msg_and_die("cannot truncate filenames not encoded in UTF-8");
+ 				}
+ 			}
+ 			entry->name[namelen] = '\0';
+ 		}
+ 		entry->mode = st.st_mode;
+ 		entry->size = st.st_size;
+-		entry->uid = st.st_uid;
++		entry->uid = opt_squash ? 0 : st.st_uid;
+ 		if (entry->uid >= 1 << CRAMFS_UID_WIDTH)
+ 			warn_uid = 1;
+-		entry->gid = st.st_gid;
+-		if (entry->gid >= 1 << CRAMFS_GID_WIDTH)
++		entry->gid = opt_squash ? 0 : st.st_gid;
++		if (entry->gid >= 1 << CRAMFS_GID_WIDTH) {
+ 			/* TODO: We ought to replace with a default
+ 			   gid instead of truncating; otherwise there
+ 			   are security problems.  Maybe mode should
+ 			   be &= ~070.  Same goes for uid once Linux
+ 			   supports >16-bit uids. */
+ 			warn_gid = 1;
++		}
+ 		size = sizeof(struct cramfs_inode) + ((namelen + 3) & ~3);
+ 		*fslen_ub += size;
+ 		if (S_ISDIR(st.st_mode)) {
+@@ -325,21 +463,15 @@
+ 					warn_skip = 1;
+ 					continue;
+ 				}
+-				entry->path = strdup(path);
+-				if (!entry->path) {
+-					die(MKFS_ERROR, 1, "strdup failed");
+-				}
++				entry->path = xstrdup(path);
+ 				if ((entry->size >= 1 << CRAMFS_SIZE_WIDTH)) {
+ 					warn_size = 1;
+ 					entry->size = (1 << CRAMFS_SIZE_WIDTH) - 1;
+ 				}
+ 			}
+ 		} else if (S_ISLNK(st.st_mode)) {
+-			entry->uncompressed = malloc(entry->size);
++			entry->uncompressed = xreadlink(path);
+ 			if (!entry->uncompressed) {
+-				die(MKFS_ERROR, 1, "malloc failed");
+-			}
+-			if (readlink(path, entry->uncompressed, entry->size) < 0) {
+ 				warn_skip = 1;
+ 				continue;
+ 			}
+@@ -351,7 +483,7 @@
+ 			if (entry->size & -(1<<CRAMFS_SIZE_WIDTH))
+ 				warn_dev = 1;
+ 		} else {
+-			die(MKFS_ERROR, 0, "bogus file type: %s", entry->name);
++			error_msg_and_die("bogus file type: %s", entry->name);
+ 		}
+ 
+ 		if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
+@@ -378,7 +510,9 @@
+ 	struct cramfs_super *super = (struct cramfs_super *) base;
+ 	unsigned int offset = sizeof(struct cramfs_super) + image_length;
+ 
+-	offset += opt_pad;	/* 0 if no padding */
++	if (opt_pad) {
++		offset += opt_pad;	/* 0 if no padding */
++	}
+ 
+ 	super->magic = CRAMFS_MAGIC;
+ 	super->flags = CRAMFS_FLAG_FSID_VERSION_2 | CRAMFS_FLAG_SORTED_DIRS;
+@@ -414,10 +548,10 @@
+ 	struct cramfs_inode *inode = (struct cramfs_inode *) (base + entry->dir_offset);
+ 
+ 	if ((offset & 3) != 0) {
+-		die(MKFS_ERROR, 0, "illegal offset of %lu bytes", offset);
++		error_msg_and_die("illegal offset of %lu bytes", offset);
+ 	}
+ 	if (offset >= (1 << (2 + CRAMFS_OFFSET_WIDTH))) {
+-		die(MKFS_ERROR, 0, "filesystem too big");
++		error_msg_and_die("filesystem too big");
+ 	}
+ 	inode->offset = (offset >> 2);
+ }
+@@ -429,7 +563,7 @@
+  */
+ static void print_node(struct entry *e)
+ {
+-	char info[10];
++	char info[12];
+ 	char type = '?';
+ 
+ 	if (S_ISREG(e->mode)) type = 'f';
+@@ -442,11 +576,11 @@
+ 
+ 	if (S_ISCHR(e->mode) || (S_ISBLK(e->mode))) {
+ 		/* major/minor numbers can be as high as 2^12 or 4096 */
+-		snprintf(info, 10, "%4d,%4d", major(e->size), minor(e->size));
++		snprintf(info, 11, "%4d,%4d", major(e->size), minor(e->size));
+ 	}
+ 	else {
+ 		/* size be as high as 2^24 or 16777216 */
+-		snprintf(info, 10, "%9d", e->size);
++		snprintf(info, 11, "%9d", e->size);
+ 	}
+ 
+ 	printf("%c %04o %s %5d:%-3d %s\n",
+@@ -462,17 +596,9 @@
+ {
+ 	int stack_entries = 0;
+ 	int stack_size = 64;
+-	struct entry **entry_stack;
+-
+-	entry_stack = malloc(stack_size * sizeof(struct entry *));
+-	if (!entry_stack) {
+-		die(MKFS_ERROR, 1, "malloc failed");
+-	}
+-
+-	if (opt_verbose) {
+-		printf("root:\n");
+-	}
++	struct entry **entry_stack = NULL;
+ 
++	entry_stack = xmalloc(stack_size * sizeof(struct entry *));
+ 	for (;;) {
+ 		int dir_start = stack_entries;
+ 		while (entry) {
+@@ -506,10 +632,7 @@
+ 			if (entry->child) {
+ 				if (stack_entries >= stack_size) {
+ 					stack_size *= 2;
+-					entry_stack = realloc(entry_stack, stack_size * sizeof(struct entry *));
+-					if (!entry_stack) {
+-						die(MKFS_ERROR, 1, "realloc failed");
+-					}
++					entry_stack = xrealloc(entry_stack, stack_size * sizeof(struct entry *));
+ 				}
+ 				entry_stack[stack_entries] = entry;
+ 				stack_entries++;
+@@ -543,7 +666,7 @@
+ 
+ 		set_data_offset(entry, base, offset);
+ 		if (opt_verbose) {
+-			printf("%s:\n", entry->name);
++		    printf("'%s':\n", entry->name);
+ 		}
+ 		entry = entry->child;
+ 	}
+@@ -553,16 +676,21 @@
+ 
+ static int is_zero(char const *begin, unsigned len)
+ {
+-	/* Returns non-zero iff the first LEN bytes from BEGIN are all NULs. */
+-	return (len-- == 0 ||
+-		(begin[0] == '\0' &&
+-		 (len-- == 0 ||
+-		  (begin[1] == '\0' &&
+-		   (len-- == 0 ||
+-		    (begin[2] == '\0' &&
+-		     (len-- == 0 ||
+-		      (begin[3] == '\0' &&
+-		       memcmp(begin, begin + 4, len) == 0))))))));
++	if (opt_holes)
++		/* Returns non-zero iff the first LEN bytes from BEGIN are
++		   all NULs. */
++		return (len-- == 0 ||
++			(begin[0] == '\0' &&
++			 (len-- == 0 ||
++			  (begin[1] == '\0' &&
++			   (len-- == 0 ||
++			    (begin[2] == '\0' &&
++			     (len-- == 0 ||
++			      (begin[3] == '\0' &&
++			       memcmp(begin, begin + 4, len) == 0))))))));
++	else
++		/* Never create holes. */
++		return 0;
+ }
+ 
+ /*
+@@ -575,37 +703,34 @@
+  * Note that size > 0, as a zero-sized file wouldn't ever
+  * have gotten here in the first place.
+  */
+-static unsigned int do_compress(char *base, unsigned int offset, char const *name, char *uncompressed, unsigned int size)
++static unsigned int do_compress(char *base, unsigned int offset, struct entry *entry)
+ {
++	unsigned int size = entry->size;
+ 	unsigned long original_size = size;
+ 	unsigned long original_offset = offset;
+ 	unsigned long new_size;
+ 	unsigned long blocks = (size - 1) / blksize + 1;
+ 	unsigned long curr = offset + 4 * blocks;
+ 	int change;
++	char *uncompressed = entry->uncompressed;
+ 
+-	total_blocks += blocks;
++	total_blocks += blocks; 
+ 
+ 	do {
+ 		unsigned long len = 2 * blksize;
+ 		unsigned int input = size;
+-		int err;
+-
+ 		if (input > blksize)
+ 			input = blksize;
+ 		size -= input;
+-		if (!(opt_holes && is_zero (uncompressed, input))) {
+-			err = compress2(base + curr, &len, uncompressed, input, Z_BEST_COMPRESSION);
+-			if (err != Z_OK) {
+-				die(MKFS_ERROR, 0, "compression error: %s", zError(err));
+-			}
++		if (!is_zero (uncompressed, input)) {
++			compress(base + curr, &len, uncompressed, input);
+ 			curr += len;
+ 		}
+ 		uncompressed += input;
+ 
+ 		if (len > blksize*2) {
+ 			/* (I don't think this can happen with zlib.) */
+-			die(MKFS_ERROR, 0, "AIEEE: block \"compressed\" to > 2*blocklength (%ld)", len);
++			error_msg_and_die("AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n", len);
+ 		}
+ 
+ 		*(u32 *) (base + offset) = curr;
+@@ -618,10 +743,12 @@
+ 	   st_blocks * 512.  But if you say that then perhaps
+ 	   administrative data should also be included in both. */
+ 	change = new_size - original_size;
+-	if (opt_verbose > 1) {
+-		printf("%6.2f%% (%+d bytes)\t%s\n",
+-		       (change * 100) / (double) original_size, change, name);
++#if 0
++	if (opt_verbose) {
++	    printf("%6.2f%% (%+d bytes)\t%s\n",
++		    (change * 100) / (double) original_size, change, entry->name);
+ 	}
++#endif
+ 
+ 	return curr;
+ }
+@@ -644,7 +771,7 @@
+ 				set_data_offset(entry, base, offset);
+ 				entry->offset = offset;
+ 				map_entry(entry);
+-				offset = do_compress(base, offset, entry->name, entry->uncompressed, entry->size);
++				offset = do_compress(base, offset, entry);
+ 				unmap_entry(entry);
+ 			}
+ 		}
+@@ -660,13 +787,10 @@
+ 	int fd;
+ 	char *buf;
+ 
+-	fd = open(file, O_RDONLY);
+-	if (fd < 0) {
+-		die(MKFS_ERROR, 1, "open failed: %s", file);
+-	}
++	fd = xopen(file, O_RDONLY, 0);
+ 	buf = mmap(NULL, image_length, PROT_READ, MAP_PRIVATE, fd, 0);
+ 	if (buf == MAP_FAILED) {
+-		die(MKFS_ERROR, 1, "mmap failed");
++		error_msg_and_die("mmap failed");
+ 	}
+ 	memcpy(base + offset, buf, image_length);
+ 	munmap(buf, image_length);
+@@ -679,6 +803,328 @@
+ 	return (offset + image_length);
+ }
+ 
++static struct entry *find_filesystem_entry(struct entry *dir, char *name, mode_t type)
++{
++	struct entry *e = dir;
++
++	if (S_ISDIR(dir->mode)) {
++		e = dir->child;
++	}
++	while (e) {
++		/* Only bother to do the expensive strcmp on matching file types */
++		if (type == (e->mode & S_IFMT) && e->name) {
++			if (S_ISDIR(e->mode)) {
++				int len = strlen(e->name);
++
++				/* Check if we are a parent of the correct path */
++				if (strncmp(e->name, name, len) == 0) {
++					/* Is this an _exact_ match? */
++					if (strcmp(name, e->name) == 0) {
++						return (e);
++					}
++					/* Looks like we found a parent of the correct path */
++					if (name[len] == '/') {
++						if (e->child) {
++							return (find_filesystem_entry (e, name + len + 1, type));
++						} else {
++							return NULL;
++						}
++					}
++				}
++			} else {
++				if (strcmp(name, e->name) == 0) {
++					return (e);
++				}
++			}
++		}
++		e = e->next;
++	}
++	return (NULL);
++}
++
++void modify_entry(char *full_path, unsigned long uid, unsigned long gid, 
++	unsigned long mode, unsigned long rdev, struct entry *root, loff_t *fslen_ub)
++{
++	char *name, *path, *full;
++	struct entry *curr, *parent, *entry, *prev;
++	
++	full = xstrdup(full_path);
++	path = xstrdup(dirname(full));
++	name = full_path + strlen(path) + 1;
++	free(full);
++	if (strcmp(path, "/") == 0) {
++		parent = root;
++		name = full_path + 1;
++	} else {
++		if (!(parent = find_filesystem_entry(root, path+1, S_IFDIR)))
++			error_msg_and_die("%s/%s: could not find parent\n", path, name);
++	}
++	if ((entry = find_filesystem_entry(parent, name, (mode & S_IFMT)))) {
++		/* its there, just modify permissions */
++		entry->mode = mode;
++		entry->uid = uid;
++		entry->gid = gid;
++	} else { /* make a new entry */
++	
++		/* code partially replicated from parse_directory() */
++		size_t namelen;
++		if (S_ISREG(mode)) {
++			error_msg_and_die("%s: regular file from device_table file must exist on disk!", full_path);
++		}
++
++		namelen = strlen(name);
++		if (namelen > MAX_INPUT_NAMELEN) {
++			error_msg_and_die(
++				"Very long (%u bytes) filename `%s' found.\n"
++				" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile.  Exiting.\n",
++				namelen, name);
++		}
++		entry = xcalloc(1, sizeof(struct entry));
++		entry->name = xstrdup(name);
++		/* truncate multi-byte UTF-8 filenames on character boundary */
++		if (namelen > CRAMFS_MAXPATHLEN) {
++			namelen = CRAMFS_MAXPATHLEN;
++			warn_namelen = 1;
++			/* the first lost byte must not be a trail byte */
++			while ((entry->name[namelen] & 0xc0) == 0x80) {
++				namelen--;
++				/* are we reasonably certain it was UTF-8 ? */
++				if (entry->name[namelen] < 0x80 || !namelen) {
++					error_msg_and_die("cannot truncate filenames not encoded in UTF-8");
++				}
++			}
++			entry->name[namelen] = '\0';
++		}
++		entry->mode = mode;
++		entry->uid = uid;
++		entry->gid = gid;
++		entry->size = 0;
++		if (S_ISBLK(mode) || S_ISCHR(mode)) {
++			entry->size = rdev;
++			if (entry->size & -(1<<CRAMFS_SIZE_WIDTH))
++				warn_dev = 1;
++		}
++		
++		/* ok, now we have to backup and correct the size of all the entries above us */
++		*fslen_ub += sizeof(struct cramfs_inode) + ((namelen + 3) & ~3);
++		parent->size += sizeof(struct cramfs_inode) + ((namelen + 3) & ~3);
++
++		/* alright, time to link us in */
++		curr = parent->child;
++		prev = NULL;
++		while (curr && strcmp(name, curr->name) > 0) {
++			prev = curr;
++			curr = curr->next;
++		}
++		if (!prev) parent->child = entry;
++		else prev->next = entry;
++		entry->next = curr;
++		entry->child = NULL;
++	}
++	if (entry->uid >= 1 << CRAMFS_UID_WIDTH)
++		warn_uid = 1;
++	if (entry->gid >= 1 << CRAMFS_GID_WIDTH) {
++		/* TODO: We ought to replace with a default
++		   gid instead of truncating; otherwise there
++		   are security problems.  Maybe mode should
++		   be &= ~070.  Same goes for uid once Linux
++		   supports >16-bit uids. */
++		warn_gid = 1;
++	}
++	free(path);
++}
++
++/* the GNU C library has a wonderful scanf("%as", string) which will
++ allocate the string with the right size, good to avoid buffer overruns. 
++ the following macros use it if available or use a hacky workaround...
++ */
++
++#ifdef __GNUC__
++#define SCANF_PREFIX "a"
++#define SCANF_STRING(s) (&s)
++#define GETCWD_SIZE 0
++#else
++#define SCANF_PREFIX "511"
++#define SCANF_STRING(s) (s = xmalloc(512))
++#define GETCWD_SIZE -1
++inline int snprintf(char *str, size_t n, const char *fmt, ...)
++{
++	int ret;
++	va_list ap;
++
++	va_start(ap, fmt);
++	ret = vsprintf(str, fmt, ap);
++	va_end(ap);
++	return ret;
++}
++#endif
++
++/*  device table entries take the form of:
++    <path>	<type> <mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
++    /dev/mem     c    640       0       0         1       1       0     0         -
++
++    type can be one of: 
++	f	A regular file
++	d	Directory
++	c	Character special device file
++	b	Block special device file
++	p	Fifo (named pipe)
++
++    I don't bother with symlinks (permissions are irrelevant), hard
++    links (special cases of regular files), or sockets (why bother).
++
++    Regular files must exist in the target root directory.  If a char,
++    block, fifo, or directory does not exist, it will be created.
++*/
++
++static int interpret_table_entry(char *line, struct entry *root, loff_t *fslen_ub)
++{
++	char type, *name = NULL;
++	unsigned long mode = 0755, uid = 0, gid = 0, major = 0, minor = 0;
++	unsigned long start = 0, increment = 1, count = 0;
++
++	if (sscanf (line, "%" SCANF_PREFIX "s %c %lo %lu %lu %lu %lu %lu %lu %lu",
++		 SCANF_STRING(name), &type, &mode, &uid, &gid, &major, &minor,
++		 &start, &increment, &count) < 0) 
++	{
++		return 1;
++	}
++
++	if (!strcmp(name, "/")) {
++		error_msg_and_die("Device table entries require absolute paths");
++	}
++
++	switch (type) {
++	case 'd':
++		mode |= S_IFDIR;
++		modify_entry(name, uid, gid, mode, 0, root, fslen_ub);
++		break;
++	case 'f':
++		mode |= S_IFREG;
++		modify_entry(name, uid, gid, mode, 0, root, fslen_ub);
++		break;
++	case 'p':
++		mode |= S_IFIFO;
++		modify_entry(name, uid, gid, mode, 0, root, fslen_ub);
++		break;
++	case 'c':
++	case 'b':
++		mode |= (type == 'c') ? S_IFCHR : S_IFBLK;
++		if (count > 0) {
++			char *buf;
++			unsigned long i;
++			dev_t rdev;
++
++			for (i = start; i < count; i++) {
++				asprintf(&buf, "%s%lu", name, i);
++				rdev = makedev(major, minor + (i * increment - start));
++				modify_entry(buf, uid, gid, mode, rdev, root, fslen_ub);
++				free(buf);
++			}
++		} else {
++			dev_t rdev = makedev(major, minor);
++			modify_entry(name, uid, gid, mode, rdev, root, fslen_ub);
++		}
++		break;
++	default:
++		error_msg_and_die("Unsupported file type");
++	}
++	free(name);
++	return 0;
++}
++
++static int parse_device_table(FILE *file, struct entry *root, loff_t *fslen_ub)
++{
++	char *line;
++	int status = 0;
++	size_t length = 0;
++
++	/* Turn off squash, since we must ensure that values
++	 * entered via the device table are not squashed */
++	opt_squash = 0;
++
++	/* Looks ok so far.  The general plan now is to read in one
++	 * line at a time, check for leading comment delimiters ('#'),
++	 * then try and parse the line as a device table.  If we fail
++	 * to parse things, try and help the poor fool to fix their
++	 * device table with a useful error msg... */
++	line = NULL;
++	while (getline(&line, &length, file) != -1) {
++		/* First trim off any whitespace */
++		int len = strlen(line);
++
++		/* trim trailing whitespace */
++		while (len > 0 && isspace(line[len - 1]))
++			line[--len] = '\0';
++		/* trim leading whitespace */
++		memmove(line, &line[strspn(line, " \n\r\t\v")], len);
++
++		/* How long are we after trimming? */
++		len = strlen(line);
++
++		/* If this is NOT a comment line, try to interpret it */
++		if (len && *line != '#') {
++			if (interpret_table_entry(line, root, fslen_ub))
++				status = 1;
++		}
++
++		free(line);
++		line = NULL;
++	}
++	free(line);
++	fclose(file);
++
++	return status;
++}
++
++void traverse(struct entry *entry, int depth)
++{
++	struct entry *curr = entry;
++	int i;
++
++	while (curr) {
++		for (i = 0; i < depth; i++) putchar(' ');
++		printf("%s: size=%d mode=%d same=%p\n",
++			(curr->name)? (char*)curr->name : "/", 
++			curr->size, curr->mode, curr->same);
++		if (curr->child) traverse(curr->child, depth + 4);
++		curr = curr->next;
++	}
++}
++
++static void free_filesystem_entry(struct entry *dir)
++{
++	struct entry *e = dir, *last;
++
++	if (S_ISDIR(dir->mode)) {
++		e = dir->child;
++	}
++	while (e) {
++		if (e->name)
++			free(e->name);
++		if (e->path)
++			free(e->path);
++		if (e->uncompressed)
++			free(e->uncompressed);
++		last = e;
++		if (e->child) {
++			free_filesystem_entry(e);
++		}
++		e = e->next;
++		free(last);
++	}
++}
++
++
++/*
++ * Usage:
++ *
++ *      mkcramfs directory-name outfile
++ *
++ * where "directory-name" is simply the root of the directory
++ * tree that we want to generate a compressed filesystem out
++ * of.
++ */
+ int main(int argc, char **argv)
+ {
+ 	struct stat st;		/* used twice... */
+@@ -692,6 +1138,7 @@
+ 	u32 crc;
+ 	int c;			/* for getopt */
+ 	char *ep;		/* for strtoul */
++	FILE *devtable = NULL;
+ 
+ 	total_blocks = 0;
+ 
+@@ -699,7 +1146,7 @@
+ 		progname = argv[0];
+ 
+ 	/* command line options */
+-	while ((c = getopt(argc, argv, "hEe:i:n:psvz")) != EOF) {
++	while ((c = getopt(argc, argv, "hEe:i:n:psvzD:q")) != EOF) {
+ 		switch (c) {
+ 		case 'h':
+ 			usage(MKFS_OK);
+@@ -715,7 +1162,7 @@
+ 		case 'i':
+ 			opt_image = optarg;
+ 			if (lstat(opt_image, &st) < 0) {
+-				die(MKFS_ERROR, 1, "lstat failed: %s", opt_image);
++				error_msg_and_die("lstat failed: %s", opt_image);
+ 			}
+ 			image_length = st.st_size; /* may be padded later */
+ 			fslen_ub += (image_length + 3); /* 3 is for padding */
+@@ -736,6 +1183,16 @@
+ 		case 'z':
+ 			opt_holes = 1;
+ 			break;
++		case 'q':
++			opt_squash = 1;
++			break;
++		case 'D':
++			devtable = xfopen(optarg, "r");
++			if (fstat(fileno(devtable), &st) < 0)
++				perror_msg_and_die(optarg);
++			if (st.st_size < 10)
++				error_msg_and_die("%s: not a proper device table file\n", optarg);
++			break;
+ 		}
+ 	}
+ 
+@@ -745,25 +1202,23 @@
+ 	outfile = argv[optind + 1];
+ 
+ 	if (stat(dirname, &st) < 0) {
+-		die(MKFS_USAGE, 1, "stat failed: %s", dirname);
+-	}
+-	fd = open(outfile, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+-	if (fd < 0) {
+-		die(MKFS_USAGE, 1, "open failed: %s", outfile);
++		error_msg_and_die("stat failed: %s", dirname);
+ 	}
++	fd = xopen(outfile, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+ 
+-	root_entry = calloc(1, sizeof(struct entry));
+-	if (!root_entry) {
+-		die(MKFS_ERROR, 1, "calloc failed");
+-	}
++	root_entry = xcalloc(1, sizeof(struct entry));
+ 	root_entry->mode = st.st_mode;
+ 	root_entry->uid = st.st_uid;
+ 	root_entry->gid = st.st_gid;
+ 
+ 	root_entry->size = parse_directory(root_entry, dirname, &root_entry->child, &fslen_ub);
+ 
++	if (devtable) {
++		parse_device_table(devtable, root_entry, &fslen_ub);
++	}
++
+ 	/* always allocate a multiple of blksize bytes because that's
+-	   what we're going to write later on */
++           what we're going to write later on */
+ 	fslen_ub = ((fslen_ub - 1) | (blksize - 1)) + 1;
+ 
+ 	if (fslen_ub > MAXFSLEN) {
+@@ -790,7 +1245,7 @@
+ 	rom_image = mmap(NULL, fslen_ub?fslen_ub:1, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ 
+ 	if (rom_image == MAP_FAILED) {
+-		die(MKFS_ERROR, 1, "mmap failed");
++		error_msg_and_die("mmap failed");
+ 	}
+ 
+ 	/* Skip the first opt_pad bytes for boot loader code */
+@@ -807,6 +1262,7 @@
+ 	}
+ 
+ 	offset = write_directory_structure(root_entry->child, rom_image, offset);
++	if (opt_verbose)
+ 	printf("Directory data: %d bytes\n", offset);
+ 
+ 	offset = write_data(root_entry, rom_image, offset);
+@@ -814,30 +1270,38 @@
+ 	/* We always write a multiple of blksize bytes, so that
+ 	   losetup works. */
+ 	offset = ((offset - 1) | (blksize - 1)) + 1;
++	if (opt_verbose)
+ 	printf("Everything: %d kilobytes\n", offset >> 10);
+ 
+ 	/* Write the superblock now that we can fill in all of the fields. */
+ 	write_superblock(root_entry, rom_image+opt_pad, offset);
++	if (opt_verbose)
+ 	printf("Super block: %d bytes\n", sizeof(struct cramfs_super));
+ 
+ 	/* Put the checksum in. */
+ 	crc = crc32(0L, Z_NULL, 0);
+ 	crc = crc32(crc, (rom_image+opt_pad), (offset-opt_pad));
+ 	((struct cramfs_super *) (rom_image+opt_pad))->fsid.crc = crc;
++	if (opt_verbose)
+ 	printf("CRC: %x\n", crc);
+ 
+ 	/* Check to make sure we allocated enough space. */
+ 	if (fslen_ub < offset) {
+-		die(MKFS_ERROR, 0, "not enough space allocated for ROM image (%Ld allocated, %d used)", fslen_ub, offset);
++		error_msg_and_die("not enough space allocated for ROM "
++			"image (%Ld allocated, %d used)", fslen_ub, offset);
+ 	}
+ 
+ 	written = write(fd, rom_image, offset);
+ 	if (written < 0) {
+-		die(MKFS_ERROR, 1, "write failed");
++		error_msg_and_die("write failed");
+ 	}
+ 	if (offset != written) {
+-		die(MKFS_ERROR, 0, "ROM image write failed (wrote %d of %d bytes)", written, offset);
++		error_msg_and_die("ROM image write failed (wrote %d of %d bytes)", written, offset);
+ 	}
++	
++	/* Free up memory */
++	free_filesystem_entry(root_entry);
++	free(root_entry);
+ 
+ 	/* (These warnings used to come at the start, but they scroll off the
+ 	   screen too quickly.) */
diff --git a/package/cramfs/cramfs-02-endian.patch b/package/cramfs/cramfs-02-endian.patch
new file mode 100644
index 000000000..0da55bfae
--- /dev/null
+++ b/package/cramfs/cramfs-02-endian.patch
@@ -0,0 +1,284 @@
+--- cramfs-1.1/mkcramfs.c.orig	2005-04-13 05:55:57.000000000 -0600
++++ cramfs-1.1/mkcramfs.c	2005-04-13 16:19:57.000000000 -0600
+@@ -117,6 +117,7 @@
+ static int opt_squash = 0;
+ static char *opt_image = NULL;
+ static char *opt_name = NULL;
++static int swap_endian = 0;
+ 
+ static int warn_dev, warn_gid, warn_namelen, warn_skip, warn_size, warn_uid;
+ static const char *const memory_exhausted = "memory exhausted";
+@@ -155,6 +156,8 @@
+ 		" -i file    insert a file image into the filesystem (requires >= 2.4.0)\n"
+ 		" -n name    set name of cramfs filesystem\n"
+ 		" -p         pad by %d bytes for boot code\n"
++		" -l         litte endian filesystem\n"
++		" -b         big endian filesystem\n"
+ 		" -s         sort directory entries (old option, ignored)\n"
+ 		" -v         be more verbose\n"
+ 		" -z         make explicit holes (requires >= 2.3.39)\n"
+@@ -504,6 +506,50 @@
+ 	return totalsize;
+ }
+ 
++/* routines to swap endianness/bitfields in inode/superblock block data */
++static void fix_inode(struct cramfs_inode *inode)
++{
++#define wswap(x)    (((x)>>24) | (((x)>>8)&0xff00) | (((x)&0xff00)<<8) | (((x)&0xff)<<24))
++	/* attempt #2 */
++	inode->mode = (inode->mode >> 8) | ((inode->mode&0xff)<<8);
++	inode->uid = (inode->uid >> 8) | ((inode->uid&0xff)<<8);
++	inode->size = (inode->size >> 16) | (inode->size&0xff00) |
++		((inode->size&0xff)<<16);
++	((u32*)inode)[2] = wswap(inode->offset | (inode->namelen<<26));
++}
++
++static void fix_offset(struct cramfs_inode *inode, u32 offset)
++{
++	u32 tmp = wswap(((u32*)inode)[2]);
++	((u32*)inode)[2] = wswap((offset >> 2) | (tmp&0xfc000000));
++}
++
++static void fix_block_pointer(u32 *p)
++{
++	*p = wswap(*p);
++}
++
++static void fix_super(struct cramfs_super *super)
++{
++	u32 *p = (u32*)super;
++
++	/* fix superblock fields */
++	p[0] = wswap(p[0]);	/* magic */
++	p[1] = wswap(p[1]);	/* size */
++	p[2] = wswap(p[2]);	/* flags */
++	p[3] = wswap(p[3]);	/* future */
++
++	/* fix filesystem info fields */
++	p = (u32*)&super->fsid;
++	p[0] = wswap(p[0]);	/* crc */
++	p[1] = wswap(p[1]);	/* edition */
++	p[2] = wswap(p[2]);	/* blocks */
++	p[3] = wswap(p[3]);	/* files */
++
++	fix_inode(&super->root);
++#undef wswap
++}
++
+ /* Returns sizeof(struct cramfs_super), which includes the root inode. */
+ static unsigned int write_superblock(struct entry *root, char *base, int size)
+ {
+@@ -539,6 +585,7 @@
+ 	super->root.gid = root->gid;
+ 	super->root.size = root->size;
+ 	super->root.offset = offset >> 2;
++	if (swap_endian) fix_super(super);
+ 
+ 	return offset;
+ }
+@@ -553,7 +600,10 @@
+ 	if (offset >= (1 << (2 + CRAMFS_OFFSET_WIDTH))) {
+ 		error_msg_and_die("filesystem too big");
+ 	}
+-	inode->offset = (offset >> 2);
++	if (swap_endian)
++		fix_offset(inode, offset);
++	else
++		inode->offset = (offset >> 2);
+ }
+ 
+ /*
+@@ -638,6 +688,7 @@
+ 				stack_entries++;
+ 			}
+ 			entry = entry->next;
++			if (swap_endian) fix_inode(inode);
+ 		}
+ 
+ 		/*
+@@ -734,6 +785,7 @@
+ 		}
+ 
+ 		*(u32 *) (base + offset) = curr;
++		if (swap_endian) fix_block_pointer((u32*)(base + offset));
+ 		offset += 4;
+ 	} while (size);
+ 
+@@ -1146,7 +1198,7 @@
+ 		progname = argv[0];
+ 
+ 	/* command line options */
+-	while ((c = getopt(argc, argv, "hEe:i:n:psvzD:q")) != EOF) {
++	while ((c = getopt(argc, argv, "hEe:i:n:psvzD:qlb")) != EOF) {
+ 		switch (c) {
+ 		case 'h':
+ 			usage(MKFS_OK);
+@@ -1174,6 +1227,18 @@
+ 			opt_pad = PAD_SIZE;
+ 			fslen_ub += PAD_SIZE;
+ 			break;
++		case 'b':
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++			swap_endian = 1;
++			printf("Swapping filesystem endian-ness\n");
++#endif
++			break;
++		case 'l':
++#if __BYTE_ORDER == __BIG_ENDIAN
++			swap_endian = 1;
++			printf("Swapping filesystem endian-ness\n");
++#endif
++			break;
+ 		case 's':
+ 			/* old option, ignored */
+ 			break;
+--- cramfs-1.1/cramfsck.c.orig	2005-04-25 11:50:31.000000000 -0700
++++ cramfs-1.1/cramfsck.c	2005-04-25 16:53:25.000000000 -0700
+@@ -30,6 +30,7 @@
+  * 2000/07/15: Daniel Quinlan (initial support for block devices)
+  * 2002/01/10: Daniel Quinlan (additional checks, test more return codes,
+  *                            use read if mmap fails, standardize messages)
++ * 2004/09/01: Alfonso Acosta (Add swapping support)
+  */
+ 
+ /* compile-time options */
+@@ -51,6 +52,7 @@
+ #include <utime.h>
+ #include <sys/ioctl.h>
+ #define _LINUX_STRING_H_
++#include <byteswap.h>
+ #include "linux/cramfs_fs.h"
+ #include <zlib.h>
+ 
+@@ -74,6 +76,7 @@
+ static char *filename;		/* ROM image filename */
+ struct cramfs_super super;	/* just find the cramfs superblock once */
+ static int opt_verbose = 0;	/* 1 = verbose (-v), 2+ = very verbose (-vv) */
++static int need_swapping = 0;   /* fs and host dont have the same endianness */
+ #ifdef INCLUDE_FS_TESTS
+ static int opt_extract = 0;		/* extract cramfs (-x) */
+ static char *extract_dir = "/";	/* extraction directory (-x) */
+@@ -85,6 +88,9 @@
+ static unsigned long start_data = ~0UL;	/* start of the data (256 MB = max) */
+ static unsigned long end_data = 0;	/* end of the data */
+ 
++/* access 32 byte variables */
++#define CRAMFS_32(x)  (need_swapping ? bswap_32(x) : x)
++
+ /* Guarantee access to at least 8kB at a time */
+ #define ROMBUFFER_BITS	13
+ #define ROMBUFFERSIZE	(1 << ROMBUFFER_BITS)
+@@ -166,20 +172,34 @@
+ 	if (super.magic == CRAMFS_MAGIC) {
+ 		*start = 0;
+ 	}
++	else if (super.magic == bswap_32(CRAMFS_MAGIC)) {
++		*start = 0;
++		need_swapping = 1;
++	}
++
+ 	else if (*length >= (PAD_SIZE + sizeof(super))) {
+ 		lseek(fd, PAD_SIZE, SEEK_SET);
+ 		if (read(fd, &super, sizeof(super)) != sizeof(super)) {
+ 			die(FSCK_ERROR, 1, "read failed: %s", filename);
+ 		}
+-		if (super.magic == CRAMFS_MAGIC) {
++		if (super.magic == CRAMFS_32(CRAMFS_MAGIC)) {
+ 			*start = PAD_SIZE;
+ 		}
+ 	}
+ 
+ 	/* superblock tests */
+-	if (super.magic != CRAMFS_MAGIC) {
++	if (super.magic != CRAMFS_32(CRAMFS_MAGIC)) {
+ 		die(FSCK_UNCORRECTED, 0, "superblock magic not found");
+ 	}
++	if (need_swapping){
++		super.size = bswap_32(super.size);
++		super.flags = bswap_32(super.flags);
++		super.future = bswap_32(super.future);
++		super.fsid.crc = bswap_32(super.fsid.crc);
++		super.fsid.edition = bswap_32(super.fsid.edition);
++		super.fsid.blocks = bswap_32(super.fsid.blocks);
++		super.fsid.files = bswap_32(super.fsid.files); 
++	}	
+ 	if (super.flags & ~CRAMFS_SUPPORTED_FLAGS) {
+ 		die(FSCK_ERROR, 0, "unsupported filesystem features");
+ 	}
+@@ -215,7 +235,10 @@
+ 		die(FSCK_USAGE, 0, "unable to test CRC: old cramfs format");
+ #endif /* not INCLUDE_FS_TESTS */
+ 	}
+-
++	else if (need_swapping) {
++       /* crc checking in this case would mean  translating the whole file */
++		return;
++	}
+ 	crc = crc32(0L, Z_NULL, 0);
+ 
+ 	buf = mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
+@@ -300,12 +323,23 @@
+ 
+ static struct cramfs_inode *cramfs_iget(struct cramfs_inode * i)
+ {
++#define wswap(x)    (((x)>>24) | (((x)>>8)&0xff00) | (((x)&0xff00)<<8) | (((x)&0xff)<<24))
+ 	struct cramfs_inode *inode = malloc(sizeof(struct cramfs_inode));
+ 
+ 	if (!inode) {
+ 		die(FSCK_ERROR, 1, "malloc failed");
+ 	}
+-	*inode = *i;
++	if(!need_swapping) {
++		*inode = *i;
++	}
++	else { 
++		inode->mode=bswap_16(i->mode);
++		inode->uid=bswap_16(i->uid);
++		inode->size=bswap_32(i->size << 8);
++		inode->gid=i->gid;
++		inode->namelen = bswap_32(((u32*)i)[2]) >> 26;
++		inode->offset = bswap_32(((u32*)i)[2]) & 0x3FFFFFFF;
++	}
+ 	return inode;
+ }
+ 
+@@ -324,9 +358,9 @@
+  */
+ static struct cramfs_inode *read_super(void)
+ {
+-	unsigned long offset = super.root.offset << 2;
+-
+-	if (!S_ISDIR(super.root.mode))
++	struct cramfs_inode *root = cramfs_iget(&super.root);
++	unsigned long offset = root->offset << 2; 
++	if (!S_ISDIR(root->mode))
+ 		die(FSCK_UNCORRECTED, 0, "root inode is not directory");
+ 	if (!(super.flags & CRAMFS_FLAG_SHIFTED_ROOT_OFFSET) &&
+ 	    ((offset != sizeof(struct cramfs_super)) &&
+@@ -334,7 +368,7 @@
+ 	{
+ 		die(FSCK_UNCORRECTED, 0, "bad root offset (%lu)", offset);
+ 	}
+-	return cramfs_iget(&super.root);
++	return root;
+ }
+ 
+ static int uncompress_block(void *src, int len)
+@@ -366,7 +400,7 @@
+ 
+ 	do {
+ 		unsigned long out = PAGE_CACHE_SIZE;
+-		unsigned long next = *(u32 *) romfs_read(offset);
++		unsigned long next = CRAMFS_32(*(u32 *) romfs_read(offset));
+ 
+ 		if (next > end_data) {
+ 			end_data = next;
+@@ -529,7 +563,7 @@
+ {
+ 	unsigned long offset = i->offset << 2;
+ 	unsigned long curr = offset + 4;
+-	unsigned long next = *(u32 *) romfs_read(offset);
++	unsigned long next = CRAMFS_32(*(u32 *) romfs_read(offset));
+ 	unsigned long size;
+ 
+ 	if (offset == 0) {
diff --git a/package/cramfs/cramfs-03-cygwin_IO.patch b/package/cramfs/cramfs-03-cygwin_IO.patch
new file mode 100644
index 000000000..4ea358ede
--- /dev/null
+++ b/package/cramfs/cramfs-03-cygwin_IO.patch
@@ -0,0 +1,13 @@
+--- cramfs-1.1/cramfsck.c.orig	2006-12-22 22:16:59.328125000 +1100
++++ cramfs-1.1/cramfsck.c	2006-12-19 01:02:05.531250000 +1100
+@@ -56,6 +56,10 @@
+ #include "linux/cramfs_fs.h"
+ #include <zlib.h>
+ 
++#ifdef __CYGWIN__
++#define _IO(type,nr)	_IOC(_IOC_NONE,(type),(nr),0)
++#endif /* __CYGWIN__ */
++
+ #define BLKGETSIZE	_IO(0x12,96) /* return device size /512 (long *arg) */
+ 
+ /* Exit codes used by fsck-type programs */
diff --git a/package/cramfs/cramfs.mk b/package/cramfs/cramfs.mk
new file mode 100644
index 000000000..7b1924e81
--- /dev/null
+++ b/package/cramfs/cramfs.mk
@@ -0,0 +1,33 @@
+#############################################################
+#
+# cramfs
+#
+#############################################################
+
+CRAMFS_VERSION=1.1
+CRAMFS_SOURCE=cramfs-$(CRAMFS_VERSION).tar.gz
+CRAMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/cramfs
+
+CRAMFS_DEPENDENCIES = zlib
+HOST_CRAMFS_DEPENDENCIES = host-zlib
+
+define CRAMFS_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
+endef
+
+define CRAMFS_INSTALL_TARGET_CMDS
+ install -m 755 $(@D)/mkcramfs $(TARGET_DIR)/usr/bin
+ install -m 755 $(@D)/cramfsck $(TARGET_DIR)/usr/bin
+endef
+
+define HOST_CRAMFS_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) CFLAGS="$(HOST_CFLAGS) -Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D)
+endef
+
+define HOST_CRAMFS_INSTALL_CMDS
+ install -m 755 $(@D)/mkcramfs $(HOST_DIR)/usr/bin
+ install -m 755 $(@D)/cramfsck $(HOST_DIR)/usr/bin
+endef
+
+$(eval $(call GENTARGETS,package,cramfs))
+$(eval $(call GENTARGETS,package,cramfs,host))
diff --git a/package/e2fsprogs/e2fsprogs.mk b/package/e2fsprogs/e2fsprogs.mk
index 09db99698..af3c3eda2 100644
--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@@ -26,7 +26,12 @@ E2FSPROGS_CONF_OPT = \
 E2FSPROGS_MAKE_OPT = \
 	LDCONFIG=true
 
+define HOST_E2FSPROGS_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
+endef
+
 $(eval $(call AUTOTARGETS,package,e2fsprogs))
+$(eval $(call AUTOTARGETS,package,e2fsprogs,host))
 
 # binaries to keep or remove
 E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks
diff --git a/package/fakeroot/Config.in b/package/fakeroot/Config.in
index 679b6b2ca..186b717d4 100644
--- a/package/fakeroot/Config.in
+++ b/package/fakeroot/Config.in
@@ -4,7 +4,3 @@ config BR2_PACKAGE_FAKEROOT
 	  Run commands in an environment faking root privileges.
 
 	  http://joostje.op.het.net/fakeroot/
-
-# dummy for fakeroot-source
-config BR2_HOST_FAKEROOT
-	bool
diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
index d525a4f62..a8eff5225 100644
--- a/package/fakeroot/fakeroot.mk
+++ b/package/fakeroot/fakeroot.mk
@@ -6,125 +6,25 @@
 FAKEROOT_VERSION:=1.9.5
 FAKEROOT_SOURCE:=fakeroot_$(FAKEROOT_VERSION).tar.gz
 FAKEROOT_SITE:=http://snapshot.debian.net/archive/2008/04/27/debian/pool/main/f/fakeroot/
-FAKEROOT_CAT:=$(ZCAT)
-FAKEROOT_SOURCE_DIR:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)
-FAKEROOT_DIR1:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-host
-FAKEROOT_DIR2:=$(BUILD_DIR)/fakeroot-$(FAKEROOT_VERSION)-target
+FAKEROOT_LIBTOOL_PATCH=NO
+HOST_FAKEROOT_LIBTOOL_PATCH=NO
 
-$(DL_DIR)/$(FAKEROOT_SOURCE):
-	 $(call DOWNLOAD,$(FAKEROOT_SITE),$(FAKEROOT_SOURCE))
-
-fakeroot-source: $(DL_DIR)/$(FAKEROOT_SOURCE)
-
-$(FAKEROOT_SOURCE_DIR)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE)
-	$(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+define FAKEROOT_PATCH_FAKEROOT_IN
 	# If using busybox getopt, make it be quiet.
 	$(SED) "s,getopt --version,getopt --version 2>/dev/null," \
-		$(FAKEROOT_SOURCE_DIR)/scripts/fakeroot.in
-	toolchain/patch-kernel.sh $(FAKEROOT_SOURCE_DIR) package/fakeroot/ \*.patch
-	touch $@
-
-
-#############################################################
-#
-# build fakeroot for use on the host system
-#
-#############################################################
+		$(@D)/scripts/fakeroot.in
+endef
 
-$(FAKEROOT_DIR1)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked
-	mkdir -p $(FAKEROOT_DIR1)
-	(cd $(FAKEROOT_DIR1); rm -rf config.cache; \
-		CC="$(HOSTCC)" \
-		$(FAKEROOT_SOURCE_DIR)/configure $(QUIET) \
-		--prefix=$(HOST_DIR)/usr \
-	)
-	touch $@
+FAKEROOT_POST_PATCH_HOOKS += FAKEROOT_PATCH_FAKEROOT_IN
 
-$(FAKEROOT_DIR1)/faked: $(FAKEROOT_DIR1)/.configured
-	$(MAKE) -C $(FAKEROOT_DIR1)
-	touch -c $@
-
-$(HOST_DIR)/usr/bin/fakeroot: $(FAKEROOT_DIR1)/faked
-	$(MAKE) -C $(FAKEROOT_DIR1) install
-	touch -c $@
-
-host-fakeroot: $(HOST_DIR)/usr/bin/fakeroot
-
-host-fakeroot-clean:
-	-$(MAKE) -C $(FAKEROOT_DIR1) clean
-
-host-fakeroot-dirclean:
-	rm -rf $(FAKEROOT_DIR1)
-
-
-#############################################################
-#
-# build fakeroot for use on the target system
-#
-#############################################################
-
-$(FAKEROOT_DIR2)/.configured: $(FAKEROOT_SOURCE_DIR)/.unpacked
-	mkdir -p $(FAKEROOT_DIR2)
-	(cd $(FAKEROOT_DIR2); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_OPTS) \
-		$(TARGET_CONFIGURE_ARGS) \
-		$(FAKEROOT_SOURCE_DIR)/configure $(QUIET) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--sbindir=/usr/sbin \
-		--libdir=/usr/lib/libfakeroot \
-		--sysconfdir=/etc \
-		--datadir=/usr/share \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		$(DISABLE_NLS) \
-	)
-	touch $@
-
-$(FAKEROOT_DIR2)/faked: $(FAKEROOT_DIR2)/.configured
-	$(MAKE) CC=$(TARGET_CC) -C $(FAKEROOT_DIR2)
-	touch -c $@
-
-$(TARGET_DIR)/usr/bin/fakeroot: $(FAKEROOT_DIR2)/faked
-	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(FAKEROOT_DIR2) install
-	-mv $(TARGET_DIR)/usr/bin/$(ARCH)-linux-faked \
+define FAKEROOT_RENAME_TARGET_BINARIES
+	-mv $(TARGET_DIR)/usr/bin/$(ARCH)-*-faked \
 		$(TARGET_DIR)/usr/bin/faked
-	-mv $(TARGET_DIR)/usr/bin/$(ARCH)-linux-fakeroot \
+	-mv $(TARGET_DIR)/usr/bin/$(ARCH)-*-fakeroot \
 		$(TARGET_DIR)/usr/bin/fakeroot
-ifneq ($(BR2_HAVE_INFOPAGES),y)
-	rm -rf $(TARGET_DIR)/usr/share/info
-endif
-ifneq ($(BR2_HAVE_MANPAGES),y)
-	rm -rf $(TARGET_DIR)/usr/share/man
-endif
-	rm -rf $(TARGET_DIR)/share/locale
-	rm -rf $(TARGET_DIR)/usr/share/doc
-	touch -c $@
-
-fakeroot: $(TARGET_DIR)/usr/bin/fakeroot
+endef
 
-fakeroot-clean:
-	-$(MAKE) -C $(FAKEROOT_DIR2) clean
-	rm -f $(TARGET_DIR)/usr/bin/fake{d,root}
-
-fakeroot-dirclean:
-	rm -rf $(FAKEROOT_DIR2)
-
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_FAKEROOT),y)
-TARGETS+=fakeroot
-endif
+FAKEROOT_POST_INSTALL_TARGET_HOOKS += FAKEROOT_RENAME_TARGET_BINARIES
 
-ifeq ($(BR2_HOST_FAKEROOT),y)
-HOST_SOURCE+=fakeroot-source
-endif
+$(eval $(call AUTOTARGETS,package,fakeroot))
+$(eval $(call AUTOTARGETS,package,fakeroot,host))
diff --git a/package/genext2fs/Config.in b/package/genext2fs/Config.in
new file mode 100644
index 000000000..82992f877
--- /dev/null
+++ b/package/genext2fs/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_GENEXT2FS
+       bool "genext2fs"
+       help
+         genext2fs generates an ext2 filesystem as a normal (non-root)
+	 user.  It does not require you to mount the image file to
+	 copy files on it, nor does it require that you become the
+	 superuser to make device nodes.
+
+	 http://genext2fs.sourceforge.net/
diff --git a/package/genext2fs/genext2fs-1.4-nosquash.patch b/package/genext2fs/genext2fs-1.4-nosquash.patch
new file mode 100644
index 000000000..236dfccdf
--- /dev/null
+++ b/package/genext2fs/genext2fs-1.4-nosquash.patch
@@ -0,0 +1,14 @@
+diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-nosquash/genext2fs.c
+--- genext2fs-1.4/genext2fs.c	2006-12-19 17:45:31.000000000 +0100
++++ genext2fs-1.4-nosquash/genext2fs.c	2007-02-09 10:47:05.000000000 +0100
+@@ -1629,10 +1629,6 @@
+ 		mtime = st.st_mtime;
+ 		name = dent->d_name;
+ 		mode = get_mode(&st);
+-		if(squash_uids)
+-			uid = gid = 0;
+-		if(squash_perms)
+-			mode &= ~(FM_IRWXG | FM_IRWXO);
+ 		if(stats)
+ 			switch(st.st_mode & S_IFMT)
+ 			{
diff --git a/package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch b/package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch
new file mode 100644
index 000000000..ef23dfbe8
--- /dev/null
+++ b/package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch
@@ -0,0 +1,21 @@
+diff -ru genext2fs-1.4/genext2fs.c genext2fs-1.4-remove_ugly_warnings/genext2fs.c
+--- genext2fs-1.4/genext2fs.c	2007-02-09 10:54:56.000000000 +0100
++++ genext2fs-1.4-remove_ugly_warnings/genext2fs.c	2007-02-09 10:54:30.000000000 +0100
+@@ -1606,7 +1606,7 @@
+ static void
+ add2fs_from_dir(filesystem *fs, uint32 this_nod, int squash_uids, int squash_perms, uint32 fs_timestamp, struct stats *stats)
+ {
+-	uint32 nod;
++	uint32 nod = 0;
+ 	uint32 uid, gid, mode, ctime, mtime;
+ 	const char *name;
+ 	FILE *fh;
+@@ -2056,7 +2056,7 @@
+ static filesystem *
+ load_fs(FILE * fh, int swapit)
+ {
+-	size_t fssize;
++	size_t fssize = 0;
+ 	filesystem *fs;
+ 	if((fseek(fh, 0, SEEK_END) < 0) || ((ssize_t)(fssize = ftell(fh)) == -1))
+ 		perror_msg_and_die("input filesystem image");
diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk
new file mode 100644
index 000000000..8c4981edb
--- /dev/null
+++ b/package/genext2fs/genext2fs.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# genext2fs
+#
+#############################################################
+
+GENEXT2FS_VERSION=1.4
+GENEXT2FS_SOURCE=genext2fs-$(GENEXT2FS_VERSION).tar.gz
+GENEXT2FS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs
+
+$(eval $(call AUTOTARGETS,package,genext2fs))
+$(eval $(call AUTOTARGETS,package,genext2fs,host))
diff --git a/package/genromfs/Config.in b/package/genromfs/Config.in
new file mode 100644
index 000000000..2caf2a405
--- /dev/null
+++ b/package/genromfs/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_GENROMFS
+       bool "genromfs"
+       help
+         Tool to generate a ROMFS filesystem.
+
+	 http://romfs.sourceforge.net/
\ No newline at end of file
diff --git a/package/genromfs/genromfs-0.5.2-build-system.patch b/package/genromfs/genromfs-0.5.2-build-system.patch
new file mode 100644
index 000000000..827fe75bd
--- /dev/null
+++ b/package/genromfs/genromfs-0.5.2-build-system.patch
@@ -0,0 +1,26 @@
+---
+ Makefile |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+Index: genromfs-0.5.2/Makefile
+===================================================================
+--- genromfs-0.5.2.orig/Makefile
++++ genromfs-0.5.2/Makefile
+@@ -6,8 +6,6 @@
+ PACKAGE = genromfs
+ VERSION = 0.5.2
+ CC = gcc
+-CFLAGS = -O2 -Wall -DVERSION=\"$(VERSION)\"#-g#
+-LDFLAGS = -s#-g
+ 
+ DISTDIR = $(PACKAGE)-$(VERSION)
+ 
+@@ -24,7 +22,7 @@
+ 	$(CC) $(LDFLAGS) genromfs.o -o genromfs
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) $< -c -o $@
++	$(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" $< -c -o $@
+ 
+ clean:
+ 	rm -f genromfs *.o
diff --git a/package/genromfs/genromfs.mk b/package/genromfs/genromfs.mk
new file mode 100644
index 000000000..10b8d7d4b
--- /dev/null
+++ b/package/genromfs/genromfs.mk
@@ -0,0 +1,31 @@
+#############################################################
+#
+# genromfs
+#
+#############################################################
+
+GENROMFS_VERSION=0.5.2
+GENROMFS_SOURCE=genromfs-$(GENROMFS_VERSION).tar.gz
+GENROMFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/romfs
+
+define GENROMFS_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+    CC="$(TARGET_CC)" \
+    CFLAGS="$(TARGET_CFLAGS)" \
+    LDFLAGS="$(TARGET_LDFLAGS)"
+endef
+
+define GENROMFS_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install
+endef
+
+define HOST_GENROMFS_BUILD_CMDS
+  $(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_GENROMFS_INSTALL_CMDS
+  $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
+endef
+
+$(eval $(call GENTARGETS,package,genromfs))
+$(eval $(call GENTARGETS,package,genromfs,host))
\ No newline at end of file
diff --git a/package/libcap/Config.in b/package/libcap/Config.in
new file mode 100644
index 000000000..f1fc8fa16
--- /dev/null
+++ b/package/libcap/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBCAP
+	bool "libcap"
+	help
+	 This library implements the user-space interfaces to the
+	 POSIX 1003.1e capabilities available in Linux kernels. These
+	 capabilities are a partitioning of the all powerful root
+	 privilege into a set of distinct privileges.
+
+	 http://sites.google.com/site/fullycapable/
+
diff --git a/package/libcap/libcap-2.19-build-system.patch b/package/libcap/libcap-2.19-build-system.patch
new file mode 100644
index 000000000..42a5518ff
--- /dev/null
+++ b/package/libcap/libcap-2.19-build-system.patch
@@ -0,0 +1,55 @@
+---
+ Make.Rules      |   15 ++++++++-------
+ libcap/Makefile |    2 +-
+ 2 files changed, 9 insertions(+), 8 deletions(-)
+
+Index: libcap-2.19/Make.Rules
+===================================================================
+--- libcap-2.19.orig/Make.Rules
++++ libcap-2.19/Make.Rules
+@@ -45,24 +45,25 @@
+ KERNEL_HEADERS := $(topdir)/libcap/include
+ IPATH += -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+ 
+-CC := gcc
+-CFLAGS := -O2
+-BUILD_CC := $(CC)
+-BUILD_CFLAGS := $(CFLAGS) $(IPATH)
+-AR := ar
+-RANLIB := ranlib
++CC ?= gcc
++CFLAGS ?= -O2
++CC_FOR_BUILD ?= $(CC)
++CFLAGS_FOR_BUILD ?= $(CFLAGS)
++AR ?= ar
++RANLIB ?= ranlib
+ DEBUG = -g #-DDEBUG
+ WARNINGS=-fPIC -Wall -Wwrite-strings \
+         -Wpointer-arith -Wcast-qual -Wcast-align \
+         -Wstrict-prototypes -Wmissing-prototypes \
+         -Wnested-externs -Winline -Wshadow
+ LD=$(CC) -Wl,-x -shared
+-LDFLAGS := #-g
++LDFLAGS ?= #-g
+ 
+ SYSTEM_HEADERS = /usr/include
+ INCS=$(topdir)/libcap/include/sys/capability.h
+ LDFLAGS += -L$(topdir)/libcap
+ CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) $(IPATH)
++CFLAGS_FOR_BUILD += $(IPATH)
+ PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
+ INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
+ DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
+Index: libcap-2.19/libcap/Makefile
+===================================================================
+--- libcap-2.19.orig/libcap/Makefile
++++ libcap-2.19/libcap/Makefile
+@@ -33,7 +33,7 @@
+ endif
+ 
+ _makenames: _makenames.c cap_names.list.h
+-	$(BUILD_CC) $(BUILD_CFLAGS) $< -o $@
++	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
+ 
+ cap_names.h: _makenames
+ 	./_makenames > cap_names.h
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
new file mode 100644
index 000000000..3ea5e51aa
--- /dev/null
+++ b/package/libcap/libcap.mk
@@ -0,0 +1,27 @@
+LIBCAP_VERSION=2.19
+LIBCAP_SOURCE=libcap-$(LIBCAP_VERSION).tar.bz2
+LIBCAP_SITE=http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/
+LIBCAP_INSTALL_STAGING=YES
+
+define LIBCAP_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no
+endef
+
+define LIBCAP_INSTALL_STAGING_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(STAGING_DIR) install
+endef
+
+define LIBCAP_INSTALL_TARGET_CMDS
+ install -D $(STAGING_DIR)/usr/lib/libcap.so.* $(TARGET_DIR)/usr/lib
+endef
+
+define HOST_LIBCAP_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no
+endef
+
+define HOST_LIBCAP_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(HOST_DIR) install
+endef
+
+$(eval $(call GENTARGETS,package,libcap))
+$(eval $(call GENTARGETS,package,libcap,host))
diff --git a/package/lzma/lzma.mk b/package/lzma/lzma.mk
index c4a735def..9bdcc3529 100644
--- a/package/lzma/lzma.mk
+++ b/package/lzma/lzma.mk
@@ -11,67 +11,6 @@ LZMA_INSTALL_TARGET = YES
 LZMA_CONF_OPT = $(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug)
 
 $(eval $(call AUTOTARGETS,package,lzma))
+$(eval $(call AUTOTARGETS,package,lzma,host))
 
-######################################################################
-#
-# lzma host
-#
-######################################################################
-
-LZMA_CAT:=$(ZCAT)
-LZMA_HOST_DIR:=$(TOOLCHAIN_DIR)/lzma-$(LZMA_VERSION)
-
-# lzma binary for use on the host
-LZMA=$(TOOLCHAIN_DIR)/bin/lzma
-HOST_LZMA_BINARY=$(shell package/lzma/lzmacheck.sh)
-HOST_LZMA_IF_ANY=$(shell toolchain/dependencies/check-host-lzma.sh)
-
-$(DL_DIR)/$(LZMA_SOURCE):
-	$(call DOWNLOAD,$(LZMA_SITE),$(LZMA_SOURCE))
-
-$(LZMA_HOST_DIR)/.unpacked: $(DL_DIR)/$(LZMA_SOURCE)
-	$(LZMA_CAT) $(DL_DIR)/$(LZMA_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(LZMA_HOST_DIR) package/lzma/ lzma\*.patch
-	touch $@
-
-$(LZMA_HOST_DIR)/.configured: $(LZMA_HOST_DIR)/.unpacked
-	(cd $(LZMA_HOST_DIR); rm -f config.cache;\
-		CC="$(HOSTCC)" \
-		CXX="$(HOSTCXX)" \
-		./configure $(QUIET) \
-		--prefix=/ \
-	)
-	touch $@
-
-$(LZMA_HOST_DIR)/src/lzma/lzma: $(LZMA_HOST_DIR)/.configured
-	$(MAKE) -C $(LZMA_HOST_DIR) all
-	touch -c $@
-
-$(STAGING_DIR)/bin/lzma: $(LZMA_HOST_DIR)/src/lzma/lzma
-	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LZMA_HOST_DIR) install
-	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \
-		$(STAGING_DIR)/lib/liblzmadec.la
-
-.PHONY: lzma-host use-lzma-host-binary
-use-lzma-host-binary:
-	if [ ! -f "$(TOOLCHAIN_DIR)/bin/lzma" ]; then \
-		[ -d $(TOOLCHAIN_DIR)/bin ] || mkdir -p $(TOOLCHAIN_DIR)/bin; \
-		ln -sf "$(HOST_LZMA_IF_ANY)" "$(TOOLCHAIN_DIR)/bin/lzma"; \
-	fi
-
-build-lzma-host-binary: $(LZMA_HOST_DIR)/src/lzma/lzma
-	-rm -f $(TOOLCHAIN_DIR)/bin/lzma
-	[ -d $(TOOLCHAIN_DIR)/bin ] || mkdir $(TOOLCHAIN_DIR)/bin
-	cp -pf $(LZMA_HOST_DIR)/src/lzma/lzma $(TOOLCHAIN_DIR)/bin/lzma
-
-host-lzma: $(HOST_LZMA_BINARY)
-
-lzma-host: $(STAGING_DIR)/bin/lzma
-
-lzma-host-clean:
-	rm -f $(STAGING_DIR)/bin/lzma
-	-$(MAKE) -C $(LZMA_HOST_DIR) clean
-lzma-host-dirclean:
-	rm -rf $(LZMA_HOST_DIR)
-
-lzma-host-install: /usr/local/bin/lzma
+LZMA=$(HOST_DIR)/usr/bin/lzma
diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk
index 3e0fcaf80..5a449f28e 100644
--- a/package/mtd/mtd.mk
+++ b/package/mtd/mtd.mk
@@ -6,65 +6,21 @@
 MTD_VERSION:=1.3.1
 MTD_SOURCE:=mtd-utils-$(MTD_VERSION).tar.bz2
 MTD_SITE:=ftp://ftp.infradead.org/pub/mtd-utils
-MTD_DIR:=$(BUILD_DIR)/mtd-utils-$(MTD_VERSION)
-MTD_HOST_DIR:= $(MTD_DIR)-host
-MTD_CAT:=$(BZCAT)
 
-#############################################################
-#
-# Build mkfs.jffs2 and sumtool for use on the local host system if
-# needed by target/jffs2root.
-#
-#############################################################
-MKFS_JFFS2 := $(HOST_DIR)/usr/sbin/mkfs.jffs2
-SUMTOOL := $(HOST_DIR)/usr/sbin/sumtool
-
-$(DL_DIR)/$(MTD_SOURCE):
-	$(call DOWNLOAD,$(MTD_SITE),$(MTD_SOURCE))
-
-$(MTD_HOST_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
-	mkdir -p $(@D)
-	$(MTD_CAT) $^ | tar $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(MTD_HOST_DIR) \
-		package/mtd/ mtd-utils-\*.patch
-	touch $@
-
-$(MTD_HOST_DIR)/mkfs.jffs2: $(MTD_HOST_DIR)/.unpacked
-	CC="$(HOSTCC)" CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \
-		CROSS= $(MAKE) BUILDDIR=$(MTD_HOST_DIR) \
-		WITHOUT_XATTR=1 -C $(MTD_HOST_DIR) $@
+HOST_MTD_DEPENDENCIES = host-lzo host-e2fsprogs
 
-$(MKFS_JFFS2): $(MTD_HOST_DIR)/mkfs.jffs2
-	install -m 0755 -D $^ $@
-
-$(MTD_HOST_DIR)/sumtool: $(MTD_HOST_DIR)/.unpacked
+define HOST_MTD_BUILD_CMDS
 	CC="$(HOSTCC)" CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \
-		CROSS= $(MAKE) BUILDDIR=$(MTD_HOST_DIR) \
-		WITHOUT_XATTR=1 -C $(MTD_HOST_DIR) $@
-
-$(SUMTOOL): $(MTD_HOST_DIR)/sumtool
-	install -m 0755 $^ $@
-
-mtd-host: host-lzo $(MKFS_JFFS2) $(SUMTOOL)
-
-mtd-host-source: $(DL_DIR)/$(MTD_SOURCE)
+		CROSS= $(MAKE) BUILDDIR=$(@D) \
+		WITHOUT_XATTR=1 -C $(@D)
+endef
 
-mtd-host-clean:
-	-$(MAKE) -C $(MTD_HOST_DIR) clean
-	rm -f $(MKFS_JFFS2) $(SUMTOOL)
+define HOST_MTD_INSTALL_CMDS
+	$(MAKE) BUILDDIR=$(@D) DESTDIR=$(HOST_DIR) -C $(@D) install
+endef
 
-mtd-host-dirclean:
-	rm -rf $(MTD_HOST_DIR)
-
-#############################################################
-#
-# build mtd for use on the target system
-#
-#############################################################
-$(MTD_DIR)/.unpacked: $(DL_DIR)/$(MTD_SOURCE)
-	$(MTD_CAT) $(DL_DIR)/$(MTD_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
-	toolchain/patch-kernel.sh $(MTD_DIR) package/mtd/ mtd-utils-\*.patch
-	touch $@
+MKFS_JFFS2=$(HOST_DIR)/usr/sbin/mkfs.jffs2
+SUMTOOL=$(HOST_DIR)/usr/sbin/sumtool
 
 MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK)		+= docfdisk
 MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS)	+= doc_loadbios
@@ -105,50 +61,42 @@ MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL)	+= ubirmvol
 MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRSVOL)	+= ubirsvol
 MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL)	+= ubiupdatevol
 
-MTD_TARGETS := $(addprefix $(MTD_DIR)/, $(MTD_TARGETS_y))
-MTD_UBI_TARGETS := $(addprefix $(MTD_DIR)/ubi-utils/, $(MTD_TARGETS_UBI_y))
-MTD_BUILD_TARGETS := $(MTD_TARGETS) $(MTD_UBI_TARGETS)
-
-$(MTD_BUILD_TARGETS): $(MTD_DIR)/.unpacked
-ifneq ($(MTD_TARGETS),)
-	$(MAKE) $(TARGET_CONFIGURE_ENV) \
-		BUILDDIR=$(MTD_DIR) \
-		CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) \
-		WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1 \
-		-C $(MTD_DIR) $(MTD_TARGETS)
+MTD_MAKE_COMMON_FLAGS = \
+	$(TARGET_CONFIGURE_ENV) \
+	CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) \
+	WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1
+
+ifneq ($(MTD_TARGETS_y),)
+define MTD_TARGETS_BUILD
+	$(MAKE) $(MTD_MAKE_COMMON_FLAGS) \
+		BUILDDIR=$(@D) \
+		-C $(@D) \
+		$(addprefix $(@D)/, $(MTD_TARGETS_y))
+endef
 endif
-ifneq ($(MTD_UBI_TARGETS),)
-	$(MAKE) $(TARGET_CONFIGURE_ENV) \
-		BUILDDIR=$(MTD_DIR)/ubi-utils \
-		CROSS=$(TARGET_CROSS) CC=$(TARGET_CC) \
-		WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1 \
-		-C $(MTD_DIR)/ubi-utils $(MTD_UBI_TARGETS)
-endif
-
-MTD_TARGET_BINS := $(addprefix $(TARGET_DIR)/usr/sbin/,\
-		 $(MTD_TARGETS_y) $(MTD_TARGETS_UBI_y))
-
-$(MTD_TARGET_BINS): $(MTD_BUILD_TARGETS)
-	mkdir -p $(TARGET_DIR)/usr/sbin
-	$(INSTALL) -m 0755 $^ $(TARGET_DIR)/usr/sbin
-
-mtd: $(if $(BR2_PACKAGE_MTD_MKFSJFFS2),zlib lzo) $(MTD_TARGET_BINS)
-
-mtd-source: $(DL_DIR)/$(MTD_SOURCE)
-
-mtd-clean:
-	-$(MAKE) -C $(MTD_DIR) clean
-	rm -f $(MTD_TARGET_BINS)
 
-mtd-dirclean:
-	rm -rf $(MTD_DIR)
-
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(BR2_PACKAGE_MTD),y)
-TARGETS+=mtd
+ifneq ($(MTD_TARGETS_UBI_y),)
+define MTD_TARGETS_UBI_BUILD
+	$(MAKE) $(MTD_MAKE_COMMON_FLAGS) \
+		BUILDDIR=$(@D)/ubi-utils/ \
+		-C $(@D)/ubi-utils \
+		$(addprefix $(@D)/ubi-utils/, $(MTD_TARGETS_UBI_y))
+endef
 endif
+
+define MTD_BUILD_CMDS
+ $(MTD_TARGETS_BUILD)
+ $(MTD_TARGETS_UBI_BUILD)
+endef
+
+define MTD_INSTALL_TARGET_CMDS
+ for f in $(MTD_TARGETS_y) ; do \
+  install -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$$f ; \
+ done ; \
+ for f in $(MTD_TARGETS_UBI_y) ; do \
+  install -m 0755 $(@D)/ubi-utils/$$f $(TARGET_DIR)/usr/sbin/$$f ; \
+ done
+endef
+
+$(eval $(call GENTARGETS,package,mtd))
+$(eval $(call GENTARGETS,package,mtd,host))
diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in
new file mode 100644
index 000000000..3080cc3ab
--- /dev/null
+++ b/package/squashfs/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_SQUASHFS
+	bool "squashfs"
+	help
+	  Tools to generate SquashFS filesystems.
+
+	  http://squashfs.sourceforge.net/
diff --git a/package/squashfs/squashfs-4.0-build-system-fix.patch b/package/squashfs/squashfs-4.0-build-system-fix.patch
new file mode 100644
index 000000000..9db208bff
--- /dev/null
+++ b/package/squashfs/squashfs-4.0-build-system-fix.patch
@@ -0,0 +1,60 @@
+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
diff --git a/package/squashfs/squashfs-4.0-mksquashfs-race-condition-fix.patch b/package/squashfs/squashfs-4.0-mksquashfs-race-condition-fix.patch
new file mode 100644
index 000000000..7f8e8e074
--- /dev/null
+++ b/package/squashfs/squashfs-4.0-mksquashfs-race-condition-fix.patch
@@ -0,0 +1,41 @@
+[PATCH]: fix mksquashfs race condition
+
+See http://thread.gmane.org/gmane.comp.file-systems.squashfs.devel/76
+for details.
+---
+ squashfs-tools/mksquashfs.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+Index: squashfs4.0/squashfs-tools/mksquashfs.c
+===================================================================
+--- squashfs4.0.orig/squashfs-tools/mksquashfs.c
++++ squashfs4.0/squashfs-tools/mksquashfs.c
+@@ -1733,8 +1733,8 @@ void unlock_fragments()
+ 		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 @@ void *frag_deflator(void *arg)
+ 			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);
+@@ -4137,7 +4137,7 @@ void read_recovery_data(char *recovery_f
+ 
+ 
+ #define VERSION() \
+-	printf("mksquashfs version 4.0 (2009/04/05)\n");\
++	printf("mksquashfs version 4.0-test (2009/04/05)\n");\
+ 	printf("copyright (C) 2009 Phillip Lougher <phillip@lougher.demon.co.uk>\n\n"); \
+ 	printf("This program is free software; you can redistribute it and/or\n");\
+ 	printf("modify it under the terms of the GNU General Public License\n");\
diff --git a/package/squashfs/squashfs.mk b/package/squashfs/squashfs.mk
new file mode 100644
index 000000000..ab05b06e5
--- /dev/null
+++ b/package/squashfs/squashfs.mk
@@ -0,0 +1,30 @@
+SQUASHFS_VERSION=4.0
+SQUASHFS_SOURCE=squashfs$(SQUASHFS_VERSION).tar.gz
+SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs
+
+SQUASHFS_DEPENDENCIES = zlib
+HOST_SQUASHFS_DEPENDENCIES = host-zlib
+
+define SQUASHFS_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE)    \
+   CC="$(TARGET_CC)"           \
+   CFLAGS="$(TARGET_CFLAGS)"   \
+   LDFLAGS="$(TARGET_LDFLAGS)" \
+   -C $(@D)/squashfs-tools/
+endef
+
+define SQUASHFS_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/squashfs-tools/ INSTALL_DIR=$(TARGET_DIR)/usr/bin install
+endef
+
+define HOST_SQUASHFS_BUILD_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/squashfs-tools/
+endef
+
+define HOST_SQUASHFS_INSTALL_CMDS
+ $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install
+endef
+
+$(eval $(call GENTARGETS,package,squashfs))
+$(eval $(call GENTARGETS,package,squashfs,host))
+