Browse code
Fix package-weights-path when WEIGHTS is undefined
In a recent commit, we removed the option to disable the priority
scheduler. With that, we also implicitly made package-weights
mandatory. However, if WEIGHTS=1 is not specified on the command-line,
constants.packageWeightsPath will not be set and hence _parseWeights()
will fail.
Fix this by always pointing package-weights-path to
common/data/packageWeights.json, irrespective of the WEIGHTS
parameter.
Change-Id: Ibd94c93d8e4856eea20efc36e792db4b72d6a336
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6185
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>
Srivatsa S. Bhat (VMware) authored on 2018/11/16 07:09:20Showing 1 changed files
| ... | ... |
@@ -71,11 +71,7 @@ else |
| 71 | 71 |
PUBLISH_BUILD_DEPENDENCIES := |
| 72 | 72 |
endif |
| 73 | 73 |
|
| 74 |
-ifdef WEIGHTS |
|
| 75 | 74 |
PACKAGE_WEIGHTS = --package-weights-path $(SRCROOT)/common/data/packageWeights.json |
| 76 |
-else |
|
| 77 |
-PACKAGE_WEIGHTS = |
|
| 78 |
-endif |
|
| 79 | 75 |
|
| 80 | 76 |
ifdef PKG_BUILD_OPTIONS |
| 81 | 77 |
PACKAGE_BUILD_OPTIONS = --pkg-build-option-file $(PKG_BUILD_OPTIONS) |