@@ -354,26 +354,17 @@ photon-vagrant-local: check-packer check-vagrant

 cloud-image: $(PHOTON_STAGE) $(PHOTON_ISO_PATH) iso

 	@echo "Building cloud image $(IMG_NAME)..."

 	@cd $(PHOTON_CLOUD_IMAGE_BUILDER_DIR)

-	@if [ -e $(PHOTON_STAGE)/photon.iso ]; then \

-		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) $(IMG_NAME) $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR); \

-	elif [ -e $(PHOTON_STAGE)/photon-minimal.iso ]; then \

-		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon-minimal.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) $(IMG_NAME) $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR); \

-	else \

-		echo "Unable to find photon iso file... aborting build"; \

-	fi

+	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) $(IMG_NAME) $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE) $(ADDITIONAL_RPMS_PATH)

 cloud-image-all: $(PHOTON_STAGE) $(PHOTON_ISO_PATH) iso

 	@echo "Building cloud images - gce, ami, azure and ova..."

 	@cd $(PHOTON_CLOUD_IMAGE_BUILDER_DIR)

-	@if [ -e $(PHOTON_STAGE)/photon.iso ]; then \

-		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) gce $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR); \

-		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) ami $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR); \

-		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) azure $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR); \

-		$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_STAGE)/photon.iso $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) ova $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR); \

-	else \

-		echo "Unable to find photon iso file... aborting build"; \

-	fi

+	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) gce $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE) $(ADDITIONAL_RPMS_PATH)

+	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) ami $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE) $(ADDITIONAL_RPMS_PATH)

+	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) azure $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE) $(ADDITIONAL_RPMS_PATH)

+	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) ova $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE) $(ADDITIONAL_RPMS_PATH)

+

 check: check-bison check-g++ check-gawk check-createrepo check-texinfo check-sanity check-docker

new file mode 100644

@@ -0,0 +1,14 @@

+{

+    "minimal" : {

+        "title" : "Photon Minimal",

+        "file" : "packages_minimal.json",

+        "visible" : true,

+        "include" : []

+    },

+    "uefi" : {

+        "title" : "Photon UEFI packages",

+        "file" : "packages_uefi.json",

+        "visible" : true,

+        "include" : ["minimal"]

+    }

+}

new file mode 100644

@@ -0,0 +1,4 @@

+{

+    "packages":["tzdata", "mesos"]

+}

+

@@ -12,6 +12,7 @@

 #		The path to this empty disk is specified in the HDD variable in config.inc

 #	End

 #

+

 grub_efi_install()

 {

     mkdir $BUILDROOT/boot/efi

@@ -27,7 +28,7 @@ grub_efi_install()

     mkfs.vfat $BOOT_PARTITION

     mount -t vfat $BOOT_PARTITION $BUILDROOT/boot/efi

     cp boot/unifont.pf2 /usr/share/grub/

-    grub2-efi-install --target=x86_64-efi --efi-directory=$BUILDROOT/boot/efi --bootloader-id=Boot --root-directory=$BUILDROOT --recheck --debug

+    grub2-efi-install --target=x86_64-efi --efi-directory=$BUILDROOT/boot/efi --bootloader-id=Boot --root-directory=$BUILDROOT --recheck

     rm $BUILDROOT/boot/efi/EFI/Boot/grubx64.efi

     cp efi/bootx64.efi $BUILDROOT/boot/efi/EFI/Boot/bootx64.efi

     umount $BUILDROOT/boot/efi

@@ -69,7 +70,7 @@ ln -sfv grub2 $BUILDROOT/boot/grub

 command -v grub-install >/dev/null 2>&1 && grubInstallCmd="grub-install" && { echo >&2 "Found grub-install"; }

 command -v grub2-install >/dev/null 2>&1 && grubInstallCmd="grub2-install" && { echo >&2 "Found grub2-install"; }

 if [ -z $grubInstallCmd ]; then

-echo "Unable to found grub install command"

+echo "Unable to find grub install command"

 exit 1

 fi

@@ -1,3 +1,6 @@

 #!/bin/bash

 PHOTON_IMG_OUTPUT_PATH=$1

+tar -Szcf $PHOTON_IMG_OUTPUT_PATH/photon-ami.tar.gz $PHOTON_IMG_OUTPUT_PATH/photon-ami.raw

+

+rm -f $PHOTON_IMG_OUTPUT_PATH/photon-ami.raw

@@ -6,7 +6,7 @@

 			"text": "PASSWORD"

 		},

 	"type": "ami",

-    "size": {"root": "5", "swap": "0"},

+    "size": {"root": "8", "swap": "0"},

     "public_key":"<ssh-key-here>"

 }

