From: Paul Spooren Date: Fri, 10 Apr 2020 09:54:52 +0000 (-1000) Subject: x86: append metadata to combined images X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f814121600e5cf43fd75fe93e5b1b54f65b71bcd;p=openwrt%2Fstaging%2Fblocktrron.git x86: append metadata to combined images Now that the x86 target uses the new image generation code we can also attach metadata to the created images. As currently the `SUPPORTED_DEVICES` list is empty, no JSON metadata is attached, however the signing happens in the same step. This results in signature verification for x86 images. Signed-off-by: Paul Spooren --- diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 7a474e7a6e..77516a4a9d 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -113,15 +113,15 @@ endef DEVICE_VARS += GRUB2_VARIANT define Device/Default ARTIFACT/image.iso := grub-config iso | iso - IMAGE/combined.img := grub-config pc | combined | grub-install - IMAGE/combined.img.gz := grub-config pc | combined | grub-install | gzip + IMAGE/combined.img := grub-config pc | combined | grub-install | append-metadata + IMAGE/combined.img.gz := grub-config pc | combined | grub-install | gzip | append-metadata IMAGE/combined.vdi := grub-config pc | combined | grub-install | qemu-image vdi IMAGE/combined.vmdk := grub-config pc | combined | grub-install | qemu-image vmdk IMAGE/rootfs.img := append-rootfs IMAGE/rootfs.img.gz := append-rootfs | gzip ARTIFACT/image-efi.iso := grub-config iso | iso efi - IMAGE/combined-efi.img := grub-config efi | combined efi | grub-install efi - IMAGE/combined-efi.img.gz := grub-config efi | combined efi | grub-install efi | gzip + IMAGE/combined-efi.img := grub-config efi | combined efi | grub-install efi | append-metadata + IMAGE/combined-efi.img.gz := grub-config efi | combined efi | grub-install efi | gzip | append-metadata IMAGE/combined-efi.vdi := grub-config efi | combined efi | grub-install efi | qemu-image vdi IMAGE/combined-efi.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y)