@@ -72,9 +72,15 @@ PUBLISH_BUILD_DEPENDENCIES :=

 endif

 ifdef WEIGHTS

-PACKAGE_WEIGHTS_PATH = --package-weights-path $(WEIGHTS)

+PACKAGE_WEIGHTS = --package-weights-path $(SRCROOT)/common/data/packageWeights.json

 else

-PACKAGE_WEIGHTS_PATH =

+PACKAGE_WEIGHTS =

+endif

+

+ifdef PKG_BUILD_OPTIONS

+PACKAGE_BUILD_OPTIONS = --pkg-build-option-file $(PKG_BUILD_OPTIONS)

+else

+PACKAGE_BUILD_OPTIONS =

 endif

 TOOLS_BIN := $(SRCROOT)/tools/bin

@@ -115,192 +121,192 @@ packages-minimal: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SO

 	@echo "Building all minimal RPMS..."

 	@echo ""

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_PACKAGE_BUILDER) \

-                --spec-path $(PHOTON_SPECS_DIR) \

-                --rpm-path $(PHOTON_RPMS_DIR) \

-                --source-path $(PHOTON_SRCS_DIR) \

-                --build-root-path $(PHOTON_CHROOT_PATH) \

-                --packages-json-input $(PHOTON_DATA_DIR)/packages_minimal.json \

-                --log-path $(PHOTON_LOGS_DIR) \

-                --log-level $(LOGLEVEL) \

-                --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

-                --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

-                --dist-tag $(PHOTON_DIST_TAG) \

-                --build-number $(PHOTON_BUILD_NUMBER) \

-                --release-version $(PHOTON_RELEASE_VERSION) \

-                $(PHOTON_RPMCHECK_FLAGS) \

+	$(PHOTON_PACKAGE_BUILDER) \

+		--spec-path $(PHOTON_SPECS_DIR) \

+		--rpm-path $(PHOTON_RPMS_DIR) \

+		--source-path $(PHOTON_SRCS_DIR) \

+		--build-root-path $(PHOTON_CHROOT_PATH) \

+		--packages-json-input $(PHOTON_DATA_DIR)/packages_minimal.json \

+		--log-path $(PHOTON_LOGS_DIR) \

+		--log-level $(LOGLEVEL) \

+		--publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

+		--pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

+		--dist-tag $(PHOTON_DIST_TAG) \

+		--build-number $(PHOTON_BUILD_NUMBER) \

+		--release-version $(PHOTON_RELEASE_VERSION) \

+		$(PHOTON_RPMCHECK_FLAGS) \

 		$(PUBLISH_BUILD_DEPENDENCIES) \

-		$(PACKAGE_WEIGHTS_PATH) \

-                --threads ${THREADS}

+		$(PACKAGE_WEIGHTS) \

+		--threads ${THREADS}

 packages: check-docker-py check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) check-spec-files generate-dep-lists

 	@echo "Building all RPMS..."

 	@echo ""

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_PACKAGE_BUILDER) \

-                --build-type $(PHOTON_BUILD_TYPE) \

-                --spec-path $(PHOTON_SPECS_DIR) \

-                --rpm-path $(PHOTON_RPMS_DIR) \

-                --source-rpm-path $(PHOTON_SRPMS_DIR) \

-                --source-path $(PHOTON_SRCS_DIR) \

-                --build-root-path $(PHOTON_CHROOT_PATH) \

-                --log-path $(PHOTON_LOGS_DIR) \

-                --log-level $(LOGLEVEL) \

-                --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

-                --publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \

-                --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

-                --dist-tag $(PHOTON_DIST_TAG) \

-                --build-number $(PHOTON_BUILD_NUMBER) \

-                --release-version $(PHOTON_RELEASE_VERSION) \

-                --pkginfo-file $(PHOTON_STAGE)/pkg_info.json \

-                --pkg-build-option-file $(PHOTON_DATA_DIR)/pkg_build_options.json \

-                $(PHOTON_RPMCHECK_FLAGS) \

-		        $(PHOTON_KAT_BUILD_FLAGS) \

-		        $(PUBLISH_BUILD_DEPENDENCIES) \

-		        $(PACKAGE_WEIGHTS_PATH) \

-                --threads ${THREADS}

+	$(PHOTON_PACKAGE_BUILDER) \

+		--build-type $(PHOTON_BUILD_TYPE) \

+		--spec-path $(PHOTON_SPECS_DIR) \

+		--rpm-path $(PHOTON_RPMS_DIR) \

+		--source-rpm-path $(PHOTON_SRPMS_DIR) \

+		--source-path $(PHOTON_SRCS_DIR) \

+		--build-root-path $(PHOTON_CHROOT_PATH) \

+		--log-path $(PHOTON_LOGS_DIR) \

+		--log-level $(LOGLEVEL) \

+		--publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

+		--publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \

+		--pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

+		--dist-tag $(PHOTON_DIST_TAG) \

+		--build-number $(PHOTON_BUILD_NUMBER) \

+		--release-version $(PHOTON_RELEASE_VERSION) \

+		--pkginfo-file $(PHOTON_STAGE)/pkg_info.json \

+		$(PACKAGE_BUILD_OPTIONS) \

+		$(PHOTON_RPMCHECK_FLAGS) \

+		$(PHOTON_KAT_BUILD_FLAGS) \

+		$(PUBLISH_BUILD_DEPENDENCIES) \

+		$(PACKAGE_WEIGHTS) \

