diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-09 16:17:57 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-04-09 16:17:57 +0200 |
| commit | 3f583771a42fab0eb0bb627d1a0e91eb542df287 (patch) | |
| tree | 2b107946e876e5b789b79d42ef229e651f2bc786 /fs/squashfs | |
| parent | 6bb35a38c244b20bbd6e85fd16f69ff2c4f0ed72 (diff) | |
| parent | b8cee9fb4380a8d58a324d141dcab68a4c3aa29c (diff) | |
| download | buildroot-novena-3f583771a42fab0eb0bb627d1a0e91eb542df287.tar.gz buildroot-novena-3f583771a42fab0eb0bb627d1a0e91eb542df287.zip | |
Merge branch 'squashfs3' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'fs/squashfs')
| -rw-r--r-- | fs/squashfs/Config.in | 19 | ||||
| -rw-r--r-- | fs/squashfs/squashfs.mk | 4 |
2 files changed, 23 insertions, 0 deletions
diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in index 6cc8fcae0..bcc93b925 100644 --- a/fs/squashfs/Config.in +++ b/fs/squashfs/Config.in @@ -2,3 +2,22 @@ config BR2_TARGET_ROOTFS_SQUASHFS bool "squashfs root filesystem" help Build a squashfs root filesystem + +if BR2_TARGET_ROOTFS_SQUASHFS +choice + prompt "SquashFS version" + default BR2_TARGET_ROOTFS_SQUASHFS4 + help + Select the Squash filesystem version to use to generate the + root filesystem. + +config BR2_TARGET_ROOTFS_SQUASHFS4 + bool "4.x" + +config BR2_TARGET_ROOTFS_SQUASHFS3 + depends on BR2_DEPRECATED + bool "3.x" + +endchoice +endif + diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk index d72388ebf..f11ba2090 100644 --- a/fs/squashfs/squashfs.mk +++ b/fs/squashfs/squashfs.mk @@ -4,7 +4,11 @@ # ############################################################# +ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4),y) ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs +else +ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs3 +endif define ROOTFS_SQUASHFS_CMD $(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $$@ -noappend |