@@ -29,9 +29,6 @@ else

 PHOTON_SOURCES ?= sources

 endif

-PHOTON_MINIMAL_DEPLIST := minimal-dep-list

-PHOTON_MICRO_DEPLIST := micro-dep-list

-PHOTON_FULL_DEPLIST := full-dep-list

 PREPARE_OUT_DATADIR := prepare-out-datadir

 ifdef PHOTON_PUBLISH_RPMS_PATH

@@ -54,7 +51,7 @@ all: iso minimal-iso docker-image ostree-host-iso live-iso cloud-image-all

 micro: micro-iso

 	@:

-micro-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MICRO) $(PHOTON_MICRO_DEPLIST)

+micro-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MICRO)

 	@echo "Building Photon Micro ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

         $(PHOTON_INSTALLER) -i $(PHOTON_STAGE)/photon-micro.iso \

@@ -62,18 +59,10 @@ micro-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MICRO) $(PHOTON_MICRO_DEPLIST

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

                 -p $(PHOTON_DATA_DIR)/build_install_options_micro.json \

+				-s $(PHOTON_SPECS_DIR) \

                 -f > \

                 $(PHOTON_LOGS_DIR)/installer.log 2>&1

-$(PHOTON_MICRO_DEPLIST): check $(PREPARE_OUT_DATADIR)

-	@echo "Generating the install time dependency list for micro installation"

-	@cd $(PHOTON_SPECDEPS_DIR) && \

-		$(PHOTON_SPECDEPS) \

-		-s $(PHOTON_SPECS_DIR) \

-		-t $(PHOTON_STAGE) \

-		--input-type=json --file packages_micro.json -d json -t $(PHOTON_STAGE) -a $(PHOTON_DATA_DIR)

-	@echo "generated the json file with all dependencies for micro installation"

-

 deptree-micro:

 	@cd $(PHOTON_SPECDEPS_DIR) && \

 		$(PHOTON_SPECDEPS) \

@@ -106,7 +95,7 @@ deptree-minimal:

 		-t $(PHOTON_STAGE) \

 		-i json -f packages_minimal.json -a $(PHOTON_DATA_DIR) 

-minimal-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL) $(PHOTON_MINIMAL_DEPLIST)

+minimal-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL)

 	@echo "Building Photon Minimal ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

         $(PHOTON_INSTALLER) -i $(PHOTON_STAGE)/photon-minimal.iso \

@@ -114,6 +103,7 @@ minimal-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL) $(PHOTON_MINIMAL_D

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

                 -p $(PHOTON_DATA_DIR)/build_install_options_minimal.json \

+				-s $(PHOTON_SPECS_DIR) \

                 -f > \

                 $(PHOTON_LOGS_DIR)/installer.log 2>&1

@@ -125,6 +115,7 @@ ostree-host-iso: check $(PHOTON_STAGE) ostree-repo

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

                 -p $(PHOTON_DATA_DIR)/build_install_options_ostreehost.json \

+				-s $(PHOTON_SPECS_DIR) \

                 -f > \

                 $(PHOTON_LOGS_DIR)/installer.log 2>&1

@@ -136,18 +127,10 @@ live-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL) minimal-iso

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

                 -p $(PHOTON_GENERATED_DATA_DIR)/build_install_options_livecd.json \

+				-s $(PHOTON_SPECS_DIR) \

                 -f > \

                 $(PHOTON_LOGS_DIR)/installer.log 2>&1                

-$(PHOTON_MINIMAL_DEPLIST): $(PREPARE_OUT_DATADIR)

-	@echo "Generating the install time dependency list for minimal installation"	

-	@cd $(PHOTON_SPECDEPS_DIR) && \

-		$(PHOTON_SPECDEPS) \

-		-s $(PHOTON_SPECS_DIR) \

-		-t $(PHOTON_STAGE) \

-		--input-type=json --file packages_minimal.json -d json -a $(PHOTON_DATA_DIR)

