From 13ae7ee67ded867afaee595d9890ff58d9ec4498 Mon Sep 17 00:00:00 2001 From: lean Date: Sun, 20 Jun 2021 00:29:29 +0800 Subject: [PATCH] x86: add Hyper-V & PVE image build --- config/Config-images.in | 12 ++++++++++++ target/linux/x86/64/config-5.10 | 3 +-- target/linux/x86/generic/config-5.10 | 5 ++--- target/linux/x86/generic/config-5.4 | 1 - target/linux/x86/image/Makefile | 12 ++++++++++++ 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/config/Config-images.in b/config/Config-images.in index c894f396f..e65787a6f 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -259,12 +259,24 @@ menu "Target Images" depends on TARGET_x86 depends on GRUB_IMAGES || GRUB_EFI_IMAGES + 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 + config VDI_IMAGES bool "Build VirtualBox image files (VDI)" depends on TARGET_x86 depends on GRUB_IMAGES || GRUB_EFI_IMAGES select PACKAGE_kmod-e1000 + config VHDX_IMAGES + bool "Build Hyper-V image files (VHDX)" + depends on TARGET_x86 + depends on GRUB_IMAGES || GRUB_EFI_IMAGES + select PACKAGE_kmod-tulip + config VMDK_IMAGES bool "Build VMware image files (VMDK)" depends on TARGET_x86 diff --git a/target/linux/x86/64/config-5.10 b/target/linux/x86/64/config-5.10 index c308f434a..dcf981345 100644 --- a/target/linux/x86/64/config-5.10 +++ b/target/linux/x86/64/config-5.10 @@ -243,7 +243,6 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y CONFIG_INTEL_GTT=y -# CONFIG_INTEL_IDLE is not set # CONFIG_INTEL_IDXD is not set # CONFIG_INTEL_IPS is not set # CONFIG_INTEL_MEI_HDCP is not set @@ -301,7 +300,7 @@ CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NET_FAILOVER=y CONFIG_NET_FLOW_LIMIT=y # CONFIG_NITRO_ENCLAVES is not set -CONFIG_NR_CPUS=8 +CONFIG_NR_CPUS=64 CONFIG_NR_CPUS_DEFAULT=64 CONFIG_NR_CPUS_RANGE_BEGIN=2 CONFIG_NR_CPUS_RANGE_END=512 diff --git a/target/linux/x86/generic/config-5.10 b/target/linux/x86/generic/config-5.10 index 7d9faad49..0c8dc0b47 100644 --- a/target/linux/x86/generic/config-5.10 +++ b/target/linux/x86/generic/config-5.10 @@ -208,7 +208,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y CONFIG_INTEL_GTT=y -CONFIG_INTEL_IDLE=y # CONFIG_INTEL_IPS is not set # CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MENLOW is not set @@ -284,8 +283,8 @@ CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NET_FAILOVER=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NO_HZ=y -CONFIG_NR_CPUS=4 -CONFIG_NR_CPUS_DEFAULT=8 +CONFIG_NR_CPUS=64 +CONFIG_NR_CPUS_DEFAULT=64 CONFIG_NR_CPUS_RANGE_BEGIN=2 CONFIG_NR_CPUS_RANGE_END=8 CONFIG_PADATA=y diff --git a/target/linux/x86/generic/config-5.4 b/target/linux/x86/generic/config-5.4 index 65dc36107..23972b069 100644 --- a/target/linux/x86/generic/config-5.4 +++ b/target/linux/x86/generic/config-5.4 @@ -217,7 +217,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y CONFIG_INTEL_GTT=y -CONFIG_INTEL_IDLE=y # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IPS is not set # CONFIG_INTEL_MENLOW is not set diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index f61e4ff80..6fc353b9f 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -107,14 +107,18 @@ 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.vhdx := grub-config pc | combined | grub-install | qemu-image vhdx IMAGE/combined.vmdk := grub-config pc | combined | grub-install | qemu-image vmdk IMAGE/rootfs.img := append-rootfs | pad-to $(ROOTFS_PARTSIZE) IMAGE/rootfs.img.gz := append-rootfs | pad-to $(ROOTFS_PARTSIZE) | gzip 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.vhdx := grub-config efi | combined efi | grub-install efi | qemu-image vhdx IMAGE/combined-efi.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y) IMAGES-y := rootfs.img.gz @@ -132,10 +136,18 @@ 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 endif + ifeq ($(CONFIG_VHDX_IMAGES),y) + IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vhdx + IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vhdx + endif ifeq ($(CONFIG_VMDK_IMAGES),y) IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vmdk IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vmdk