Explorar o código

GZip only ext4 and padded images

SVN-Revision: 30588
Vasilis Tsiligiannis %!s(int64=14) %!d(string=hai) anos
pai
achega
ab09db09fc
Modificáronse 2 ficheiros con 7 adicións e 4 borrados
  1. 1 0
      target/linux/x86/image/Config.in
  2. 6 4
      target/linux/x86/image/Makefile

+ 1 - 0
target/linux/x86/image/Config.in

@@ -82,6 +82,7 @@ config TARGET_IMAGES_PAD
 
 
 config TARGET_IMAGES_GZIP
 config TARGET_IMAGES_GZIP
 	bool "GZip images"
 	bool "GZip images"
+	depends TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS
 	default y
 	default y
 
 
 config TARGET_KERNEL_PARTSIZE
 config TARGET_KERNEL_PARTSIZE

+ 6 - 4
target/linux/x86/image/Makefile

@@ -176,12 +176,14 @@ ifneq ($(CONFIG_TARGET_IMAGES_GZIP),)
   define Image/Build/gzip/ext4
   define Image/Build/gzip/ext4
 	$(call Image/Build/gzip,ext4)
 	$(call Image/Build/gzip,ext4)
   endef
   endef
-  define Image/Build/gzip/jffs2-64k
+  ifneq ($(CONFIG_TARGET_IMAGES_PAD),)
+    define Image/Build/gzip/jffs2-64k
 	$(call Image/Build/gzip,jffs2-64k)
 	$(call Image/Build/gzip,jffs2-64k)
-  endef
-  define Image/Build/gzip/jffs2-128k
+    endef
+    define Image/Build/gzip/jffs2-128k
 	$(call Image/Build/gzip,jffs2-128k)
 	$(call Image/Build/gzip,jffs2-128k)
-  endef
+    endef
+  endif
 endif
 endif
 
 
 define Image/BuildKernel
 define Image/BuildKernel