298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 14:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: add Hyper-V & PVE image build

Browse Source
This commit is contained in:
lean 2021-06-20 00:29:29 +08:00
parent 1eed211889
commit 13ae7ee67d
5 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/Config-images.in
View File

@ -259,12 +259,24 @@ menu "Target Images"
depends on TARGET_x86 depends on TARGET_x86
depends on GRUB_IMAGES || GRUB_EFI_IMAGES 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 config VDI_IMAGES
bool "Build VirtualBox image files (VDI)" bool "Build VirtualBox image files (VDI)"
depends on TARGET_x86 depends on TARGET_x86
depends on GRUB_IMAGES || GRUB_EFI_IMAGES depends on GRUB_IMAGES || GRUB_EFI_IMAGES
select PACKAGE_kmod-e1000 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 config VMDK_IMAGES
bool "Build VMware image files (VMDK)" bool "Build VMware image files (VMDK)"
depends on TARGET_x86 depends on TARGET_x86

3
target/linux/x86/64/config-5.10
View File

@ -243,7 +243,6 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
CONFIG_INTEL_GTT=y CONFIG_INTEL_GTT=y
# CONFIG_INTEL_IDLE is not set
# CONFIG_INTEL_IDXD is not set # CONFIG_INTEL_IDXD is not set
# CONFIG_INTEL_IPS is not set # CONFIG_INTEL_IPS is not set
# CONFIG_INTEL_MEI_HDCP 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_FAILOVER=y
CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_FLOW_LIMIT=y
# CONFIG_NITRO_ENCLAVES is not set # CONFIG_NITRO_ENCLAVES is not set
CONFIG_NR_CPUS=8 CONFIG_NR_CPUS=64
CONFIG_NR_CPUS_DEFAULT=64 CONFIG_NR_CPUS_DEFAULT=64
CONFIG_NR_CPUS_RANGE_BEGIN=2 CONFIG_NR_CPUS_RANGE_BEGIN=2
CONFIG_NR_CPUS_RANGE_END=512 CONFIG_NR_CPUS_RANGE_END=512

5
target/linux/x86/generic/config-5.10
View File

@ -208,7 +208,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
CONFIG_INTEL_GTT=y CONFIG_INTEL_GTT=y
CONFIG_INTEL_IDLE=y
# CONFIG_INTEL_IPS is not set # CONFIG_INTEL_IPS is not set
# CONFIG_INTEL_MEI_HDCP is not set # CONFIG_INTEL_MEI_HDCP is not set
# CONFIG_INTEL_MENLOW 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_FAILOVER=y
CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_FLOW_LIMIT=y
CONFIG_NO_HZ=y CONFIG_NO_HZ=y
CONFIG_NR_CPUS=4 CONFIG_NR_CPUS=64
CONFIG_NR_CPUS_DEFAULT=8 CONFIG_NR_CPUS_DEFAULT=64
CONFIG_NR_CPUS_RANGE_BEGIN=2 CONFIG_NR_CPUS_RANGE_BEGIN=2
CONFIG_NR_CPUS_RANGE_END=8 CONFIG_NR_CPUS_RANGE_END=8
CONFIG_PADATA=y CONFIG_PADATA=y

1
target/linux/x86/generic/config-5.4
View File

@ -217,7 +217,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
CONFIG_INTEL_GTT=y CONFIG_INTEL_GTT=y
CONFIG_INTEL_IDLE=y
# CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_INT0002_VGPIO is not set
# CONFIG_INTEL_IPS is not set # CONFIG_INTEL_IPS is not set
# CONFIG_INTEL_MENLOW is not set # CONFIG_INTEL_MENLOW is not set

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

@ -107,14 +107,18 @@ define Device/Default
ARTIFACT/image.iso := grub-config iso | iso ARTIFACT/image.iso := grub-config iso | iso
IMAGE/combined.img := grub-config pc | combined | grub-install | append-metadata 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.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.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/combined.vmdk := grub-config pc | combined | grub-install | qemu-image vmdk
IMAGE/rootfs.img := append-rootfs | pad-to $(ROOTFS_PARTSIZE) IMAGE/rootfs.img := append-rootfs | pad-to $(ROOTFS_PARTSIZE)
IMAGE/rootfs.img.gz := append-rootfs | pad-to $(ROOTFS_PARTSIZE) | gzip IMAGE/rootfs.img.gz := append-rootfs | pad-to $(ROOTFS_PARTSIZE) | gzip
ARTIFACT/image-efi.iso := grub-config iso | iso efi 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 := 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.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.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 IMAGE/combined-efi.vmdk := grub-config efi | combined efi | grub-install efi | qemu-image vmdk
ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y) ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y)
IMAGES-y := rootfs.img.gz IMAGES-y := rootfs.img.gz
@ -132,10 +136,18 @@ define Device/Default
ARTIFACTS-$$(CONFIG_GRUB_IMAGES) += image.iso ARTIFACTS-$$(CONFIG_GRUB_IMAGES) += image.iso
ARTIFACTS-$$(CONFIG_GRUB_EFI_IMAGES) += image-efi.iso ARTIFACTS-$$(CONFIG_GRUB_EFI_IMAGES) += image-efi.iso
endif 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) ifeq ($(CONFIG_VDI_IMAGES),y)
IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vdi IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vdi
IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vdi IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vdi
endif 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) ifeq ($(CONFIG_VMDK_IMAGES),y)
IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vmdk IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vmdk
IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vmdk IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vmdk