@@ -1,5 +1,4 @@

 #!/bin/bash

-set -x

 cd /lib/systemd/system/multi-user.target.wants/

@@ -7,4 +7,6 @@ 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

+

+rm -f $PHOTON_IMG_OUTPUT_PATH/photon-azure.raw

+

@@ -6,7 +6,7 @@

 			"text": "PASSWORD"

 		},

 	"type": "azure",

-    "size": {"root": "2", "swap": "0"},

+    "size": {"root": "8", "swap": "0"},

     "public_key":"<ssh-key-here>"

 }

@@ -10,61 +10,52 @@

 #		Create cloud images

 #	End

 #

-

 set -x

-PHOTON_ISO_PATH=$1

-BUILD_SCRIPTS_FOLDER=$2

-IMG_NAME=$3

-SRC_ROOT=$4

-GENERATED_DATA_PATH=$5

-PHOTON_STAGE_PATH="${PHOTON_ISO_PATH%/*}"

+BUILD_SCRIPTS_PATH=$1

+IMG_NAME=$2

+SRC_ROOT=$3

+GENERATED_DATA_PATH=$4

+PHOTON_STAGE_PATH=$5

+ADDITIONAL_RPMS_PATH=$6

 INSTALLER_PATH=$PHOTON_STAGE_PATH/$IMG_NAME

 PHOTON_IMG_OUTPUT_PATH=$PHOTON_STAGE_PATH/$IMG_NAME

-VMDK_CONFIG_FILE=${BUILD_SCRIPTS_FOLDER}/$IMG_NAME/vmdk_$IMG_NAME.json

-VMDK_CONFIG_SAFE_FILE=${BUILD_SCRIPTS_FOLDER}/$IMG_NAME/vmdk_safe_$IMG_NAME.json

-ISO_MOUNT_FOLDER=$PHOTON_STAGE_PATH/iso_mount

+VMDK_CONFIG_FILE=${BUILD_SCRIPTS_PATH}/$IMG_NAME/vmdk_$IMG_NAME.json

+VMDK_CONFIG_SAFE_FILE=${BUILD_SCRIPTS_PATH}/$IMG_NAME/vmdk_safe_$IMG_NAME.json

-mkdir -p $ISO_MOUNT_FOLDER

 mkdir -p $INSTALLER_PATH/installer

 cp -R $SRC_ROOT/installer $INSTALLER_PATH/

 cd $INSTALLER_PATH/installer

 cp $VMDK_CONFIG_FILE $VMDK_CONFIG_SAFE_FILE

-cp ${BUILD_SCRIPTS_FOLDER}/mk-setup-vmdk.sh .

-cp ${BUILD_SCRIPTS_FOLDER}/mk-clean-vmdk.sh .

+cp ${BUILD_SCRIPTS_PATH}/mk-setup-vmdk.sh .

+cp ${BUILD_SCRIPTS_PATH}/mk-clean-vmdk.sh .

 if [ $IMG_NAME != "ova" ]

   then

-    cp ${BUILD_SCRIPTS_FOLDER}/mk-setup-grub.sh .

+    cp ${BUILD_SCRIPTS_PATH}/mk-setup-grub.sh .

 fi

-if [ -e ${BUILD_SCRIPTS_FOLDER}/${IMG_NAME}/mk-setup-grub.sh ]

+if [ -e ${BUILD_SCRIPTS_PATH}/${IMG_NAME}/mk-setup-grub.sh ]

   then

-    cp ${BUILD_SCRIPTS_FOLDER}/${IMG_NAME}/mk-setup-grub.sh .

+    cp ${BUILD_SCRIPTS_PATH}/${IMG_NAME}/mk-setup-grub.sh .

 fi

-if [ -e ${BUILD_SCRIPTS_FOLDER}/${IMG_NAME}/mk-setup-vmdk.sh ]

-  then

-    cp ${BUILD_SCRIPTS_FOLDER}/${IMG_NAME}/mk-setup-vmdk.sh .

-fi

+PASSWORD=`date | md5sum | cut -f 1 -d ' '`

+sed -i "s/PASSWORD/$PASSWORD/" $VMDK_CONFIG_SAFE_FILE

-if [ -e ${BUILD_SCRIPTS_FOLDER}/${IMG_NAME}/mk-clean-vmdk.sh ]

+echo $ADDITIONAL_RPMS_PATH

+if [ -n "$ADDITIONAL_RPMS_PATH" ]

   then

-    cp ${BUILD_SCRIPTS_FOLDER}/${IMG_NAME}/mk-clean-vmdk.sh .

+    mkdir $PHOTON_STAGE_PATH/RPMS/additonal