+		--threads ${THREADS}

 packages-docker: check-docker-py check-docker-service check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

 	@echo "Building all RPMS..."

 	@echo ""

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_PACKAGE_BUILDER) \

-                --build-type $(PHOTON_BUILD_TYPE) \

-                --spec-path $(PHOTON_SPECS_DIR) \

-                --rpm-path $(PHOTON_RPMS_DIR) \

-                --source-rpm-path $(PHOTON_SRPMS_DIR) \

-                --source-path $(PHOTON_SRCS_DIR) \

-                --build-root-path $(PHOTON_CHROOT_PATH) \

-                --log-path $(PHOTON_LOGS_DIR) \

-                --log-level $(LOGLEVEL) \

-                --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

-                --publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \

-                --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

-                --dist-tag $(PHOTON_DIST_TAG) \

-                --build-number $(PHOTON_BUILD_NUMBER) \

-                --release-version $(PHOTON_RELEASE_VERSION) \

-                --pkginfo-file $(PHOTON_STAGE)/pkg_info.json \

-                --pkg-build-option-file $(PHOTON_DATA_DIR)/pkg_build_options.json \

-                $(PHOTON_RPMCHECK_FLAGS) \

-		        $(PUBLISH_BUILD_DEPENDENCIES) \

-		        $(PACKAGE_WEIGHTS_PATH) \

-                --threads ${THREADS}

+	$(PHOTON_PACKAGE_BUILDER) \

+		--build-type $(PHOTON_BUILD_TYPE) \

+		--spec-path $(PHOTON_SPECS_DIR) \

+		--rpm-path $(PHOTON_RPMS_DIR) \

+		--source-rpm-path $(PHOTON_SRPMS_DIR) \

+		--source-path $(PHOTON_SRCS_DIR) \

+		--build-root-path $(PHOTON_CHROOT_PATH) \

+		--log-path $(PHOTON_LOGS_DIR) \

+		--log-level $(LOGLEVEL) \

+		--publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

+		--publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \

+		--pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

+		--dist-tag $(PHOTON_DIST_TAG) \

+		--build-number $(PHOTON_BUILD_NUMBER) \

+		--release-version $(PHOTON_RELEASE_VERSION) \

+		--pkginfo-file $(PHOTON_STAGE)/pkg_info.json \

+		$(PACKAGE_BUILD_OPTIONS) \

+		$(PHOTON_RPMCHECK_FLAGS) \

+		$(PUBLISH_BUILD_DEPENDENCIES) \

+		$(PACKAGE_WEIGHTS) \

+		--threads ${THREADS}

 updated-packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

 	@echo "Building only updated RPMS..."

 	@echo ""

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_PACKAGE_BUILDER) \

-                --spec-path $(PHOTON_SPECS_DIR) \

-                --rpm-path $(PHOTON_UPDATED_RPMS_DIR) \

-                --source-path $(PHOTON_SRCS_DIR) \

-                --build-root-path $(PHOTON_CHROOT_PATH) \

-                --log-path $(PHOTON_LOGS_DIR) \

-                --log-level $(LOGLEVEL) \

-                --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

-                --publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \

-                --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

-                --dist-tag $(PHOTON_DIST_TAG) \

-                --build-number $(PHOTON_BUILD_NUMBER) \

-                --release-version $(PHOTON_RELEASE_VERSION) \

-                --input-RPMS-path $(PHOTON_INPUT_RPMS_DIR) \

-                $(PHOTON_KAT_BUILD_FLAGS) \

-                $(PHOTON_RPMCHECK_FLAGS) \

-		        $(PUBLISH_BUILD_DEPENDENCIES) \

-		        $(PACKAGE_WEIGHTS_PATH) \

-                --threads ${THREADS}

+	$(PHOTON_PACKAGE_BUILDER) \

+		--spec-path $(PHOTON_SPECS_DIR) \

+		--rpm-path $(PHOTON_UPDATED_RPMS_DIR) \

+		--source-path $(PHOTON_SRCS_DIR) \

+		--build-root-path $(PHOTON_CHROOT_PATH) \

+		--log-path $(PHOTON_LOGS_DIR) \

+		--log-level $(LOGLEVEL) \

+		--publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

+		--publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \

+		--pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

+		--dist-tag $(PHOTON_DIST_TAG) \

+		--build-number $(PHOTON_BUILD_NUMBER) \

+		--release-version $(PHOTON_RELEASE_VERSION) \

+		--input-RPMS-path $(PHOTON_INPUT_RPMS_DIR) \

+		$(PHOTON_KAT_BUILD_FLAGS) \

+		$(PHOTON_RPMCHECK_FLAGS) \

+		$(PUBLISH_BUILD_DEPENDENCIES) \

+		$(PACKAGE_WEIGHTS) \

+		--threads ${THREADS}

 tool-chain-stage1: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

 	@echo "Building all RPMS..."

 	@echo ""

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_PACKAGE_BUILDER) \

-                --spec-path $(PHOTON_SPECS_DIR) \

-                --rpm-path $(PHOTON_RPMS_DIR) \

-                --source-rpm-path $(PHOTON_SRPMS_DIR) \

-                --source-path $(PHOTON_SRCS_DIR) \

-                --build-root-path $(PHOTON_CHROOT_PATH) \

-                --log-path $(PHOTON_LOGS_DIR) \

-                --log-level $(LOGLEVEL) \

-                --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

-                --threads ${THREADS} \

-                --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

-                --dist-tag $(PHOTON_DIST_TAG) \

-                --build-number $(PHOTON_BUILD_NUMBER) \

