1. photon
  2. Commit b7e7fb5e99ff6b8a6ffd29d6fe8db17ee8271592
Browse code

Fix output path for cloud image installer

Anish Swaminathan authored on 2015/08/13 09:19:13
Showing 2 changed files
Makefile
History View file @ b7e7fb5
... ... 
@@ -369,26 +369,26 @@ photon-vagrant-local: check-packer check-vagrant
369 369 
 		echo "Unable to find $(PHOTON_STAGE)/photon.iso ... aborting build"; \
370 370 
 	fi
371 371
372 
-cloud-image: $(PHOTON_STAGE) $(PHOTON_ISO_PATH)
372 
+cloud-image: $(PHOTON_STAGE) $(PHOTON_ISO_PATH) iso
373 373 
 	@echo "Building cloud image $(IMG_NAME)..."
374 374 
 	@cd $(PHOTON_CLOUD_IMAGE_BUILDER_DIR)
375 375 
 	@if [ -e $(PHOTON_STAGE)/photon.iso ]; then \
376 
-		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) $(IMG_NAME) $(SRCROOT); \
376 
+		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) $(IMG_NAME) $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR); \
377 377 
 	elif [ -e $(PHOTON_STAGE)/photon-minimal.iso ]; then \
378 
-		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon-minimal.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) $(IMG_NAME) $(SRCROOT); \
378 
+		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon-minimal.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) $(IMG_NAME) $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR); \
379 379 
 	else \
380 380 
 		echo "Unable to find photon iso file... aborting build"; \
381 381 
 	fi
382 382
383 383
384 
-cloud-image-all: $(PHOTON_STAGE) $(PHOTON_ISO_PATH)
384 
+cloud-image-all: $(PHOTON_STAGE) $(PHOTON_ISO_PATH) iso
385 385 
 	@echo "Building cloud images - gce, ami, azure and ova..."
386 386 
 	@cd $(PHOTON_CLOUD_IMAGE_BUILDER_DIR)
387 387 
 	@if [ -e $(PHOTON_STAGE)/photon.iso ]; then \
388 
-		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) gce $(SRCROOT); \
389 
-		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) ami $(SRCROOT); \
390 
-		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) azure $(SRCROOT); \
391 
-		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) ova $(SRCROOT); \
388 
+		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) gce $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR); \
389 
+		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) ami $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR); \
390 
+		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) azure $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR); \
391 
+		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) ova $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR); \
392 392 
 	else \
393 393 
 		echo "Unable to find photon iso file... aborting build"; \
394 394 
 	fi
support/cloud-image-builder/cloud-image-build.sh
History View file @ b7e7fb5
... ... 
@@ -16,6 +16,7 @@ PHOTON_ISO_PATH=$1
16 16 
 BUILD_SCRIPTS_FOLDER=$2
17 17 
 IMG_NAME=$3
18 18 
 SRC_ROOT=$4
19 
+GENERATED_DATA_PATH=$5
19 20 
 PHOTON_STAGE_PATH="${PHOTON_ISO_PATH%/*}"
20 21 
 INSTALLER_PATH=$PHOTON_STAGE_PATH/$IMG_NAME
21 22
... ... 
@@ -62,7 +63,7 @@ fi
62 62 
 PASSWORD=`date | md5sum | cut -f 1 -d ' '`
63 63 
 sed -i "s/PASSWORD/$PASSWORD/" $VMDK_CONFIG_SAFE_FILE
64 64 
 cat $VMDK_CONFIG_SAFE_FILE
65 
-./photonInstaller.py -p build_install_options_$IMG_NAME.json -r $PHOTON_STAGE_PATH/RPMS -v $INSTALLER_PATH/photon-${IMG_NAME} -f $VMDK_CONFIG_SAFE_FILE
65 
+./photonInstaller.py -p build_install_options_$IMG_NAME.json -r $PHOTON_STAGE_PATH/RPMS -v $INSTALLER_PATH/photon-${IMG_NAME} -o $GENERATED_DATA_PATH -f $VMDK_CONFIG_SAFE_FILE
66 66 
 rm $VMDK_CONFIG_SAFE_FILE
67 67
68 68