From c4dd9dfc46a3d0e4a0f96ce1de7606f2dd235f2b Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 1 Jul 2019 07:54:19 +0100
Subject: [PATCH] Revert "Generate a VHD image"

This reverts commit ee0e3beb39da302fb9735b8b3846ee675192b350.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 .gitignore       | 1 -
 lfs/flash-images | 8 ++------
 make.sh          | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8834c53664..69175e69b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,4 @@
 *.img.xz
 *.iso
 *.tar.bz2
-*.vhd
 /*.md5
diff --git a/lfs/flash-images b/lfs/flash-images
index 98adb3124c..dcad81ab38 100644
--- a/lfs/flash-images
+++ b/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)
diff --git a/make.sh b/make.sh
index d8a5474db9..d6f6f71470 100755
--- a/make.sh
+++ b/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
 
-- 
2.39.2