From 2b7af8a9684b5bb5f7de3d5ce8d88dfff0f647a8 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 17 Jun 2021 20:33:55 +0800 Subject: [PATCH] x86: add PVE image build Signed-off-by: Tianling Shen (cherry picked from commit c9344d6a6a424d7152fc8d01f9a09eed5912487a) --- config/Config-images.in | 7 +++++++ target/linux/x86/image/Makefile | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/config/Config-images.in b/config/Config-images.in index 2931a155d2..284dafd321 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -243,6 +243,13 @@ menu "Target Images" depends on GRUB_IMAGES || GRUB_EFI_IMAGES default y if BUILDBOT + config QCOW2_IMAGES + bool "Build PVE/KVM image files (QCOW2)" + depends on TARGET_x86 + depends on GRUB_IMAGES || GRUB_EFI_IMAGES + select PACKAGE_kmod-e1000 + default y if BUILDBOT + config VDI_IMAGES bool "Build VirtualBox image files (VDI)" depends on TARGET_x86 diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 322131c2a4..677b758e01 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -107,6 +107,7 @@ define Device/Default ARTIFACT/image.iso := grub-config iso | iso 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.qcow2 := grub-config pc | combined | grub-install | qemu-image qcow2 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/combined.vhdx := grub-config pc | combined | grub-install | qemu-image vhdx -o subformat=dynamic @@ -115,6 +116,7 @@ define Device/Default ARTIFACT/image-efi.iso := grub-config iso | iso efi 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.qcow2 := grub-config efi | combined efi | grub-install efi | qemu-image qcow2 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 IMAGE/combined-efi.vhdx := grub-config efi | combined efi | grub-install efi | qemu-image vhdx -o subformat=dynamic @@ -134,6 +136,10 @@ define Device/Default ARTIFACTS-$$(CONFIG_GRUB_IMAGES) += image.iso ARTIFACTS-$$(CONFIG_GRUB_EFI_IMAGES) += image-efi.iso endif + ifeq ($(CONFIG_QCOW2_IMAGES),y) + IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.qcow2 + IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.qcow2 + endif ifeq ($(CONFIG_VDI_IMAGES),y) IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vdi IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vdi