mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-01 21:23:51 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
Conflicts:
	package/gdb/Config.in.host

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Korsgaard
2014-06-01 09:58:54 +02:00
parent f6162290fb fc90fa9417
commit 27a5414804
97 changed files with 1657 additions and 1664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/squashfs/Config.in
View File

@@ -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"

4
fs/squashfs/squashfs.mk
View File

@@ -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 \