Bläddra i källkod

x86: allow non gzipped images

The previous image generation code would always gzipped images.

This patch changes the behaviour and only compresses images when
selected in menuconfig.

Signed-off-by: Paul Spooren <[email protected]>
Paul Spooren 5 år sedan
förälder
incheckning
30a2488290
1 ändrade filer med 6 tillägg och 1 borttagningar
  1. 6 1
      target/linux/x86/image/Makefile

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

@@ -95,10 +95,15 @@ endef
 DEVICE_VARS += GRUB2_VARIANT
 define Device/Default
   ARTIFACT/image.iso := grub-config iso | iso
-  IMAGES := combined.img.gz
+  IMAGE/combined.img := append-rootfs | pad-extra 128k | grub-config pc | combined | grub-install
   IMAGE/combined.img.gz := append-rootfs | pad-extra 128k | grub-config pc | combined | grub-install | gzip
   IMAGE/combined.vdi := append-rootfs | pad-extra 128k | grub-config pc | combined | grub-install | qemu-image vdi
   IMAGE/combined.vmdk := append-rootfs | pad-extra 128k | grub-config pc | combined | grub-install | qemu-image vmdk
+  ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y)
+    IMAGES := combined.img.gz
+  else
+    IMAGES := combined.img
+  endif
   KERNEL := kernel-bin
   KERNEL_INSTALL := 1
   KERNEL_NAME := bzImage