domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: allow non gzipped images

Browse Source 
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 <mail@aparcar.org>
This commit is contained in:
Paul Spooren
2020-03-20 00:10:58 -10:00
committed by Daniel Golle
parent 33cc7e763b
commit 30a2488290
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
target/linux/x86/image/Makefile
View File

@@ -95,10 +95,15 @@ endef
DEVICE_VARS += GRUB2_VARIANT DEVICE_VARS += GRUB2_VARIANT
define Device/Default define Device/Default
ARTIFACT/image.iso := grub-config iso | iso 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.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.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 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 := kernel-bin
KERNEL_INSTALL := 1 KERNEL_INSTALL := 1
KERNEL_NAME := bzImage KERNEL_NAME := bzImage