aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2014-06-01 09:58:54 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-06-01 09:58:54 +0200
commit27a5414804f7b8ab41101aad219ebef02d364bde (patch)
treec9535dfed260314855b3ba1fe2c75652fdf60a1a /fs
parentf6162290fb6800fecffb86eed42069aa0f813f87 (diff)
parentfc90fa9417d8b99b5d1c77aaa9e4c9ac4c8c7c58 (diff)
downloadbuildroot-27a5414804f7b8ab41101aad219ebef02d364bde.tar.gz
buildroot-27a5414804f7b8ab41101aad219ebef02d364bde.tar.bz2
Merge branch 'next'
Conflicts: package/gdb/Config.in.host Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/squashfs/Config.in3
-rw-r--r--fs/squashfs/squashfs.mk4
2 files changed, 7 insertions, 0 deletions
diff --git a/fs/squashfs/Config.in b/fs/squashfs/Config.in
index 817909d626..ca9ddb2218 100644
--- a/fs/squashfs/Config.in
+++ b/fs/squashfs/Config.in
@@ -15,6 +15,9 @@ choice
config BR2_TARGET_ROOTFS_SQUASHFS4_GZIP
bool "gzip"
+config BR2_TARGET_ROOTFS_SQUASHFS4_LZ4
+ bool "lz4"
+
config BR2_TARGET_ROOTFS_SQUASHFS4_LZMA
bool "lzma"
diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk
index eb5fc3e73b..446906f10c 100644
--- a/fs/squashfs/squashfs.mk
+++ b/fs/squashfs/squashfs.mk
@@ -6,6 +6,9 @@
ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs
+ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZ4),y)
+ROOTFS_SQUASHFS_ARGS += -comp lz4
+else
ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y)
ROOTFS_SQUASHFS_ARGS += -comp lzo
else
@@ -19,6 +22,7 @@ ROOTFS_SQUASHFS_ARGS += -comp gzip
endif
endif
endif
+endif
define ROOTFS_SQUASHFS_CMD
$(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $@ -noappend \