-                --release-version $(PHOTON_RELEASE_VERSION) \

-                $(PHOTON_RPMCHECK_FLAGS) \

-                --tool-chain-stage stage1

+	$(PHOTON_PACKAGE_BUILDER) \

+		--spec-path $(PHOTON_SPECS_DIR) \

+		--rpm-path $(PHOTON_RPMS_DIR) \

+		--source-rpm-path $(PHOTON_SRPMS_DIR) \

+		--source-path $(PHOTON_SRCS_DIR) \

+		--build-root-path $(PHOTON_CHROOT_PATH) \

+		--log-path $(PHOTON_LOGS_DIR) \

+		--log-level $(LOGLEVEL) \

+		--publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

+		--threads ${THREADS} \

+		--pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

+		--dist-tag $(PHOTON_DIST_TAG) \

+		--build-number $(PHOTON_BUILD_NUMBER) \

+		--release-version $(PHOTON_RELEASE_VERSION) \

+		$(PHOTON_RPMCHECK_FLAGS) \

+		--tool-chain-stage stage1

 tool-chain-stage2: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists

 	@echo "Building all RPMS..."

 	@echo ""

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_PACKAGE_BUILDER) \

-                --spec-path $(PHOTON_SPECS_DIR) \

-                --rpm-path $(PHOTON_RPMS_DIR) \

-                --source-rpm-path $(PHOTON_SRPMS_DIR) \

-                --source-path $(PHOTON_SRCS_DIR) \

-                --build-root-path $(PHOTON_CHROOT_PATH) \

-                --log-path $(PHOTON_LOGS_DIR) \

-                --log-level $(LOGLEVEL) \

-                --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

-                --threads ${THREADS} \

-                --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

-                --dist-tag $(PHOTON_DIST_TAG) \

-                --build-number $(PHOTON_BUILD_NUMBER) \

-                --release-version $(PHOTON_RELEASE_VERSION) \

-                $(PHOTON_RPMCHECK_FLAGS) \

-                --tool-chain-stage stage2

+	$(PHOTON_PACKAGE_BUILDER) \

+		--spec-path $(PHOTON_SPECS_DIR) \

+		--rpm-path $(PHOTON_RPMS_DIR) \

+		--source-rpm-path $(PHOTON_SRPMS_DIR) \

+		--source-path $(PHOTON_SRCS_DIR) \

+		--build-root-path $(PHOTON_CHROOT_PATH) \

+		--log-path $(PHOTON_LOGS_DIR) \

+		--log-level $(LOGLEVEL) \

+		--publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

+		--threads ${THREADS} \

+		--pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

+		--dist-tag $(PHOTON_DIST_TAG) \

+		--build-number $(PHOTON_BUILD_NUMBER) \

+		--release-version $(PHOTON_RELEASE_VERSION) \

+		$(PHOTON_RPMCHECK_FLAGS) \

+		--tool-chain-stage stage2

 %: check-tools $(PHOTON_PUBLISH_RPMS) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_SOURCES) $(CONTAIN) check-spec-files $(eval PKG_NAME = $@)

 	$(eval PKG_NAME = $@)

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_PACKAGE_BUILDER) --install-package $(PKG_NAME)\

-                  --build-type $(PHOTON_BUILD_TYPE) \

-                  --build-root-path $(PHOTON_CHROOT_PATH) \

-                  --spec-path $(PHOTON_SPECS_DIR) \

-                  --rpm-path $(PHOTON_RPMS_DIR) \

-                  --source-rpm-path $(PHOTON_SRPMS_DIR) \

-                  --source-path $(PHOTON_SRCS_DIR) \

-                  --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

-                  --publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \

-                  --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

-                  --log-level $(LOGLEVEL) \

-                  --dist-tag $(PHOTON_DIST_TAG) \

-                  --build-number $(PHOTON_BUILD_NUMBER) \

-                  --release-version $(PHOTON_RELEASE_VERSION) \

-                  --pkg-build-option-file $(PHOTON_DATA_DIR)/pkg_build_options.json \

-                  $(PHOTON_RPMCHECK_FLAGS) \

-                  $(PHOTON_KAT_BUILD_FLAGS) \

-                  --log-path $(PHOTON_LOGS_DIR) \

-                  --threads ${THREADS}

+	$(PHOTON_PACKAGE_BUILDER) --install-package $(PKG_NAME)\

+		--build-type $(PHOTON_BUILD_TYPE) \

+		--build-root-path $(PHOTON_CHROOT_PATH) \

+		--spec-path $(PHOTON_SPECS_DIR) \

+		--rpm-path $(PHOTON_RPMS_DIR) \

+		--source-rpm-path $(PHOTON_SRPMS_DIR) \

+		--source-path $(PHOTON_SRCS_DIR) \

+		--publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

+		--publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \

+		--pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

+		--log-level $(LOGLEVEL) \

+		--dist-tag $(PHOTON_DIST_TAG) \

+		--build-number $(PHOTON_BUILD_NUMBER) \

+		--release-version $(PHOTON_RELEASE_VERSION) \

+		$(PACKAGE_BUILD_OPTIONS) \

+		$(PHOTON_RPMCHECK_FLAGS) \

+		$(PHOTON_KAT_BUILD_FLAGS) \

+		--log-path $(PHOTON_LOGS_DIR) \

+		--threads ${THREADS}

 check: packages

-    ifeq ($(RPMCHECK),enable_stop_on_error)

-	    $(eval rpmcheck_stop_on_error = -q)

