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

x86: added support to generate VHDX images (#8399)

Browse Source 
Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com>

Co-authored-by: Oldřich Jedlička <oldium.pro@gmail.com>
This commit is contained in:
aakkll 2021-12-08 16:10:18 +08:00 committed by GitHub
parent 2972a0502d
commit 7d11f9ad7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/Config-images.in
View File

@ -271,12 +271,6 @@ menu "Target Images"
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
@ -284,6 +278,12 @@ menu "Target Images"
default y default y
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-e1000
config TARGET_IMAGES_GZIP config TARGET_IMAGES_GZIP
bool "GZip images" bool "GZip images"
depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armvirt || TARGET_malta depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armvirt || TARGET_malta

2
include/image-commands.mk
View File

@ -360,7 +360,7 @@ define Build/patch-cmdline
endef endef
# Convert a raw image into a $1 type image. # Convert a raw image into a $1 type image.
# E.g. | qemu-image vdi # E.g. | qemu-image vdi <optional extra arguments to qemu-img binary>
define Build/qemu-image define Build/qemu-image
if command -v qemu-img; then \ if command -v qemu-img; then \
qemu-img convert -f raw -O $1 $@ $@.new; \ qemu-img convert -f raw -O $1 $@ $@.new; \

2
target/linux/x86/Makefile
View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
ARCH:=i386 ARCH:=i386
BOARD:=x86 BOARD:=x86
BOARDNAME:=x86 BOARDNAME:=x86
FEATURES:=squashfs vdi vmdk pcmcia fpu boot-part rootfs-part FEATURES:=squashfs vdi vmdk vhdx pcmcia fpu boot-part rootfs-part
SUBTARGETS:=64 generic legacy geode SUBTARGETS:=64 generic legacy geode
KERNEL_PATCHVER:=5.4 KERNEL_PATCHVER:=5.4

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

@ -109,8 +109,8 @@ define Device/Default
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.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/combined.vhdx := grub-config pc | combined | grub-install | qemu-image vhdx -o subformat=dynamic
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
@ -118,8 +118,8 @@ define Device/Default
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.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
IMAGE/combined-efi.vhdx := grub-config efi | combined efi | grub-install efi | qemu-image vhdx -o subformat=dynamic
ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y) ifeq ($(CONFIG_TARGET_IMAGES_GZIP),y)
IMAGES-y := rootfs.img.gz IMAGES-y := rootfs.img.gz
IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.img.gz IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.img.gz
@ -144,14 +144,14 @@ define Device/Default
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
endif endif
ifeq ($(CONFIG_VHDX_IMAGES),y)
IMAGES-$$(CONFIG_GRUB_IMAGES) += combined.vhdx
IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.vhdx
endif
IMAGES := $$(IMAGES-y) IMAGES := $$(IMAGES-y)
ARTIFACTS := $$(ARTIFACTS-y) ARTIFACTS := $$(ARTIFACTS-y)
SUPPORTED_DEVICES := SUPPORTED_DEVICES :=