X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9d6983fd7805c5d2c711f159cefb955737f8607a..6bc0d6136909b9328501d4150e7f9e6821860c43:/include/image.mk diff --git a/include/image.mk b/include/image.mk index 686c5a551..237d87c90 100644 --- a/include/image.mk +++ b/include/image.mk @@ -23,15 +23,15 @@ JFFS2OPTS := --pad --big-endian --squash SQUASHFS_OPTS := -be endif -ifneq ($(CONFIG_LINUX_2_6_29)$(CONFIG_LINUX_2_6_30),) -USE_SQUASHFS4 := y +ifneq ($(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_28),) +USE_SQUASHFS3 := y endif -ifneq ($(USE_SQUASHFS4),) -MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4 -SQUASHFS_OPTS := -lzma -else +ifneq ($(USE_SQUASHFS3),) MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs-lzma +else +MKSQUASHFS_CMD := $(STAGING_DIR_HOST)/bin/mksquashfs4 +SQUASHFS_OPTS := -lzma -processors 1 endif JFFS2_BLOCKSIZE ?= 64k 128k @@ -92,7 +92,7 @@ endif define Image/Checksum ( cd ${BIN_DIR} ; \ $(FIND) -maxdepth 1 -type f \! -name 'md5sums' -printf "%P\n" | xargs \ - md5sum > md5sums \ + md5sum --binary > md5sums \ ) endef