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

add generate Proxmox VE and KVM qcow2 support in x86/x64

Browse Source
This commit is contained in:
coolsnowwolf 2018-10-14 15:27:07 +08:00
parent 53828b3900
commit 17d0fb76af
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/Config-images.in
View File

@ -261,6 +261,14 @@ menu "Target Images"
depends on GRUB_IMAGES || EFI_IMAGES depends on GRUB_IMAGES || EFI_IMAGES
select TARGET_IMAGES_PAD select TARGET_IMAGES_PAD
select PACKAGE_kmod-tulip select PACKAGE_kmod-tulip
config QCOW2_IMAGES
bool "Build PVE/KVM image files (QCOW2)"
depends on TARGET_x86 || TARGET_x86_64
default n
depends on GRUB_IMAGES || EFI_IMAGES
select TARGET_IMAGES_PAD
select PACKAGE_kmod-e1000
config TARGET_IMAGES_PAD config TARGET_IMAGES_PAD
bool "Pad images to filesystem size (for JFFS2)" bool "Pad images to filesystem size (for JFFS2)"

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

@ -267,6 +267,21 @@ ifneq ($(CONFIG_VHD_IMAGES),)
endef endef
endif endif
ifneq ($(CONFIG_QCOW2_IMAGES),)
define Image/Build/qcow2
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).qcow2 || true
/usr/bin/qemu-img convert -O qcow2 \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).qcow2
endef
define Image/Build/qcow2_efi
rm $(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).qcow2 || true
/usr/bin/qemu-img convert -O qcow2 \
$(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).img \
$(BIN_DIR)/$(IMG_PREFIX)-uefi-gpt-$(1).qcow2
endef
endif
define Image/Build/gzip define Image/Build/gzip
gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
ifneq ($(CONFIG_GRUB_IMAGES),) ifneq ($(CONFIG_GRUB_IMAGES),)
@ -307,11 +322,13 @@ ifneq ($(CONFIG_GRUB_IMAGES),)
$(call Image/Build/vdi,$(1)) $(call Image/Build/vdi,$(1))
$(call Image/Build/vmdk,$(1)) $(call Image/Build/vmdk,$(1))
$(call Image/Build/vhd,$(1)) $(call Image/Build/vhd,$(1))
$(call Image/Build/qcow2,$(1))
endif endif
ifneq ($(CONFIG_EFI_IMAGES),) ifneq ($(CONFIG_EFI_IMAGES),)
$(call Image/Build/vdi_efi,$(1)) $(call Image/Build/vdi_efi,$(1))
$(call Image/Build/vmdk_efi,$(1)) $(call Image/Build/vmdk_efi,$(1))
$(call Image/Build/vhd_efi,$(1)) $(call Image/Build/vhd_efi,$(1))
$(call Image/Build/qcow2_efi,$(1))
endif endif
$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
else else