Add utlity to create vhd file from raw disk image. Removes the depend…

…ency on qemu for azure
mafiasoph · Aug 28, 2015 · 6a5f8f0 · 6a5f8f0
1 parent 3ca41d4
commit 6a5f8f0
Show file tree

Hide file tree

Showing 3 changed files with 811 additions and 2 deletions.
diff --git a/support/cloud-image-builder/azure/mk-azure-image.sh b/support/cloud-image-builder/azure/mk-azure-image.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
 PHOTON_IMG_OUTPUT_PATH=$1
-qemu-img create -f vpc -o subformat=fixed $PHOTON_IMG_OUTPUT_PATH/photon-azure.vhd 2G
-qemu-img convert -f raw -O vpc $PHOTON_IMG_OUTPUT_PATH/photon-azure.raw $PHOTON_IMG_OUTPUT_PATH/photon-azure.vhd
+SRC_ROOT=$2
+cd $SRC_ROOT/tools/src/imgconverter
+mkdir -p $SRC_ROOT/tools/bin
+make clean
+make
+$SRC_ROOT/tools/bin/imgconverter -i $PHOTON_IMG_OUTPUT_PATH/photon-azure.raw -v vhd -o $PHOTON_IMG_OUTPUT_PATH/photon-azure.vhd
+exit 0
diff --git a/tools/src/imgconverter/Makefile b/tools/src/imgconverter/Makefile
@@ -0,0 +1,10 @@
+INLUDEDIR=/usr/include
+LIBDIR=/usr/lib
+
+all: img-converter
+
+clean:
+	$(RM) ../../bin/imgconverter
+
+img-converter: imgConverter.c
+	$(CXX) -o ../../bin/imgconverter -I$(INCLUDEDIR) -L$(LIBDIR) $? -ldl -lz -luuid