Revert "Generate a VHD image"
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 1 Jul 2019 06:54:19 +0000 (07:54 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 1 Jul 2019 06:54:19 +0000 (07:54 +0100)
This reverts commit ee0e3beb39da302fb9735b8b3846ee675192b350.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
.gitignore
lfs/flash-images
make.sh

index 8834c53..69175e6 100644 (file)
@@ -14,5 +14,4 @@
 *.img.xz
 *.iso
 *.tar.bz2
-*.vhd
 /*.md5
index 98adb31..dcad81a 100644 (file)
@@ -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 d8a5474..d6f6f71 100755 (executable)
--- 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