+    cp -f $ADDITIONAL_RPMS_PATH/* $PHOTON_STAGE_PATH/RPMS/additonal/

 fi

-PASSWORD=`date | md5sum | cut -f 1 -d ' '`

-sed -i "s/PASSWORD/$PASSWORD/" $VMDK_CONFIG_SAFE_FILE

-cat $VMDK_CONFIG_SAFE_FILE

 ./photonInstaller.py -p $GENERATED_DATA_PATH/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

 rm $VMDK_CONFIG_SAFE_FILE

-

-cd $BUILD_SCRIPTS_FOLDER

-

-

+cd $BUILD_SCRIPTS_PATH

 DISK_DEVICE=`losetup --show -f ${PHOTON_IMG_OUTPUT_PATH}/photon-${IMG_NAME}.raw`

@@ -87,7 +78,7 @@ sed -e "s/^\(root:\)[^:]*:/\1*:/" $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc

 rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow.bak

 rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow-

-if [ $IMG_NAME != "ova" ]

+if [ $IMG_NAME != "ova" ] && [ $IMG_NAME != "ova_uefi" ]

   then

     mount -o bind /proc $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/proc

     mount -o bind /dev $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/dev

@@ -1,5 +1,4 @@

 #!/bin/bash

-set -x

 cd /lib/systemd/system/multi-user.target.wants/

@@ -8,3 +8,5 @@ echo "Creating ${TARFILE} file from ${RAWFILE}."

 cd $PHOTON_IMG_OUTPUT_PATH

 mv ${RAWFILE} disk.raw

 tar -Szcf $PHOTON_IMG_OUTPUT_PATH/${TARFILE} disk.raw

+

+rm -f disk.raw

@@ -6,7 +6,7 @@

 			"text": "PASSWORD"

 		},

 	"type": "gce",

-    "size": {"root": "2", "swap": "0"},

+    "size": {"root": "8", "swap": "0"},

     "public_key":"<ssh-key-here>"

 }

@@ -24,6 +24,8 @@ ovftool /tmp/vmx-temp.vmx $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova.ovf

 cd $PHOTON_IMG_OUTPUT_PATH/temp

 sed -i "s/otherGuest/other3xLinux64Guest/g" $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova.ovf

+#Add product info

+sed -i '/\/VirtualHardwareSection>/i \ \t<ProductSection> \n \t\t<Info>Information about the installed software</Info> \n \t\t<Product>Photon</Product> \n \t\t<Vendor>VMware Inc.</Vendor> \n \t\t<Version>1.0.0</Version> \n \t\t<FullVersion>1.0.0-TP2</FullVersion> \n \t</ProductSection> ' $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova.ovf

 rm -f $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova.mf

 openssl sha1 *.vmdk photon-ova.ovf > photon-ova.mf

 tar cf photon-ova.ova photon-ova.ovf photon-ova.mf photon-ova-disk1.vmdk

@@ -64,6 +66,8 @@ mkdir -p $PHOTON_IMG_OUTPUT_PATH/temp1

 ovftool /tmp/vmx-temp-custom.vmx $PHOTON_IMG_OUTPUT_PATH/temp1/photon-custom.ovf

 cd $PHOTON_IMG_OUTPUT_PATH/temp1

 sed -i "s/otherGuest/other3xLinux64Guest/g" $PHOTON_IMG_OUTPUT_PATH/temp1/photon-custom.ovf

+#Add product info

+sed -i '/\/VirtualHardwareSection>/i \ \t<ProductSection> \n \t\t<Info>Information about the installed software</Info> \n \t\t<Product>Photon</Product> \n \t\t<Vendor>VMware Inc.</Vendor> \n \t\t<Version>1.0.0</Version> \n \t\t<FullVersion>1.0.0-TP2</FullVersion> \n \t</ProductSection> ' $PHOTON_IMG_OUTPUT_PATH/temp1/photon-custom.ovf

 rm -f $PHOTON_IMG_OUTPUT_PATH/temp1/photon-custom.mf

 openssl sha1 *.vmdk photon-custom.ovf > photon-custom.mf

 tar cf photon-custom.ova photon-custom.ovf photon-custom.mf photon-custom-disk1.vmdk

@@ -71,3 +75,4 @@ cp $PHOTON_IMG_OUTPUT_PATH/temp1/photon-custom.ova $PHOTON_IMG_OUTPUT_PATH/

 cd $PHOTON_IMG_OUTPUT_PATH

 rm -rf $PHOTON_IMG_OUTPUT_PATH/temp/

 rm -rf $PHOTON_IMG_OUTPUT_PATH/temp1/

+rm -f $PHOTON_IMG_OUTPUT_PATH/photon-ova.raw

@@ -6,7 +6,7 @@

 			"text": "PASSWORD"

 		},

 	"type": "minimal",

-    "size": {"root": "2", "swap": "0"},

+    "size": {"root": "8", "swap": "0"},

     "public_key":"<ssh-key-here>"

 }

new file mode 100755

@@ -0,0 +1,37 @@

+#!/bin/bash

+set -x

+PHOTON_IMG_OUTPUT_PATH=$1

+SRC_ROOT=$2

+

+rm -f $PHOTON_IMG_OUTPUT_PATH/*.vmdk

+rm -f $PHOTON_IMG_OUTPUT_PATH/*.ova

+sed "s|VMDK_IMAGE|$PHOTON_IMG_OUTPUT_PATH/photon-ova-uefi.vmdk|" vmx-uefi-template > /tmp/vmx-temp-uefi.vmx

+

+cd $SRC_ROOT/tools/src/vixDiskUtil

+mkdir -p $SRC_ROOT/tools/bin

+make clean

+make

+

+cd $PHOTON_IMG_OUTPUT_PATH

+

+$SRC_ROOT/tools/bin/vixdiskutil -convert $PHOTON_IMG_OUTPUT_PATH/photon-ova_uefi.raw -cap 16000 $PHOTON_IMG_OUTPUT_PATH/photon-ova-uefi.vmdk

+$SRC_ROOT/tools/bin/vixdiskutil -wmeta toolsVersion 2147483647 $PHOTON_IMG_OUTPUT_PATH/photon-ova-uefi.vmdk

+

+mkdir -p $PHOTON_IMG_OUTPUT_PATH/temp

+ovftool /tmp/vmx-temp-uefi.vmx $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova-uefi.ovf

+cd $PHOTON_IMG_OUTPUT_PATH/temp

+

+sed -i "s/otherGuest/other3xLinux64Guest/g" $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova-uefi.ovf

+#Add uefi metadata

+sed -i '/vmw:value="efi"\/>/a \ \t<vmw:Config ovf:required="false" vmw:key="uefi.secureBoot.enabled" vmw:value="TRUE"/>\n \ \t<vmw:Config ovf:required="false" vmw:key="isolation.monitor.control.disable" vmw:value="FALSE"/> ' $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova-uefi.ovf

+#Add product info

+sed -i '/\/VirtualHardwareSection>/i \ \t<ProductSection> \n \t\t<Info>Information about the installed software</Info> \n \t\t<Product>Photon</Product> \n \t\t<Vendor>VMware Inc.</Vendor> \n \t\t<Version>1.0.0</Version> \n \t\t<FullVersion>1.0.0-TP2</FullVersion> \n \t</ProductSection> ' $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova-uefi.ovf

+

+openssl sha1 *.vmdk photon-ova-uefi.ovf > photon-ova-uefi.mf

+tar cf photon-ova-uefi.ova photon-ova-uefi.ovf photon-ova-uefi.mf photon-ova-uefi-disk1.vmdk

+

+cp $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova-uefi.ova $PHOTON_IMG_OUTPUT_PATH/

+rm -rf $PHOTON_IMG_OUTPUT_PATH/temp/

+

+rm -f $PHOTON_IMG_OUTPUT_PATH/photon-ova_uefi.raw

+

new file mode 100644

@@ -0,0 +1,13 @@

+{

+	"hostname": "photon-machine",

+	"password": 

+		{

+			"crypted": false,

+			"text": "PASSWORD"

+		},

+	"type": "uefi",

+    "size": {"root": "8", "swap": "0"},

+    "boot":"efi",

+    "public_key":"<ssh-key-here>"

+}

+

new file mode 100644

@@ -0,0 +1,23 @@

+.encoding = "UTF-8"

+virtualHW.version = "10"

+scsi0.present = "TRUE"

+scsi0.virtualDev = "lsilogic"

+scsi0:0.present = "TRUE"

+scsi0:0.fileName = "VMDK_IMAGE"

+ethernet0.present = "TRUE"

+ethernet0.virtualDev = "vmxnet3"

+ethernet0.wakeOnPcktRcv = "FALSE"

+ethernet0.addressType = "generated"

+ethernet0.linkStatePropagation.enable = "TRUE"

+ethernet0.connectionType = "None"

+displayName = "Photon"

+guestOS = "*other26xLinux64Guest"

+memsize = "2048"

+ide1:0.present = "TRUE"

+ide1:0.autodetect = "TRUE"

+ide1:0.deviceType = "cdrom-raw"

+ide1:0.startConnected = "FALSE"

+firmware = "efi"

+uefi.secureBoot.enabled = "TRUE"

+isolation.monitor.control.disable = "FALSE"

+