Revert "Generate a VHD image"

This reverts commit ee0e3beb39da302fb9735b8b3846ee675192b350.

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

diff --git a/.gitignore b/.gitignore
index 8834c5366480aae25918c97a688138ffe5d6cd85..69175e69b933a6222cce9c35c38642a34c05ee4f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,4 @@
 *.img.xz
 *.iso
 *.tar.bz2
 *.img.xz
 *.iso
 *.tar.bz2

-*.vhd

 /*.md5
 /*.md5

diff --git a/lfs/flash-images b/lfs/flash-images
index 98adb3124c11c287267ff3995764c3d94795c080..dcad81ab38b9b140166b913628d88e5973a05b4a 100644 (file)
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -36,7 +36,7 @@ ifeq "$(EFI)" "1"
 endif
 PART_ROOT  = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3
 
 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
 
 
 FSTAB_FMT = UUID=%s %-8s %-4s %-10s %d %d\n
 


@@ -255,9 +255,5 @@ ifeq "$(BUILD_ARCH)" "armv5tel"
 endif
 
        # Compress Image
 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)
        rm -rf $(IMG) $(MNThdd)

diff --git a/make.sh b/make.sh
index d8a5474db99f7f79b9031798d1b3467d516e530c..d6f6f71470e057c4fc057190ad6d41d1fbf957ac 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -1670,7 +1670,7 @@ buildpackages() {
        lfsmake2 flash-images
   fi
 
        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
 
 
   ipfirepackages