|
|
@ -160,27 +160,21 @@ endef |
|
|
|
|
|
|
|
|
|
|
|
ifneq ($(CONFIG_VDI_IMAGES),) |
|
|
|
ifneq ($(CONFIG_VDI_IMAGES),) |
|
|
|
define Image/Build/vdi
|
|
|
|
define Image/Build/vdi
|
|
|
|
# left here because the image builder doesnt need these
|
|
|
|
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
|
|
|
|
ifeq ($(1),ext4)
|
|
|
|
qemu-img convert -f raw -O vdi \
|
|
|
|
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
|
|
|
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
|
|
|
qemu-img convert -f raw -O vdi \
|
|
|
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
|
|
|
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
|
|
|
# XXX: VBoxManage insists on setting perms to 0600
|
|
|
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
|
|
|
|
chmod 0644 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
|
|
|
|
# XXX: VBoxManage insists on setting perms to 0600
|
|
|
|
|
|
|
|
chmod 0644 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
endef
|
|
|
|
endef
|
|
|
|
endif |
|
|
|
endif |
|
|
|
|
|
|
|
|
|
|
|
ifneq ($(CONFIG_VMDK_IMAGES),) |
|
|
|
ifneq ($(CONFIG_VMDK_IMAGES),) |
|
|
|
define Image/Build/vmdk
|
|
|
|
define Image/Build/vmdk
|
|
|
|
# left here because the image builder doesnt need these
|
|
|
|
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true
|
|
|
|
ifeq ($(1),ext4)
|
|
|
|
qemu-img convert -f raw -O vmdk \
|
|
|
|
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true
|
|
|
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
|
|
|
qemu-img convert -f raw -O vmdk \
|
|
|
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk
|
|
|
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
|
|
|
|
|
|
|
|
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
endef
|
|
|
|
endef
|
|
|
|
endif |
|
|
|
endif |
|
|
|
|
|
|
|
|
|
|
|