-    endif

+	ifeq ($(RPMCHECK),enable_stop_on_error)

+		$(eval rpmcheck_stop_on_error = -q)

+	endif

 	@echo "Testing all RPMS ..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_PACKAGE_BUILDER) \

-                --build-type $(PHOTON_BUILD_TYPE) \

-                --spec-path $(PHOTON_SPECS_DIR) \

-                --rpm-path $(PHOTON_RPMS_DIR) \

-                --source-rpm-path $(PHOTON_SRPMS_DIR) \

-                --source-path $(PHOTON_SRCS_DIR) \

-                --build-root-path $(PHOTON_CHROOT_PATH) \

-                --log-path $(PHOTON_LOGS_DIR) \

-                --log-level $(LOGLEVEL) \

-                --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

-                --publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \

-                --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

-                --dist-tag $(PHOTON_DIST_TAG) \

-                --build-number $(PHOTON_BUILD_NUMBER) \

-                --release-version $(PHOTON_RELEASE_VERSION) \

-                --pkginfo-file $(PHOTON_STAGE)/pkg_info.json \

-                --pkg-build-option-file $(PHOTON_DATA_DIR)/pkg_build_options.json \

-                --enable-rpmcheck \

-                $(rpmcheck_stop_on_error) \

-                --threads ${THREADS}

+	$(PHOTON_PACKAGE_BUILDER) \

+		--build-type $(PHOTON_BUILD_TYPE) \

+		--spec-path $(PHOTON_SPECS_DIR) \

+		--rpm-path $(PHOTON_RPMS_DIR) \

+		--source-rpm-path $(PHOTON_SRPMS_DIR) \

+		--source-path $(PHOTON_SRCS_DIR) \

+		--build-root-path $(PHOTON_CHROOT_PATH) \

+		--log-path $(PHOTON_LOGS_DIR) \

+		--log-level $(LOGLEVEL) \

+		--publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

+		--publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \

+		--pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

+		--dist-tag $(PHOTON_DIST_TAG) \

+		--build-number $(PHOTON_BUILD_NUMBER) \

+		--release-version $(PHOTON_RELEASE_VERSION) \

+		--pkginfo-file $(PHOTON_STAGE)/pkg_info.json \

+		$(PACKAGE_BUILD_OPTIONS) \

+		--enable-rpmcheck \

+		$(rpmcheck_stop_on_error) \

+		--threads ${THREADS}

 #-------------------------------------------------------------------------------

@@ -311,37 +317,37 @@ all: iso photon-docker-image k8s-docker-images cloud-image-all src-iso

 iso: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES)

 	@echo "Building Photon Full ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

-        sudo $(PHOTON_INSTALLER) \

-                --iso-path $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso \

-                --debug-iso-path $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).debug.iso \

-                --working-directory $(PHOTON_STAGE)/photon_iso \

-                --log-path $(PHOTON_STAGE)/LOGS \

-                --log-level $(LOGLEVEL) \

-                --rpm-path $(PHOTON_STAGE)/RPMS \

-                --srpm-path $(PHOTON_STAGE)/SRPMS \

-                --package-list-file $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \

-                --output-data-path $(PHOTON_STAGE)/common/data \

-                --pkg-to-rpm-map-file $(PHOTON_STAGE)/pkg_info.json \

-                --json-data-path $(PHOTON_DATA_DIR) \

-                --force > \

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

+	sudo $(PHOTON_INSTALLER) \

+		--iso-path $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso \

+		--debug-iso-path $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).debug.iso \

+		--working-directory $(PHOTON_STAGE)/photon_iso \

+		--log-path $(PHOTON_STAGE)/LOGS \

+		--log-level $(LOGLEVEL) \

+		--rpm-path $(PHOTON_STAGE)/RPMS \

+		--srpm-path $(PHOTON_STAGE)/SRPMS \

+		--package-list-file $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \

+		--output-data-path $(PHOTON_STAGE)/common/data \

+		--pkg-to-rpm-map-file $(PHOTON_STAGE)/pkg_info.json \

+		--json-data-path $(PHOTON_DATA_DIR) \

+		--force > \

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

 src-iso: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES)

 	@echo "Building Photon Full Source ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

-        sudo $(PHOTON_INSTALLER) \

-                --src-iso-path $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).src.iso \

-                --working-directory $(PHOTON_STAGE)/photon_iso \

-                --log-path $(PHOTON_STAGE)/LOGS \

-                --log-level $(LOGLEVEL) \

-                --rpm-path $(PHOTON_STAGE)/RPMS \

-                --srpm-path $(PHOTON_STAGE)/SRPMS \

-                --package-list-file $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \

-                --output-data-path $(PHOTON_STAGE)/common/data \

-                --pkg-to-rpm-map-file $(PHOTON_STAGE)/pkg_info.json \

-                --json-data-path $(PHOTON_DATA_DIR) \

-                --force > \

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

+	sudo $(PHOTON_INSTALLER) \

+		--src-iso-path $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).src.iso \

+		--working-directory $(PHOTON_STAGE)/photon_iso \

+		--log-path $(PHOTON_STAGE)/LOGS \

+		--log-level $(LOGLEVEL) \

+		--rpm-path $(PHOTON_STAGE)/RPMS \

+		--srpm-path $(PHOTON_STAGE)/SRPMS \

+		--package-list-file $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \

+		--output-data-path $(PHOTON_STAGE)/common/data \

+		--pkg-to-rpm-map-file $(PHOTON_STAGE)/pkg_info.json \

+		--json-data-path $(PHOTON_DATA_DIR) \

+		--force > \

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

 cloud-image: check-kpartx $(PHOTON_STAGE) $(VIXDISKUTIL) $(IMGCONVERTER) $(PHOTON_PACKAGES)

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

@@ -392,9 +398,9 @@ k8s-docker-images: start-docker photon-docker-image

 packages-cached:

 	@echo "Using cached RPMS..."

 	@$(RM) -f $(PHOTON_RPMS_DIR_NOARCH)/* && \

-     $(RM) -f $(PHOTON_RPMS_DIR_ARCH)/* && \

-     $(CP) -f $(PHOTON_CACHE_PATH)/RPMS/noarch/* $(PHOTON_RPMS_DIR_NOARCH)/ && \

-     $(CP) -f $(PHOTON_CACHE_PATH)/RPMS/$(ARCH)/* $(PHOTON_RPMS_DIR_ARCH)/

+	$(RM) -f $(PHOTON_RPMS_DIR_ARCH)/* && \

+	$(CP) -f $(PHOTON_CACHE_PATH)/RPMS/noarch/* $(PHOTON_RPMS_DIR_NOARCH)/ && \

+	$(CP) -f $(PHOTON_CACHE_PATH)/RPMS/$(ARCH)/* $(PHOTON_RPMS_DIR_ARCH)/

 sources:

 	@$(MKDIR) -p $(PHOTON_SRCS_DIR)

@@ -417,13 +423,13 @@ publish-rpms-cached:

 	@echo "Using cached toolchain rpms..."

 	@$(MKDIR) -p $(PHOTON_PUBLISH_RPMS_DIR)/{$(ARCH),noarch} && \

 	cd $(PHOTON_PULL_PUBLISH_RPMS_DIR) && \

-        $(PHOTON_PULL_PUBLISH_RPMS) $(PHOTON_PUBLISH_RPMS_DIR) $(PHOTON_PUBLISH_RPMS_PATH)

+	$(PHOTON_PULL_PUBLISH_RPMS) $(PHOTON_PUBLISH_RPMS_DIR) $(PHOTON_PUBLISH_RPMS_PATH)

 publish-x-rpms-cached:

 	@echo "Using cached X toolchain rpms..."

 	@$(MKDIR) -p $(PHOTON_PUBLISH_XRPMS_DIR)/{$(ARCH),noarch} && \

 	cd $(PHOTON_PULL_PUBLISH_RPMS_DIR) && \

-        $(PHOTON_PULL_PUBLISH_X_RPMS) $(PHOTON_PUBLISH_XRPMS_DIR) $(PHOTON_PUBLISH_XRPMS_PATH)

+	$(PHOTON_PULL_PUBLISH_X_RPMS) $(PHOTON_PUBLISH_XRPMS_DIR) $(PHOTON_PUBLISH_XRPMS_PATH)

 $(PHOTON_STAGE):

 	@echo "Creating staging folder..."

@@ -543,47 +549,47 @@ generate-dep-lists:

 pkgtree:

 	@cd $(PHOTON_SPECDEPS_DIR) && \

 		$(PHOTON_SPECDEPS) \

-        --spec-path $(PHOTON_SPECS_DIR) \

-        --log-level $(LOGLEVEL) \

-        --input-type pkg \

-        --pkg $(pkg)

+	--spec-path $(PHOTON_SPECS_DIR) \

+	--log-level $(LOGLEVEL) \

+	--input-type pkg \

+	--pkg $(pkg)

 imgtree:

 	@cd $(PHOTON_SPECDEPS_DIR) && \

 		$(PHOTON_SPECDEPS) \

-        --spec-path $(PHOTON_SPECS_DIR) \

-        --log-level $(LOGLEVEL) \

-        --input-type json \

-        --file $(PHOTON_DATA_DIR)/build_install_options_$(img).json

+	--spec-path $(PHOTON_SPECS_DIR) \

+	--log-level $(LOGLEVEL) \

+	--input-type json \

+	--file $(PHOTON_DATA_DIR)/build_install_options_$(img).json

 who-needs:

 	@cd $(PHOTON_SPECDEPS_DIR) && \

 		$(PHOTON_SPECDEPS) \

-        --spec-path $(PHOTON_SPECS_DIR) \

-        --log-level $(LOGLEVEL) \

-        --input-type who-needs \

-        --pkg $(pkg)

+	--spec-path $(PHOTON_SPECS_DIR) \

+	--log-level $(LOGLEVEL) \

+	--input-type who-needs \

+	--pkg $(pkg)

 print-upward-deps:

 	@cd $(PHOTON_SPECDEPS_DIR) && \

 		$(PHOTON_SPECDEPS) \

-        --spec-path $(PHOTON_SPECS_DIR) \

-        --input-type print-upward-deps \

-        --pkg $(pkg)

+	--spec-path $(PHOTON_SPECS_DIR) \

+	--input-type print-upward-deps \

+	--pkg $(pkg)

 #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 generate-yaml-files: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES)

 	@echo "Generating yaml files for packages ..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

-        $(PHOTON_GENERATE_OSS_FILES) --generate-yaml-files \

-                              --spec-path $(PHOTON_SPECS_DIR) \

-                              --source-rpm-path $(PHOTON_SRPMS_DIR) \

-                              --log-path $(PHOTON_LOGS_DIR) \

-                              --dist-tag $(PHOTON_DIST_TAG) \

-                              --log-level $(LOGLEVEL) \

-                              --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

-                              --pkg-blacklist-file $(PHOTON_PKG_BLACKLIST_FILE)

+	$(PHOTON_GENERATE_OSS_FILES) --generate-yaml-files \

+		--spec-path $(PHOTON_SPECS_DIR) \

+		--source-rpm-path $(PHOTON_SRPMS_DIR) \

+		--log-path $(PHOTON_LOGS_DIR) \

+		--dist-tag $(PHOTON_DIST_TAG) \

+		--log-level $(LOGLEVEL) \

+		--pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

+		--pkg-blacklist-file $(PHOTON_PKG_BLACKLIST_FILE)

 # Input args: BASE_COMMIT= (optional)

 #

@@ -597,5 +603,5 @@ generate-yaml-files: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES)

 # - local changes (if no commits specified)

 clean-stage-for-incremental-build:

 	@test -n "$$(git diff --name-only $(BASE_COMMIT) @ | grep SPECS)" && $(PHOTON_SPECDEPS) --spec-path $(PHOTON_SPECS_DIR) -i remove-upward-deps -p $$(echo `git diff --name-only $(BASE_COMMIT) @ | grep .spec | xargs -n1 basename 2>/dev/null` | tr ' ' :) ||:

-	@test -n "$$(git diff --name-only $(BASE_COMMIT) @ | grep '^support')" && $(RM) -rf $(PHOTON_RPMS_DIR) ||:

+	@test -n "$$(git diff --name-only @~1 @ | grep '^support')" && { echo "Remove all staged RPMs"; $(RM) -rf $(PHOTON_RPMS_DIR); } ||:

@@ -1,7 +1,7 @@

 Summary:        Management tools and libraries relating to cryptography

 Name:           openssl

 Version:        1.0.2p

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        OpenSSL

 URL:            http://www.openssl.org

 Group:          System Environment/Security

@@ -10,6 +10,10 @@ Distribution:   Photon

 Source0:        http://www.openssl.org/source/%{name}-%{version}.tar.gz

 %define sha1    openssl=f34b5322e92415755c7d58bf5d0d5cf37666382c

 Source1:        rehash_ca_certificates.sh

+%if 0%{?with_fips:1}

+Source100:      openssl-fips-2.0.9-lin64.tar.gz

+%define sha1    openssl-fips=e834d3678fb190f9483f48f037fb17041abba6a1

+%endif

 Patch0:         c_rehash.patch

 Patch1:         openssl-ipv6apps.patch

 Patch2:         openssl-init-conslidate.patch

@@ -21,7 +25,7 @@ Requires:       bash glibc libgcc

 %description

 The OpenSSL package contains management tools and libraries relating

-to cryptography. These are useful for providing cryptography 

+to cryptography. These are useful for providing cryptography

 functions to other packages, such as OpenSSH, email applications and

 web browsers (for accessing HTTPS sites).

@@ -59,19 +63,26 @@ Perl scripts that convert certificates and keys to various formats.

 %patch3 -p1

 %build

+%if 0%{?with_fips:1}

+tar xf %{SOURCE100} --no-same-owner -C ..

+# Do not package it to src.rpm

+:> %{SOURCE100}

+%endif

 export CFLAGS="%{optflags}"

 ./config \

-    --prefix=%{_prefix} \

+    --prefix=/usr \

     --libdir=lib \

     --openssldir=/%{_sysconfdir}/ssl \

     shared \

     zlib-dynamic \

-    %{?_with_fips} \

+%if 0%{?with_fips:1}

+    fips --with-fipsdir=%{_builddir}/openssl-fips-2.0.9 \

+%endif

     -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}"

 # does not support -j yet

 make

 %install

-[ %{buildroot} != "/"] && rm -rf %{buildroot}/*

+[ %{buildroot} != "/" ] && rm -rf %{buildroot}/*

 make INSTALL_PREFIX=%{buildroot} MANDIR=/usr/share/man MANSUFFIX=ssl install

 install -p -m 755 -D %{SOURCE1} %{buildroot}%{_bindir}/

 ln -sf libssl.so.1.0.0 %{buildroot}%{_libdir}/libssl.so.1.0.2

@@ -118,6 +129,8 @@ rm -rf %{buildroot}/*

 /%{_bindir}/rehash_ca_certificates.sh

 %changelog

+*   Wed Oct 17 2018 Alexey Makhalov <amakhalov@vmware.com> 1.0.2p-2

+-   Move fips logic to spec file

 *   Fri Aug 17 2018 Him Kalyan Bordoloi <bordoloih@vmware.com> 1.0.2p-1

 -   Upgrade to 1.0.2p

 *   Wed Mar 21 2018 Dheeraj Shetty <dheerajs@vmware.com> 1.0.2n-2

@@ -1,12 +1,16 @@

 Summary:        Perl extension for using OpenSSL

 Name:           perl-Net-SSLeay

 Version:        1.85

-Release:        1%{?dist}

+Release:        2%{?dist}

 License:        Perl Artistic License 2.0

 Group:          Development/Libraries

 URL:            http://search.cpan.org/~mikem/Net-SSLeay-%{version}/

 Source:         https://cpan.metacpan.org/authors/id/M/MI/MIKEM/Net-SSLeay-%{version}.tar.gz

 %define sha1 Net-SSLeay=5f1c7b6ccac81efd5b78b1e076c694f96ca5c439

+%if 0%{?with_fips:1}

+Source100:      openssl-fips-2.0.9-lin64.tar.gz

+%define sha1    openssl-fips=e834d3678fb190f9483f48f037fb17041abba6a1

+%endif

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Requires:       perl >= 5.28.0

@@ -27,6 +31,12 @@ Net::SSLeay module basically comprise of:

 %setup -q -n Net-SSLeay-%{version}

 %build

+%if 0%{?with_fips:1}

+tar xf %{SOURCE100} --no-same-owner -C ..

+# Do not package it to src.rpm

+:> %{SOURCE100}

+cp ../openssl-fips-2.0.9/include/openssl/fips.h /usr/include/openssl/

+%endif

 env PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"

 make %{?_smp_mflags}

@@ -44,6 +54,8 @@ make test

 %{_mandir}/man?/*

 %changelog

+*   Wed Oct 17 2018 Alexey Makhalov <amakhalov@vmware.com> 1.85-2

+-   Move fips logic to spec file

 *   Fri Sep 21 2018 Dweep Advani <dadvani@vmware.com> 1.85-1

 -   Update to version 1.85

 *   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 1.81-2

new file mode 100644

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

+{

+  "ceph": 83.7,

+  "mesos": 75,

+  "linux": 41.2,

+  "linux-secure": 32,

+  "openjdk8": 21.55,

+  "kubernetes": 21.3,

+  "llvm": 20.267,

+  "linux-esx": 16.73,

+  "falco": 13.85,

+  "guile": 11.52,

+  "clang": 11.3

+}

@@ -1,9 +1,6 @@

 {

     "dummy_package": { 

-        "files": [

-                     {"src": "path_to_file1_to_be_copied", "dst": "file1_destination"}, 

-                     {"src": "path_to_file2_to_be_copied", "dst": "file2_destination"}

-        ], 

+        "pullsources": ["url1", "url2"],

         "macros": ["macro1 value1","macro2 value2"]

     }

 }

@@ -81,7 +81,7 @@ def main():

         constants.setSourceRpmPath(options.sourceRpmPath)

         constants.setLogPath(options.logPath)

         constants.setLogLevel(options.logLevel)

-        constants.setPullSourcesConfig(options.pullsourcesConfig)

+        constants.setPullSourcesURL(get_baseurl(options.pullsourcesConfig))

         constants.initialize()

         # parse SPECS folder

@@ -102,6 +102,11 @@ def main():

     sys.exit(0)

+def get_baseurl(self, conf_file):

+    with open(conf_file) as jsonFile:

+        config = json.load(jsonFile)

+    return config['baseurl']

+

 def buildPackagesList(csvFilename):

     with open(csvFilename, "w") as csvFile:

         csvFile.write("Package,Version,License,URL,Sources,Patches\n")

@@ -163,7 +168,7 @@ def buildSourcesList(yamlDir, blackListPkgs, logger, singleFile=True):

                 sha1 = SPECS.getData().getSHA1(package, version, sourceName)

                 if sha1 is not None:

                     PullSources.get(package, sourceName, sha1, yamlSourceDir,

-                                    constants.pullsourcesConfig, logger)

+                                    constants.getPullSourcesURLs(package), logger)

             if not singleFile:

                 yamlFile = open(yamlSourceDir + "/" + ossname + "-" + version + ".yaml", "w")

@@ -97,14 +97,15 @@ class PackageUtils(object):

         chrootCmd = self.runInChrootCommand + " " + chrootID

         shutil.copyfile(specFile, chrootID + chrootSpecPath + specName)

+        sources_urls, macros = self._getAdditionalBuildOptions(package)

+        self.logger.debug("Extra macros for " + package + ": " + str(macros))

+        self.logger.debug("Extra source URLs for " + package + ": " + str(sources_urls))

+        constants.setExtraSourcesURLs(package, sources_urls)

+

         # FIXME: some sources are located in SPECS/.. how to mount?

         #        if os.geteuid()==0:

         self._copySourcesTobuildroot(listSourcesFiles, package, version, chrootSourcePath)

         self._copySourcesTobuildroot(listPatchFiles, package, version, chrootSourcePath)

-        macros = []

-

-        listAdditionalFiles, macros = self._getAdditionalBuildFiles(package)

-        self._copyAdditionalBuildFiles(listAdditionalFiles, chrootID)

         #Adding rpm macros

         listRPMMacros = constants.userDefinedMacros

@@ -338,15 +339,16 @@ class PackageUtils(object):

             self.logger.error("Error copying source SPEC file to container")

             raise Exception("Failed copying source SPEC to container")

+        macros = []

+        sources_urls, macros = self._getAdditionalBuildOptions(package)

+        constants.setExtraSourcesURLs(package, sources_urls)

+

         #FIXME: some sources are located in SPECS/.. how to mount?

         #        if os.geteuid()==0:

         #TODO: mount it in, don't copy

-        macros = []

         self._copySourcesToContainer(listSourcesFiles, package, version, containerID, sourcePath)

         #TODO: mount it in, don't copy

         self._copySourcesToContainer(listPatchFiles, package, version, containerID, sourcePath)

-        listAdditionalFiles, macros = self._getAdditionalBuildFiles(package)

-        self._copyAdditionalBuildFilesToContainer(listAdditionalFiles, containerID)

         # Add rpm macros

         listRPMMacros = constants.userDefinedMacros

@@ -437,7 +439,7 @@ class PackageUtils(object):

         sha1 = SPECS.getData().getSHA1(package, version, source)

         if sha1 is not None:

             PullSources.get(package, source, sha1, constants.sourcePath,

-                            constants.pullsourcesConfig, self.logger)

+                            constants.getPullSourcesURLs(package), self.logger)

         sourcePath = cmdUtils.findFile(source, constants.sourcePath)

         if not sourcePath:

@@ -467,30 +469,14 @@ class PackageUtils(object):

                              " Source filename: " + sourcePath[0])

             shutil.copy2(sourcePath[0], destDir)

-    def _copyAdditionalBuildFiles(self, listAdditionalFiles, chrootID):

-        cmdUtils = CommandUtils()

-        for additionalFile in listAdditionalFiles:

-            source = additionalFile["src"]

-            destDir = chrootID + additionalFile["dst"]

-            self.logger.debug("Copying additional Source build files :" + source)

-            if os.path.exists(source):

-                if os.path.isfile(source):

-                    shutil.copy(source, destDir)

-                else:

-                    shutil.copytree(source, destDir)

-

-    def _getAdditionalBuildFiles(self, package):

-        listAdditionalFiles = []

+    def _getAdditionalBuildOptions(self, package):

+        pullsources_urls = []

         macros = []

         if package in constants.buildOptions.keys():

             pkg = constants.buildOptions[package]

-            filelist = pkg["files"]

-            for f in filelist:

-                listAdditionalFiles.append(f)

-            macrolist = pkg["macros"]

-            for macro in macrolist:

-                macros.append(macro)

-        return listAdditionalFiles, macros

+            pullsources_urls.extend(pkg["pullsources"])

+            macros.extend(pkg["macros"])

+        return pullsources_urls, macros

     def _buildRPM(self, specFile, logFile, chrootCmd, package, macros):

@@ -565,28 +551,6 @@ class PackageUtils(object):

             copyCmd = "docker cp " + sourcePath[0] + " " + containerID.short_id + ":" + destDir

             cmdUtils.runCommandInShell(copyCmd)

-    def _copyAdditionalBuildFilesToContainer(self, listAdditionalFiles, containerID):

-        cmdUtils = CommandUtils()

-        #self.logger.debug("VDBG-PU-copyAdditionalBuildFilesToContainer id: " +

-        #                  containerID.short_id)

-        #self.logger.debug(listAdditionalFiles)

-        for additionalFile in listAdditionalFiles:

-            source = additionalFile["src"]

-            destDir = additionalFile["dst"]

-            destPath = containerID.short_id + ":" + destDir

-            #TODO: exit status of exec_run

-            containerID.exec_run("mkdir -p " + destDir)

-            if os.path.exists(source):

-                copyCmd = "docker cp " + source

-                if os.path.isfile(source):

-                    self.logger.debug("Copying additional source file: " + source)

-                    copyCmd += " " + destPath

-                else:

-                    self.logger.debug("Copying additional source file tree: " + source)

-                    copyCmd += "/. " + destPath

-                #TODO: cmd error code

-                cmdUtils.runCommandInShell(copyCmd)

-

     def _getRPMPathInContainer(self, rpmFile, containerID):

         rpmName = os.path.basename(rpmFile)

         #TODO: Container path from constants

@@ -10,7 +10,8 @@ import json

 import os

 import hashlib

 import requests

-from requests.auth import HTTPBasicAuth

+import string

+import random

 from CommandUtils import CommandUtils

 def getFileHash(filepath):

@@ -22,7 +23,7 @@ def getFileHash(filepath):

         f.close()

     return sha1.hexdigest()

-def get(package, source, sha1, sourcesPath, configs, logger):

+def get(package, source, sha1, sourcesPath, URLs, logger):

     cmdUtils = CommandUtils()

     sourcePath = cmdUtils.findFile(source, sourcesPath)

     if sourcePath is not None and len(sourcePath) > 0:

@@ -35,70 +36,53 @@ def get(package, source, sha1, sourcesPath, configs, logger):

         else:

             logger.info("sha1 of " + sourcePath[0] + " does not match. " + sha1 +

                         " vs " + getFileHash(sourcePath[0]))

-    configFiles = configs.split(":")

-    for config in configFiles:

-        p = pullSources(config, logger)

-        package_path = os.path.join(sourcesPath, source)

+    for baseurl in URLs:

+        #form url: https://dl.bintray.com/vmware/photon_sources/1.0/<filename>.

+        url = '%s/%s' % (baseurl, source)

+        destfile = os.path.join(sourcesPath, source)

+        logger.debug("Downloading: " + url)

         try:

-            p.downloadFileHelper(package, source, package_path, sha1)

+            downloadFile(url, destfile)

+            if sha1 != getFileHash(destfile):

+                raise Exception('Invalid sha1 for package %s file %s' % package, source)

             return

+        except requests.exceptions.HTTPError as e:

+            logger.exception(e)

+            # on any HTTP errors - try next config

+            continue

         except Exception as e:

             logger.exception(e)

     raise Exception("Missing source: " + source)

-class pullSources:

-

-    def __init__(self, conf_file, logger):

-        self._config = {}

-        self.logger = logger

-        self.loadConfig(conf_file)

-

-        # generate the auth

-        self._auth = None

-        if ('user' in self._config and len(self._config['user']) > 0 and

-                'apikey' in self._config and len(self._config['apikey'])) > 0:

-            self._auth = HTTPBasicAuth(self._config['user'], self._config['apikey'])

-

-    def loadConfig(self, conf_file):

-        with open(conf_file) as jsonFile:

-            self._config = json.load(jsonFile)

+def downloadFile(url, destfile):

+    # We need to provide atomicity for file downloads. That is,

+    # the file should be visible in its canonical location only