From: Paul Spooren Date: Fri, 20 Mar 2020 10:10:58 +0000 (-1000) Subject: x86: allow non gzipped images X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=30a24882900d41a04eec4db5e3cdbe4026d32aeb;p=openwrt%2Fstaging%2Fynezz.git 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 --- diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index dfa1742d5a..c01065f8e6 100644 --- a/target/linux/x86/image/Makefile +++ b/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