-	@echo "generated the json file with all dependencies for minimal installation"

-

 packages-minimal: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

 	@echo "Building all RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

@@ -163,7 +146,7 @@ packages-minimal: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

 		-d $(PHOTON_DIST_TAG) \

                 -t ${THREADS}

-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES) ostree-repo $(PHOTON_FULL_DEPLIST)

+iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES) ostree-repo

 	@echo "Building Photon FUll ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

         sudo $(PHOTON_INSTALLER) -i $(PHOTON_STAGE)/photon.iso \

@@ -171,18 +154,10 @@ iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES) ostree-repo $(PHOTON_FULL_DEPLIST)

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

                 -p $(PHOTON_DATA_DIR)/build_install_options_all.json \

+				-s $(PHOTON_SPECS_DIR) \

                 -f > \

                 $(PHOTON_LOGS_DIR)/installer.log 2>&1

-$(PHOTON_FULL_DEPLIST): $(PHOTON_MINIMAL_DEPLIST) 

-	@echo "Generating the install time dependency list for full installation"

-	@cd $(PHOTON_SPECDEPS_DIR) && \

-		$(PHOTON_SPECDEPS) \

-		-s $(PHOTON_SPECS_DIR) \

-		-t $(PHOTON_STAGE) \

-		--input-type=json --file packages_full.json -d json -a $(PHOTON_DATA_DIR)

-	@echo "generated the json file with all dependencies for full installation"

-

 deptree-full:

 	@cd $(PHOTON_SPECDEPS_DIR) && \

 		$(PHOTON_SPECDEPS) \

@@ -275,7 +250,7 @@ prepare-out-datadir:

 	$(MKDIR) -p $(PHOTON_GENERATED_DATA_DIR)

 	$(CP) $(PHOTON_DATA_DIR)/*.json $(PHOTON_GENERATED_DATA_DIR)

-$(PHOTON_STAGE):

+$(PHOTON_STAGE): $(PREPARE_OUT_DATADIR)

 	@echo "Creating staging folder..."

 	$(MKDIR) -p $(PHOTON_STAGE)

 	@echo "Creating chroot path..."

@@ -11,6 +11,9 @@ import random

 import string

 import subprocess

 import sys

+sys.path.append('../support/SpecDeps/')

+from SpecData import SerializableSpecObject

+from SpecData import SerializedSpecObjects

 import os

 from jsonwrapper import JsonWrapper

 from packageselector import PackageSelector

@@ -128,6 +131,7 @@ if __name__ == '__main__':

     parser.add_option("-f", "--force", action="store_true", dest="force", default=False)

     parser.add_option("-p", "--package-list-file", dest="package_list_file", default="../common/data/build_install_options_all.json")

     parser.add_option("-m", "--stage-path", dest="stage_path", default="../stage")

+    parser.add_option("-s", "--spec-path", dest="spec_path", default="../SPECS")

     (options,  args) = parser.parse_args()

     if options.iso_path:

@@ -177,6 +181,12 @@ if __name__ == '__main__':

     options_sorted = option_list_json.items()

     base_path = os.path.dirname(options.package_list_file)

+    # Generate the package dependencies based on package_list_file

+    specDependencyGenerator = SerializedSpecObjects(base_path, options.stage_path)

+    for install_option in options_sorted:

+        if install_option[1]["visible"] == True:

+		    specDependencyGenerator.readSpecsAndConvertToSerializableObjects(options.spec_path, "json", install_option[1]["file"], "json")

+

     packages = []

     additional_files_to_copy_from_stage_to_iso = []

     if config['iso_system'] == True:

@@ -63,6 +63,7 @@ fi

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

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

 cat $VMDK_CONFIG_SAFE_FILE

+cp $SRC_ROOT/support/SpecDeps/*.py $INSTALLER_PATH/installer

 ./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

 rm $VMDK_CONFIG_SAFE_FILE