Index: /branches/rel_apv_10_7/GNUmakefile
===================================================================
--- /branches/rel_apv_10_7/GNUmakefile	(revision 37899)
+++ /branches/rel_apv_10_7/GNUmakefile	(working copy)
@@ -411,16 +411,13 @@
 
 tgz: image
 	#create metadata.ini
-	rm -rf ./ustack.${IMAGE_TYPE}
 	rm -rf ./${REL}.${IMAGE_TYPE}.tar.gz
-	cp ${BASEIMAGE_DIR}/ustack.${IMAGE_TYPE} ./
 	echo -n "" > metadata.ini
 	echo -e 'Inner-version: 1.1' >> metadata.ini
 	echo -e 'Image-description: ${IMAGE_DESC}' >> metadata.ini
 	echo -e 'Image-version: $(shell echo ${REL} | sed 's/_/./g')' >> metadata.ini
 	echo -e 'Instance-size: shared-entry, entry, small, medium, large, custom' >> metadata.ini
-	echo -e 'Image-order: ustack.${IMAGE_TYPE}' >> metadata.ini
+	echo -e 'Image-order: ${REL}.${IMAGE_TYPE}' >> metadata.ini
 	echo -e "Console-type: VNC" >> metadata.ini
-	echo -e "Image-md5value: $(shell /usr/bin/md5sum ${BASEIMAGE_DIR}/ustack.${IMAGE_TYPE} | /usr/bin/awk '{print $$1}') " >> metadata.ini
-	tar czvf ${REL}.${IMAGE_TYPE}.tar.gz ustack.${IMAGE_TYPE} metadata.ini
-
+	echo -e "Image-md5value: $(shell /usr/bin/md5sum ${REL}.${IMAGE_TYPE} | /usr/bin/awk '{print $$1}') " >> metadata.ini
+	tar czvf ${REL}.${IMAGE_TYPE}.tar.gz ${REL}.${IMAGE_TYPE} metadata.ini
\ No newline at end of file