Generate a VHD image

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

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

diff --git a/lfs/flash-images b/lfs/flash-images
index b78691e083ea40a309bb336552ba492a5307fa68..b9a26cc2e25561e00eee0ff9afa9d25445c24c2a 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
 
-IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.xz
+IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE)
 
 FSTAB_FMT = UUID=%s %-8s %-4s %-10s %d %d\n
 
@@ -255,5 +255,9 @@ ifeq "$(BUILD_ARCH)" "armv5tel"
 endif
 
        # Compress Image
-       xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE)
+       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
+
        rm -rf $(IMG) $(MNThdd)

diff --git a/make.sh b/make.sh
index cdf5bbed7eadeea898a46a72aa9c00b538f3a6de..6e0a3475e5bd8100404e2f96f627d9ef9cfd7898 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} $BASEDIR >> $LOGFILE 2>&1
+  mv $LFS/install/images/{*.iso,*.img.xz,*.bz2,*.vhd} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages