Revert "Generate a VHD image"

This reverts commit ee0e3beb39.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

.gitignore

@@ -14,5 +14,4 @@
 *.img.xz
 *.iso
 *.tar.bz2
-*.vhd
 /*.md5

lfs/flash-images

@@ -36,7 +36,7 @@ ifeq "$(EFI)" "1"
 endif
 PART_ROOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3
 
-IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE)
+IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.xz
 
 FSTAB_FMT = UUID=%s %-8s %-4s %-10s %d %d\n
 
@@ -255,9 +255,5 @@ ifeq "$(BUILD_ARCH)" "armv5tel"
 endif
 
 	# Compress Image
-	xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE).img.xz
-
-	# Make VHD image
-	qemu-img convert -O vpc -o subformat=fixed,force_size $(IMG) $(IMAGE_FILE).vhd
-
+	xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE)
 	rm -rf $(IMG) $(MNThdd)

make.sh

@@ -1670,7 +1670,7 @@ buildpackages() {
 	lfsmake2 flash-images
   fi
 
-  mv $LFS/install/images/{*.iso,*.img.xz,*.bz2,*.vhd} $BASEDIR >> $LOGFILE 2>&1
+  mv $LFS/install/images/{*.iso,*.img.xz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages