Browse code

Removed unsupported package builder options from Makefile

Change-Id: I725048aaeaa8d90d79da62cd17779512f09be9c4
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1835
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Divya Thaluru <dthaluru@vmware.com>

dthaluru authored on 2016/12/09 15:03:26
Showing 2 changed files
... ...
@@ -505,7 +505,7 @@ check: packages
505 505
     endif
506 506
 	@echo "Testing all RPMS ..."
507 507
 	@cd $(PHOTON_PKG_BUILDER_DIR) && \
508
-        $(PHOTON_PACKAGE_BUILDER) -o full \
508
+        $(PHOTON_PACKAGE_BUILDER) \
509 509
                 -s $(PHOTON_SPECS_DIR) \
510 510
                 -r $(PHOTON_RPMS_DIR) \
511 511
                 -a $(PHOTON_SRPMS_DIR) \
... ...
@@ -513,7 +513,6 @@ check: packages
513 513
                 -b $(PHOTON_CHROOT_PATH) \
514 514
                 -l $(PHOTON_LOGS_DIR) \
515 515
                 -p $(PHOTON_PUBLISH_RPMS_DIR) \
516
-                -j $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \
517 516
                 -c $(PHOTON_BINTRAY_CONFIG) \
518 517
                 -d $(PHOTON_DIST_TAG) \
519 518
                 -n $(PHOTON_BUILD_NUMBER) \
... ...
@@ -259,7 +259,7 @@ def buildPackagesForAllSpecs(listBuildOptionPackages, pkgBuildOptionFile, logger
259 259
     logger.info("List of packages to build:")
260 260
     logger.info(listPackages)
261 261
     if constants.rpmCheck:
262
-        constants.setTestForceRPMS(listPackagesToBuild[:])
262
+        constants.setTestForceRPMS(listPackages[:])
263 263
     pkgManager = PackageManager()
264 264
     pkgManager.buildPackages(listPackages, listBuildOptionPackages, pkgBuildOptionFile, buildThreads)
265 265