Browse code
Makefile cleanup - use longhand options
Add input json as a parameter to package builder
Change-Id: Ia7168fbf7a641b3488a7b895c17f0a916ee91ba0
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5939
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>
suezzelur authored on 2018/10/18 14:25:16Showing 9 changed files
- Makefile
- support/package-builder/GenerateOSSFiles.py
- support/package-builder/Logger.py
- support/package-builder/PackageInfo.py
- support/package-builder/PackageManager.py
- support/package-builder/SpecDeps.py
- support/package-builder/ToolChainUtils.py
- support/package-builder/builder.py
- support/package-builder/constants.py
| ... | ... |
@@ -53,26 +53,26 @@ endif |
| 53 | 53 |
# -q: quit on error. if -q is not specified it will keep going |
| 54 | 54 |
|
| 55 | 55 |
ifeq ($(RPMCHECK),enable) |
| 56 |
-PHOTON_RPMCHECK_FLAGS := -u |
|
| 56 |
+PHOTON_RPMCHECK_FLAGS := --enable-rpmcheck |
|
| 57 | 57 |
else ifeq ($(RPMCHECK),enable_stop_on_error) |
| 58 |
-PHOTON_RPMCHECK_FLAGS := -u -q |
|
| 58 |
+PHOTON_RPMCHECK_FLAGS := --enable-rpmcheck --rpmcheck-stop-on-error |
|
| 59 | 59 |
else |
| 60 | 60 |
PHOTON_RPMCHECK_FLAGS := |
| 61 | 61 |
endif |
| 62 | 62 |
|
| 63 | 63 |
# KAT build for FIPS certification |
| 64 | 64 |
ifdef KAT_BUILD |
| 65 |
-PHOTON_KAT_BUILD_FLAGS := -F $(KAT_BUILD) |
|
| 65 |
+PHOTON_KAT_BUILD_FLAGS := --kat-build $(KAT_BUILD) |
|
| 66 | 66 |
endif |
| 67 | 67 |
|
| 68 | 68 |
ifeq ($(BUILDDEPS),true) |
| 69 |
-PUBLISH_BUILD_DEPENDENCIES := -bd True |
|
| 69 |
+PUBLISH_BUILD_DEPENDENCIES := --publish-build-dependencies True |
|
| 70 | 70 |
else |
| 71 | 71 |
PUBLISH_BUILD_DEPENDENCIES := |
| 72 | 72 |
endif |
| 73 | 73 |
|
| 74 | 74 |
ifdef WEIGHTS |
| 75 |
-PACKAGE_WEIGHTS_PATH = -pw $(WEIGHTS) |
|
| 75 |
+PACKAGE_WEIGHTS_PATH = --package-weights-path $(WEIGHTS) |
|
| 76 | 76 |
else |
| 77 | 77 |
PACKAGE_WEIGHTS_PATH = |
| 78 | 78 |
endif |
| ... | ... |
@@ -116,166 +116,192 @@ packages-minimal: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SO |
| 116 | 116 |
@echo "" |
| 117 | 117 |
@cd $(PHOTON_PKG_BUILDER_DIR) && \ |
| 118 | 118 |
$(PHOTON_PACKAGE_BUILDER) \ |
| 119 |
- -s $(PHOTON_SPECS_DIR) \ |
|
| 120 |
- -r $(PHOTON_RPMS_DIR) \ |
|
| 121 |
- -x $(PHOTON_SRCS_DIR) \ |
|
| 122 |
- -b $(PHOTON_CHROOT_PATH) \ |
|
| 123 |
- -l $(PHOTON_LOGS_DIR) \ |
|
| 124 |
- -y $(LOGLEVEL) \ |
|
| 125 |
- -p $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 126 |
- -c $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 127 |
- -d $(PHOTON_DIST_TAG) \ |
|
| 128 |
- -n $(PHOTON_BUILD_NUMBER) \ |
|
| 129 |
- -v $(PHOTON_RELEASE_VERSION) \ |
|
| 119 |
+ --spec-path $(PHOTON_SPECS_DIR) \ |
|
| 120 |
+ --rpm-path $(PHOTON_RPMS_DIR) \ |
|
| 121 |
+ --source-path $(PHOTON_SRCS_DIR) \ |
|
| 122 |
+ --build-root-path $(PHOTON_CHROOT_PATH) \ |
|
| 123 |
+ --packages-json-input $(PHOTON_DATA_DIR)/packages_minimal.json \ |
|
| 124 |
+ --log-path $(PHOTON_LOGS_DIR) \ |
|
| 125 |
+ --log-level $(LOGLEVEL) \ |
|
| 126 |
+ --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 127 |
+ --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 128 |
+ --dist-tag $(PHOTON_DIST_TAG) \ |
|
| 129 |
+ --build-number $(PHOTON_BUILD_NUMBER) \ |
|
| 130 |
+ --release-version $(PHOTON_RELEASE_VERSION) \ |
|
| 130 | 131 |
$(PHOTON_RPMCHECK_FLAGS) \ |
| 131 | 132 |
$(PUBLISH_BUILD_DEPENDENCIES) \ |
| 132 | 133 |
$(PACKAGE_WEIGHTS_PATH) \ |
| 133 |
- -t ${THREADS}
|
|
| 134 |
+ --threads ${THREADS}
|
|
| 134 | 135 |
|
| 135 | 136 |
packages: check-docker-py check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) check-spec-files generate-dep-lists |
| 136 | 137 |
@echo "Building all RPMS..." |
| 137 | 138 |
@echo "" |
| 138 | 139 |
@cd $(PHOTON_PKG_BUILDER_DIR) && \ |
| 139 | 140 |
$(PHOTON_PACKAGE_BUILDER) \ |
| 140 |
- -bt $(PHOTON_BUILD_TYPE) \ |
|
| 141 |
- -s $(PHOTON_SPECS_DIR) \ |
|
| 142 |
- -r $(PHOTON_RPMS_DIR) \ |
|
| 143 |
- -a $(PHOTON_SRPMS_DIR) \ |
|
| 144 |
- -x $(PHOTON_SRCS_DIR) \ |
|
| 145 |
- -b $(PHOTON_CHROOT_PATH) \ |
|
| 146 |
- -l $(PHOTON_LOGS_DIR) \ |
|
| 147 |
- -y $(LOGLEVEL) \ |
|
| 148 |
- -p $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 149 |
- -e $(PHOTON_PUBLISH_XRPMS_DIR) \ |
|
| 150 |
- -c $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 151 |
- -d $(PHOTON_DIST_TAG) \ |
|
| 152 |
- -n $(PHOTON_BUILD_NUMBER) \ |
|
| 153 |
- -v $(PHOTON_RELEASE_VERSION) \ |
|
| 154 |
- -w $(PHOTON_STAGE)/pkg_info.json \ |
|
| 155 |
- -g $(PHOTON_DATA_DIR)/pkg_build_options.json \ |
|
| 141 |
+ --build-type $(PHOTON_BUILD_TYPE) \ |
|
| 142 |
+ --spec-path $(PHOTON_SPECS_DIR) \ |
|
| 143 |
+ --rpm-path $(PHOTON_RPMS_DIR) \ |
|
| 144 |
+ --source-rpm-path $(PHOTON_SRPMS_DIR) \ |
|
| 145 |
+ --source-path $(PHOTON_SRCS_DIR) \ |
|
| 146 |
+ --build-root-path $(PHOTON_CHROOT_PATH) \ |
|
| 147 |
+ --log-path $(PHOTON_LOGS_DIR) \ |
|
| 148 |
+ --log-level $(LOGLEVEL) \ |
|
| 149 |
+ --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 150 |
+ --publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \ |
|
| 151 |
+ --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 152 |
+ --dist-tag $(PHOTON_DIST_TAG) \ |
|
| 153 |
+ --build-number $(PHOTON_BUILD_NUMBER) \ |
|
| 154 |
+ --release-version $(PHOTON_RELEASE_VERSION) \ |
|
| 155 |
+ --pkginfo-file $(PHOTON_STAGE)/pkg_info.json \ |
|
| 156 |
+ --pkg-build-option-file $(PHOTON_DATA_DIR)/pkg_build_options.json \ |
|
| 156 | 157 |
$(PHOTON_RPMCHECK_FLAGS) \ |
| 157 |
- $(PHOTON_KAT_BUILD_FLAGS) \ |
|
| 158 |
- $(PUBLISH_BUILD_DEPENDENCIES) \ |
|
| 159 |
- $(PACKAGE_WEIGHTS_PATH) \ |
|
| 160 |
- -t ${THREADS}
|
|
| 158 |
+ $(PHOTON_KAT_BUILD_FLAGS) \ |
|
| 159 |
+ $(PUBLISH_BUILD_DEPENDENCIES) \ |
|
| 160 |
+ $(PACKAGE_WEIGHTS_PATH) \ |
|
| 161 |
+ --threads ${THREADS}
|
|
| 161 | 162 |
|
| 162 | 163 |
packages-docker: check-docker-py check-docker-service check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists |
| 163 | 164 |
@echo "Building all RPMS..." |
| 164 | 165 |
@echo "" |
| 165 | 166 |
@cd $(PHOTON_PKG_BUILDER_DIR) && \ |
| 166 | 167 |
$(PHOTON_PACKAGE_BUILDER) \ |
| 167 |
- -bt $(PHOTON_BUILD_TYPE) \ |
|
| 168 |
- -s $(PHOTON_SPECS_DIR) \ |
|
| 169 |
- -r $(PHOTON_RPMS_DIR) \ |
|
| 170 |
- -a $(PHOTON_SRPMS_DIR) \ |
|
| 171 |
- -x $(PHOTON_SRCS_DIR) \ |
|
| 172 |
- -b $(PHOTON_CHROOT_PATH) \ |
|
| 173 |
- -l $(PHOTON_LOGS_DIR) \ |
|
| 174 |
- -y $(LOGLEVEL) \ |
|
| 175 |
- -p $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 176 |
- -e $(PHOTON_PUBLISH_XRPMS_DIR) \ |
|
| 177 |
- -c $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 178 |
- -d $(PHOTON_DIST_TAG) \ |
|
| 179 |
- -n $(PHOTON_BUILD_NUMBER) \ |
|
| 180 |
- -v $(PHOTON_RELEASE_VERSION) \ |
|
| 181 |
- -w $(PHOTON_STAGE)/pkg_info.json \ |
|
| 182 |
- -g $(PHOTON_DATA_DIR)/pkg_build_options.json \ |
|
| 168 |
+ --build-type $(PHOTON_BUILD_TYPE) \ |
|
| 169 |
+ --spec-path $(PHOTON_SPECS_DIR) \ |
|
| 170 |
+ --rpm-path $(PHOTON_RPMS_DIR) \ |
|
| 171 |
+ --source-rpm-path $(PHOTON_SRPMS_DIR) \ |
|
| 172 |
+ --source-path $(PHOTON_SRCS_DIR) \ |
|
| 173 |
+ --build-root-path $(PHOTON_CHROOT_PATH) \ |
|
| 174 |
+ --log-path $(PHOTON_LOGS_DIR) \ |
|
| 175 |
+ --log-level $(LOGLEVEL) \ |
|
| 176 |
+ --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 177 |
+ --publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \ |
|
| 178 |
+ --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 179 |
+ --dist-tag $(PHOTON_DIST_TAG) \ |
|
| 180 |
+ --build-number $(PHOTON_BUILD_NUMBER) \ |
|
| 181 |
+ --release-version $(PHOTON_RELEASE_VERSION) \ |
|
| 182 |
+ --pkginfo-file $(PHOTON_STAGE)/pkg_info.json \ |
|
| 183 |
+ --pkg-build-option-file $(PHOTON_DATA_DIR)/pkg_build_options.json \ |
|
| 183 | 184 |
$(PHOTON_RPMCHECK_FLAGS) \ |
| 184 |
- $(PUBLISH_BUILD_DEPENDENCIES) \ |
|
| 185 |
- $(PACKAGE_WEIGHTS_PATH) \ |
|
| 186 |
- -t ${THREADS}
|
|
| 185 |
+ $(PUBLISH_BUILD_DEPENDENCIES) \ |
|
| 186 |
+ $(PACKAGE_WEIGHTS_PATH) \ |
|
| 187 |
+ --threads ${THREADS}
|
|
| 187 | 188 |
|
| 188 | 189 |
updated-packages: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists |
| 189 | 190 |
@echo "Building only updated RPMS..." |
| 190 | 191 |
@echo "" |
| 191 | 192 |
@cd $(PHOTON_PKG_BUILDER_DIR) && \ |
| 192 | 193 |
$(PHOTON_PACKAGE_BUILDER) \ |
| 193 |
- -s $(PHOTON_SPECS_DIR) \ |
|
| 194 |
- -r $(PHOTON_UPDATED_RPMS_DIR) \ |
|
| 195 |
- -x $(PHOTON_SRCS_DIR) \ |
|
| 196 |
- -b $(PHOTON_CHROOT_PATH) \ |
|
| 197 |
- -l $(PHOTON_LOGS_DIR) \ |
|
| 198 |
- -y $(LOGLEVEL) \ |
|
| 199 |
- -p $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 200 |
- -e $(PHOTON_PUBLISH_XRPMS_DIR) \ |
|
| 201 |
- -c $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 202 |
- -d $(PHOTON_DIST_TAG) \ |
|
| 203 |
- -n $(PHOTON_BUILD_NUMBER) \ |
|
| 204 |
- -v $(PHOTON_RELEASE_VERSION) \ |
|
| 205 |
- -k $(PHOTON_INPUT_RPMS_DIR) \ |
|
| 206 |
- $(PHOTON_KAT_BUILD_FLAGS) \ |
|
| 194 |
+ --spec-path $(PHOTON_SPECS_DIR) \ |
|
| 195 |
+ --rpm-path $(PHOTON_UPDATED_RPMS_DIR) \ |
|
| 196 |
+ --source-path $(PHOTON_SRCS_DIR) \ |
|
| 197 |
+ --build-root-path $(PHOTON_CHROOT_PATH) \ |
|
| 198 |
+ --log-path $(PHOTON_LOGS_DIR) \ |
|
| 199 |
+ --log-level $(LOGLEVEL) \ |
|
| 200 |
+ --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 201 |
+ --publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \ |
|
| 202 |
+ --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 203 |
+ --dist-tag $(PHOTON_DIST_TAG) \ |
|
| 204 |
+ --build-number $(PHOTON_BUILD_NUMBER) \ |
|
| 205 |
+ --release-version $(PHOTON_RELEASE_VERSION) \ |
|
| 206 |
+ --input-RPMS-path $(PHOTON_INPUT_RPMS_DIR) \ |
|
| 207 |
+ $(PHOTON_KAT_BUILD_FLAGS) \ |
|
| 207 | 208 |
$(PHOTON_RPMCHECK_FLAGS) \ |
| 208 |
- $(PUBLISH_BUILD_DEPENDENCIES) \ |
|
| 209 |
- $(PACKAGE_WEIGHTS_PATH) \ |
|
| 210 |
- -t ${THREADS}
|
|
| 209 |
+ $(PUBLISH_BUILD_DEPENDENCIES) \ |
|
| 210 |
+ $(PACKAGE_WEIGHTS_PATH) \ |
|
| 211 |
+ --threads ${THREADS}
|
|
| 211 | 212 |
|
| 212 | 213 |
tool-chain-stage1: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists |
| 213 | 214 |
@echo "Building all RPMS..." |
| 214 | 215 |
@echo "" |
| 215 | 216 |
@cd $(PHOTON_PKG_BUILDER_DIR) && \ |
| 216 | 217 |
$(PHOTON_PACKAGE_BUILDER) \ |
| 217 |
- -s $(PHOTON_SPECS_DIR) \ |
|
| 218 |
- -r $(PHOTON_RPMS_DIR) \ |
|
| 219 |
- -a $(PHOTON_SRPMS_DIR) \ |
|
| 220 |
- -x $(PHOTON_SRCS_DIR) \ |
|
| 221 |
- -b $(PHOTON_CHROOT_PATH) \ |
|
| 222 |
- -l $(PHOTON_LOGS_DIR) \ |
|
| 223 |
- -y $(LOGLEVEL) \ |
|
| 224 |
- -p $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 225 |
- -t ${THREADS} \
|
|
| 226 |
- -c $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 227 |
- -d $(PHOTON_DIST_TAG) \ |
|
| 228 |
- -n $(PHOTON_BUILD_NUMBER) \ |
|
| 229 |
- -v $(PHOTON_RELEASE_VERSION) \ |
|
| 218 |
+ --spec-path $(PHOTON_SPECS_DIR) \ |
|
| 219 |
+ --rpm-path $(PHOTON_RPMS_DIR) \ |
|
| 220 |
+ --source-rpm-path $(PHOTON_SRPMS_DIR) \ |
|
| 221 |
+ --source-path $(PHOTON_SRCS_DIR) \ |
|
| 222 |
+ --build-root-path $(PHOTON_CHROOT_PATH) \ |
|
| 223 |
+ --log-path $(PHOTON_LOGS_DIR) \ |
|
| 224 |
+ --log-level $(LOGLEVEL) \ |
|
| 225 |
+ --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 226 |
+ --threads ${THREADS} \
|
|
| 227 |
+ --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 228 |
+ --dist-tag $(PHOTON_DIST_TAG) \ |
|
| 229 |
+ --build-number $(PHOTON_BUILD_NUMBER) \ |
|
| 230 |
+ --release-version $(PHOTON_RELEASE_VERSION) \ |
|
| 230 | 231 |
$(PHOTON_RPMCHECK_FLAGS) \ |
| 231 |
- -m stage1 |
|
| 232 |
+ --tool-chain-stage stage1 |
|
| 232 | 233 |
|
| 233 | 234 |
tool-chain-stage2: check-tools $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists |
| 234 | 235 |
@echo "Building all RPMS..." |
| 235 | 236 |
@echo "" |
| 236 | 237 |
@cd $(PHOTON_PKG_BUILDER_DIR) && \ |
| 237 | 238 |
$(PHOTON_PACKAGE_BUILDER) \ |
| 238 |
- -s $(PHOTON_SPECS_DIR) \ |
|
| 239 |
- -r $(PHOTON_RPMS_DIR) \ |
|
| 240 |
- -a $(PHOTON_SRPMS_DIR) \ |
|
| 241 |
- -x $(PHOTON_SRCS_DIR) \ |
|
| 242 |
- -b $(PHOTON_CHROOT_PATH) \ |
|
| 243 |
- -l $(PHOTON_LOGS_DIR) \ |
|
| 244 |
- -y $(LOGLEVEL) \ |
|
| 245 |
- -p $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 246 |
- -t ${THREADS} \
|
|
| 247 |
- -c $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 248 |
- -d $(PHOTON_DIST_TAG) \ |
|
| 249 |
- -n $(PHOTON_BUILD_NUMBER) \ |
|
| 250 |
- -v $(PHOTON_RELEASE_VERSION) \ |
|
| 239 |
+ --spec-path $(PHOTON_SPECS_DIR) \ |
|
| 240 |
+ --rpm-path $(PHOTON_RPMS_DIR) \ |
|
| 241 |
+ --source-rpm-path $(PHOTON_SRPMS_DIR) \ |
|
| 242 |
+ --source-path $(PHOTON_SRCS_DIR) \ |
|
| 243 |
+ --build-root-path $(PHOTON_CHROOT_PATH) \ |
|
| 244 |
+ --log-path $(PHOTON_LOGS_DIR) \ |
|
| 245 |
+ --log-level $(LOGLEVEL) \ |
|
| 246 |
+ --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 247 |
+ --threads ${THREADS} \
|
|
| 248 |
+ --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 249 |
+ --dist-tag $(PHOTON_DIST_TAG) \ |
|
| 250 |
+ --build-number $(PHOTON_BUILD_NUMBER) \ |
|
| 251 |
+ --release-version $(PHOTON_RELEASE_VERSION) \ |
|
| 251 | 252 |
$(PHOTON_RPMCHECK_FLAGS) \ |
| 252 |
- -m stage2 |
|
| 253 |
+ --tool-chain-stage stage2 |
|
| 253 | 254 |
|
| 254 | 255 |
%: check-tools $(PHOTON_PUBLISH_RPMS) $(PHOTON_PUBLISH_XRPMS) $(PHOTON_SOURCES) $(CONTAIN) check-spec-files $(eval PKG_NAME = $@) |
| 255 | 256 |
$(eval PKG_NAME = $@) |
| 256 |
- @echo "" |
|
| 257 |
- @echo "Building package $(PKG_NAME) ..." |
|
| 258 |
- @echo "" |
|
| 259 | 257 |
@cd $(PHOTON_PKG_BUILDER_DIR) && \ |
| 260 |
- $(PHOTON_PACKAGE_BUILDER) -i $(PKG_NAME)\ |
|
| 261 |
- -bt $(PHOTON_BUILD_TYPE) \ |
|
| 262 |
- -b $(PHOTON_CHROOT_PATH) \ |
|
| 263 |
- -s $(PHOTON_SPECS_DIR) \ |
|
| 264 |
- -r $(PHOTON_RPMS_DIR) \ |
|
| 265 |
- -a $(PHOTON_SRPMS_DIR) \ |
|
| 266 |
- -x $(PHOTON_SRCS_DIR) \ |
|
| 267 |
- -p $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 268 |
- -e $(PHOTON_PUBLISH_XRPMS_DIR) \ |
|
| 269 |
- -c $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 270 |
- -y $(LOGLEVEL) \ |
|
| 271 |
- -d $(PHOTON_DIST_TAG) \ |
|
| 272 |
- -n $(PHOTON_BUILD_NUMBER) \ |
|
| 273 |
- -v $(PHOTON_RELEASE_VERSION) \ |
|
| 274 |
- -g $(PHOTON_DATA_DIR)/pkg_build_options.json \ |
|
| 275 |
- $(PHOTON_RPMCHECK_FLAGS) \ |
|
| 276 |
- $(PHOTON_KAT_BUILD_FLAGS) \ |
|
| 277 |
- -l $(PHOTON_LOGS_DIR) \ |
|
| 278 |
- -t ${THREADS}
|
|
| 258 |
+ $(PHOTON_PACKAGE_BUILDER) --install-package $(PKG_NAME)\ |
|
| 259 |
+ --build-type $(PHOTON_BUILD_TYPE) \ |
|
| 260 |
+ --build-root-path $(PHOTON_CHROOT_PATH) \ |
|
| 261 |
+ --spec-path $(PHOTON_SPECS_DIR) \ |
|
| 262 |
+ --rpm-path $(PHOTON_RPMS_DIR) \ |
|
| 263 |
+ --source-rpm-path $(PHOTON_SRPMS_DIR) \ |
|
| 264 |
+ --source-path $(PHOTON_SRCS_DIR) \ |
|
| 265 |
+ --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 266 |
+ --publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \ |
|
| 267 |
+ --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 268 |
+ --log-level $(LOGLEVEL) \ |
|
| 269 |
+ --dist-tag $(PHOTON_DIST_TAG) \ |
|
| 270 |
+ --build-number $(PHOTON_BUILD_NUMBER) \ |
|
| 271 |
+ --release-version $(PHOTON_RELEASE_VERSION) \ |
|
| 272 |
+ --pkg-build-option-file $(PHOTON_DATA_DIR)/pkg_build_options.json \ |
|
| 273 |
+ $(PHOTON_RPMCHECK_FLAGS) \ |
|
| 274 |
+ $(PHOTON_KAT_BUILD_FLAGS) \ |
|
| 275 |
+ --log-path $(PHOTON_LOGS_DIR) \ |
|
| 276 |
+ --threads ${THREADS}
|
|
| 277 |
+ |
|
| 278 |
+check: packages |
|
| 279 |
+ ifeq ($(RPMCHECK),enable_stop_on_error) |
|
| 280 |
+ $(eval rpmcheck_stop_on_error = -q) |
|
| 281 |
+ endif |
|
| 282 |
+ @echo "Testing all RPMS ..." |
|
| 283 |
+ @cd $(PHOTON_PKG_BUILDER_DIR) && \ |
|
| 284 |
+ $(PHOTON_PACKAGE_BUILDER) \ |
|
| 285 |
+ --build-type $(PHOTON_BUILD_TYPE) \ |
|
| 286 |
+ --spec-path $(PHOTON_SPECS_DIR) \ |
|
| 287 |
+ --rpm-path $(PHOTON_RPMS_DIR) \ |
|
| 288 |
+ --source-rpm-path $(PHOTON_SRPMS_DIR) \ |
|
| 289 |
+ --source-path $(PHOTON_SRCS_DIR) \ |
|
| 290 |
+ --build-root-path $(PHOTON_CHROOT_PATH) \ |
|
| 291 |
+ --log-path $(PHOTON_LOGS_DIR) \ |
|
| 292 |
+ --log-level $(LOGLEVEL) \ |
|
| 293 |
+ --publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 294 |
+ --publish-XRPMS-path $(PHOTON_PUBLISH_XRPMS_DIR) \ |
|
| 295 |
+ --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 296 |
+ --dist-tag $(PHOTON_DIST_TAG) \ |
|
| 297 |
+ --build-number $(PHOTON_BUILD_NUMBER) \ |
|
| 298 |
+ --release-version $(PHOTON_RELEASE_VERSION) \ |
|
| 299 |
+ --pkginfo-file $(PHOTON_STAGE)/pkg_info.json \ |
|
| 300 |
+ --pkg-build-option-file $(PHOTON_DATA_DIR)/pkg_build_options.json \ |
|
| 301 |
+ --enable-rpmcheck \ |
|
| 302 |
+ $(rpmcheck_stop_on_error) \ |
|
| 303 |
+ --threads ${THREADS}
|
|
| 304 |
+ |
|
| 279 | 305 |
#------------------------------------------------------------------------------- |
| 280 | 306 |
|
| 281 | 307 |
# The targets listed under "all" are the installer built artifacts |
| ... | ... |
@@ -286,35 +312,35 @@ iso: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES) |
| 286 | 286 |
@echo "Building Photon Full ISO..." |
| 287 | 287 |
@cd $(PHOTON_INSTALLER_DIR) && \ |
| 288 | 288 |
sudo $(PHOTON_INSTALLER) \ |
| 289 |
- -i $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso \ |
|
| 290 |
- -k $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).debug.iso \ |
|
| 291 |
- -w $(PHOTON_STAGE)/photon_iso \ |
|
| 292 |
- -l $(PHOTON_STAGE)/LOGS \ |
|
| 293 |
- -y $(LOGLEVEL) \ |
|
| 294 |
- -r $(PHOTON_STAGE)/RPMS \ |
|
| 295 |
- -x $(PHOTON_STAGE)/SRPMS \ |
|
| 296 |
- -p $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \ |
|
| 297 |
- -o $(PHOTON_STAGE)/common/data \ |
|
| 298 |
- -d $(PHOTON_STAGE)/pkg_info.json \ |
|
| 299 |
- -s $(PHOTON_DATA_DIR) \ |
|
| 300 |
- -f > \ |
|
| 289 |
+ --iso-path $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso \ |
|
| 290 |
+ --debug-iso-path $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).debug.iso \ |
|
| 291 |
+ --working-directory $(PHOTON_STAGE)/photon_iso \ |
|
| 292 |
+ --log-path $(PHOTON_STAGE)/LOGS \ |
|
| 293 |
+ --log-level $(LOGLEVEL) \ |
|
| 294 |
+ --rpm-path $(PHOTON_STAGE)/RPMS \ |
|
| 295 |
+ --srpm-path $(PHOTON_STAGE)/SRPMS \ |
|
| 296 |
+ --package-list-file $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \ |
|
| 297 |
+ --output-data-path $(PHOTON_STAGE)/common/data \ |
|
| 298 |
+ --pkg-to-rpm-map-file $(PHOTON_STAGE)/pkg_info.json \ |
|
| 299 |
+ --json-data-path $(PHOTON_DATA_DIR) \ |
|
| 300 |
+ --force > \ |
|
| 301 | 301 |
$(PHOTON_LOGS_DIR)/installer.log 2>&1 |
| 302 | 302 |
|
| 303 | 303 |
src-iso: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES) |
| 304 | 304 |
@echo "Building Photon Full Source ISO..." |
| 305 | 305 |
@cd $(PHOTON_INSTALLER_DIR) && \ |
| 306 | 306 |
sudo $(PHOTON_INSTALLER) \ |
| 307 |
- -j $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).src.iso \ |
|
| 308 |
- -w $(PHOTON_STAGE)/photon_iso \ |
|
| 309 |
- -l $(PHOTON_STAGE)/LOGS \ |
|
| 310 |
- -y $(LOGLEVEL) \ |
|
| 311 |
- -r $(PHOTON_STAGE)/RPMS \ |
|
| 312 |
- -x $(PHOTON_STAGE)/SRPMS \ |
|
| 313 |
- -p $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \ |
|
| 314 |
- -o $(PHOTON_STAGE)/common/data \ |
|
| 315 |
- -d $(PHOTON_STAGE)/pkg_info.json \ |
|
| 316 |
- -s $(PHOTON_DATA_DIR) \ |
|
| 317 |
- -f > \ |
|
| 307 |
+ --src-iso-path $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).src.iso \ |
|
| 308 |
+ --working-directory $(PHOTON_STAGE)/photon_iso \ |
|
| 309 |
+ --log-path $(PHOTON_STAGE)/LOGS \ |
|
| 310 |
+ --log-level $(LOGLEVEL) \ |
|
| 311 |
+ --rpm-path $(PHOTON_STAGE)/RPMS \ |
|
| 312 |
+ --srpm-path $(PHOTON_STAGE)/SRPMS \ |
|
| 313 |
+ --package-list-file $(PHOTON_GENERATED_DATA_DIR)/$(FULL_PACKAGE_LIST_FILE) \ |
|
| 314 |
+ --output-data-path $(PHOTON_STAGE)/common/data \ |
|
| 315 |
+ --pkg-to-rpm-map-file $(PHOTON_STAGE)/pkg_info.json \ |
|
| 316 |
+ --json-data-path $(PHOTON_DATA_DIR) \ |
|
| 317 |
+ --force > \ |
|
| 318 | 318 |
$(PHOTON_LOGS_DIR)/sourceiso-installer.log 2>&1 |
| 319 | 319 |
|
| 320 | 320 |
cloud-image: check-kpartx $(PHOTON_STAGE) $(VIXDISKUTIL) $(IMGCONVERTER) $(PHOTON_PACKAGES) |
| ... | ... |
@@ -379,23 +405,23 @@ sources-cached: |
| 379 | 379 |
@ln -sf $(PHOTON_SOURCES_PATH) $(PHOTON_SRCS_DIR) |
| 380 | 380 |
|
| 381 | 381 |
publish-rpms: |
| 382 |
- @echo "Pulling toolchain rpms from bintray..." |
|
| 382 |
+ @echo "Pulling toolchain rpms..." |
|
| 383 | 383 |
@cd $(PHOTON_PULL_PUBLISH_RPMS_DIR) && \ |
| 384 | 384 |
$(PHOTON_PULL_PUBLISH_RPMS) $(PHOTON_PUBLISH_RPMS_DIR) |
| 385 | 385 |
|
| 386 | 386 |
publish-x-rpms: |
| 387 |
- @echo "Pulling X toolchain rpms from bintray..." |
|
| 387 |
+ @echo "Pulling X toolchain rpms..." |
|
| 388 | 388 |
@cd $(PHOTON_PULL_PUBLISH_RPMS_DIR) && \ |
| 389 | 389 |
$(PHOTON_PULL_PUBLISH_X_RPMS) $(PHOTON_PUBLISH_XRPMS_DIR) |
| 390 | 390 |
|
| 391 | 391 |
publish-rpms-cached: |
| 392 |
- @echo "Using cached publish rpms..." |
|
| 392 |
+ @echo "Using cached toolchain rpms..." |
|
| 393 | 393 |
@$(MKDIR) -p $(PHOTON_PUBLISH_RPMS_DIR)/{$(ARCH),noarch} && \
|
| 394 | 394 |
cd $(PHOTON_PULL_PUBLISH_RPMS_DIR) && \ |
| 395 | 395 |
$(PHOTON_PULL_PUBLISH_RPMS) $(PHOTON_PUBLISH_RPMS_DIR) $(PHOTON_PUBLISH_RPMS_PATH) |
| 396 | 396 |
|
| 397 | 397 |
publish-x-rpms-cached: |
| 398 |
- @echo "Using ..." |
|
| 398 |
+ @echo "Using cached X toolchain rpms..." |
|
| 399 | 399 |
@$(MKDIR) -p $(PHOTON_PUBLISH_XRPMS_DIR)/{$(ARCH),noarch} && \
|
| 400 | 400 |
cd $(PHOTON_PULL_PUBLISH_RPMS_DIR) && \ |
| 401 | 401 |
$(PHOTON_PULL_PUBLISH_X_RPMS) $(PHOTON_PUBLISH_XRPMS_DIR) $(PHOTON_PUBLISH_XRPMS_PATH) |
| ... | ... |
@@ -493,33 +519,6 @@ install-photon-docker-image: photon-docker-image |
| 493 | 493 |
sudo docker build -t photon:tdnf . |
| 494 | 494 |
#__________________________________________________________________________________ |
| 495 | 495 |
|
| 496 |
-check: packages |
|
| 497 |
- ifeq ($(RPMCHECK),enable_stop_on_error) |
|
| 498 |
- $(eval rpmcheck_stop_on_error = -q) |
|
| 499 |
- endif |
|
| 500 |
- @echo "Testing all RPMS ..." |
|
| 501 |
- @cd $(PHOTON_PKG_BUILDER_DIR) && \ |
|
| 502 |
- $(PHOTON_PACKAGE_BUILDER) \ |
|
| 503 |
- -bt $(PHOTON_BUILD_TYPE) \ |
|
| 504 |
- -s $(PHOTON_SPECS_DIR) \ |
|
| 505 |
- -r $(PHOTON_RPMS_DIR) \ |
|
| 506 |
- -a $(PHOTON_SRPMS_DIR) \ |
|
| 507 |
- -x $(PHOTON_SRCS_DIR) \ |
|
| 508 |
- -b $(PHOTON_CHROOT_PATH) \ |
|
| 509 |
- -l $(PHOTON_LOGS_DIR) \ |
|
| 510 |
- -y $(LOGLEVEL) \ |
|
| 511 |
- -p $(PHOTON_PUBLISH_RPMS_DIR) \ |
|
| 512 |
- -e $(PHOTON_PUBLISH_XRPMS_DIR) \ |
|
| 513 |
- -c $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 514 |
- -d $(PHOTON_DIST_TAG) \ |
|
| 515 |
- -n $(PHOTON_BUILD_NUMBER) \ |
|
| 516 |
- -v $(PHOTON_RELEASE_VERSION) \ |
|
| 517 |
- -w $(PHOTON_DATA_DIR)/pkg_info.json \ |
|
| 518 |
- -g $(PHOTON_DATA_DIR)/pkg_build_options.json \ |
|
| 519 |
- -u \ |
|
| 520 |
- $(rpmcheck_stop_on_error) \ |
|
| 521 |
- -t ${THREADS}
|
|
| 522 |
- |
|
| 523 | 496 |
# Spec file checker and utilities |
| 524 | 497 |
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 525 | 498 |
check-spec-files: |
| ... | ... |
@@ -532,45 +531,60 @@ generate-dep-lists: |
| 532 | 532 |
@$(MKDIR) -p $(PHOTON_GENERATED_DATA_DIR) |
| 533 | 533 |
@cd $(PHOTON_SPECDEPS_DIR) && \ |
| 534 | 534 |
$(PHOTON_SPECDEPS) \ |
| 535 |
- -s $(PHOTON_SPECS_DIR) \ |
|
| 536 |
- -t $(PHOTON_STAGE) \ |
|
| 537 |
- -l $(PHOTON_LOGS_DIR) \ |
|
| 538 |
- -y $(LOGLEVEL) \ |
|
| 539 |
- -p $(PHOTON_GENERATED_DATA_DIR) \ |
|
| 535 |
+ --spec-path $(PHOTON_SPECS_DIR) \ |
|
| 536 |
+ --stage-dir $(PHOTON_STAGE) \ |
|
| 537 |
+ --log-path $(PHOTON_LOGS_DIR) \ |
|
| 538 |
+ --log-level $(LOGLEVEL) \ |
|
| 539 |
+ --pkg $(PHOTON_GENERATED_DATA_DIR) \ |
|
| 540 | 540 |
--input-type=json \ |
| 541 | 541 |
--file "$$(ls $(PHOTON_DATA_DIR)/build_install_options*.json)" \ |
| 542 |
- -d json \ |
|
| 543 |
- -a $(PHOTON_DATA_DIR) |
|
| 542 |
+ --display-option json \ |
|
| 543 |
+ --input-data-dir $(PHOTON_DATA_DIR) |
|
| 544 | 544 |
@echo "" |
| 545 | 545 |
pkgtree: |
| 546 | 546 |
@cd $(PHOTON_SPECDEPS_DIR) && \ |
| 547 |
- $(PHOTON_SPECDEPS) -s $(PHOTON_SPECS_DIR) -y $(LOGLEVEL) -i pkg -p $(pkg) |
|
| 547 |
+ $(PHOTON_SPECDEPS) \ |
|
| 548 |
+ --spec-path $(PHOTON_SPECS_DIR) \ |
|
| 549 |
+ --log-level $(LOGLEVEL) \ |
|
| 550 |
+ --input-type pkg \ |
|
| 551 |
+ --pkg $(pkg) |
|
| 548 | 552 |
|
| 549 | 553 |
imgtree: |
| 550 | 554 |
@cd $(PHOTON_SPECDEPS_DIR) && \ |
| 551 |
- $(PHOTON_SPECDEPS) -s $(PHOTON_SPECS_DIR) -y $(LOGLEVEL) -i json -f $(PHOTON_DATA_DIR)/build_install_options_$(img).json |
|
| 555 |
+ $(PHOTON_SPECDEPS) \ |
|
| 556 |
+ --spec-path $(PHOTON_SPECS_DIR) \ |
|
| 557 |
+ --log-level $(LOGLEVEL) \ |
|
| 558 |
+ --input-type json \ |
|
| 559 |
+ --file $(PHOTON_DATA_DIR)/build_install_options_$(img).json |
|
| 552 | 560 |
|
| 553 | 561 |
who-needs: |
| 554 | 562 |
@cd $(PHOTON_SPECDEPS_DIR) && \ |
| 555 |
- $(PHOTON_SPECDEPS) -s $(PHOTON_SPECS_DIR) -y $(LOGLEVEL) -i who-needs -p $(pkg) |
|
| 563 |
+ $(PHOTON_SPECDEPS) \ |
|
| 564 |
+ --spec-path $(PHOTON_SPECS_DIR) \ |
|
| 565 |
+ --log-level $(LOGLEVEL) \ |
|
| 566 |
+ --input-type who-needs \ |
|
| 567 |
+ --pkg $(pkg) |
|
| 556 | 568 |
|
| 557 | 569 |
print-upward-deps: |
| 558 | 570 |
@cd $(PHOTON_SPECDEPS_DIR) && \ |
| 559 |
- $(PHOTON_SPECDEPS) -s $(PHOTON_SPECS_DIR) -i print-upward-deps -p $(pkg) |
|
| 571 |
+ $(PHOTON_SPECDEPS) \ |
|
| 572 |
+ --spec-path $(PHOTON_SPECS_DIR) \ |
|
| 573 |
+ --input-type print-upward-deps \ |
|
| 574 |
+ --pkg $(pkg) |
|
| 560 | 575 |
|
| 561 | 576 |
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 562 | 577 |
|
| 563 | 578 |
generate-yaml-files: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES) |
| 564 | 579 |
@echo "Generating yaml files for packages ..." |
| 565 | 580 |
@cd $(PHOTON_PKG_BUILDER_DIR) && \ |
| 566 |
- $(PHOTON_GENERATE_OSS_FILES) -y \ |
|
| 567 |
- -s $(PHOTON_SPECS_DIR) \ |
|
| 568 |
- -a $(PHOTON_SRPMS_DIR) \ |
|
| 569 |
- -l $(PHOTON_LOGS_DIR) \ |
|
| 570 |
- -d $(PHOTON_DIST_TAG) \ |
|
| 571 |
- -z $(LOGLEVEL) \ |
|
| 572 |
- -c $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 573 |
- -f $(PHOTON_PKG_BLACKLIST_FILE) |
|
| 581 |
+ $(PHOTON_GENERATE_OSS_FILES) --generate-yaml-files \ |
|
| 582 |
+ --spec-path $(PHOTON_SPECS_DIR) \ |
|
| 583 |
+ --source-rpm-path $(PHOTON_SRPMS_DIR) \ |
|
| 584 |
+ --log-path $(PHOTON_LOGS_DIR) \ |
|
| 585 |
+ --dist-tag $(PHOTON_DIST_TAG) \ |
|
| 586 |
+ --log-level $(LOGLEVEL) \ |
|
| 587 |
+ --pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \ |
|
| 588 |
+ --pkg-blacklist-file $(PHOTON_PKG_BLACKLIST_FILE) |
|
| 574 | 589 |
|
| 575 | 590 |
# Input args: BASE_COMMIT= (optional) |
| 576 | 591 |
# |
| ... | ... |
@@ -583,6 +597,6 @@ generate-yaml-files: check-tools $(PHOTON_STAGE) $(PHOTON_PACKAGES) |
| 583 | 583 |
# - commits from BASE_COMMIT to HEAD (if BASE_COMMIT= parameter is specified) |
| 584 | 584 |
# - local changes (if no commits specified) |
| 585 | 585 |
clean-stage-for-incremental-build: |
| 586 |
- @test -n "$$(git diff --name-only $(BASE_COMMIT) @ | grep SPECS)" && $(PHOTON_SPECDEPS) -s $(PHOTON_SPECS_DIR) -i remove-upward-deps -p $$(echo `git diff --name-only $(BASE_COMMIT) @ | grep .spec | xargs -n1 basename 2>/dev/null` | tr ' ' :) ||: |
|
| 586 |
+ @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 ' ' :) ||: |
|
| 587 | 587 |
@test -n "$$(git diff --name-only $(BASE_COMMIT) @ | grep support)" && $(RM) -rf $(PHOTON_RPMS_DIR) ||: |
| 588 | 588 |
|
| ... | ... |
@@ -33,7 +33,7 @@ def main(): |
| 33 | 33 |
default=False, action="store_true") |
| 34 | 34 |
parser.add_argument("-y", "--generate-yaml-files", dest="generateYamlFiles",
|
| 35 | 35 |
default=False, action="store_true") |
| 36 |
- parser.add_argument("-d", "--dist", dest="dist",
|
|
| 36 |
+ parser.add_argument("-d", "--dist-tag", dest="dist",
|
|
| 37 | 37 |
default="") |
| 38 | 38 |
|
| 39 | 39 |
options = parser.parse_args() |
| ... | ... |
@@ -26,7 +26,10 @@ class Logger(object): |
| 26 | 26 |
# create console handler |
| 27 | 27 |
ch = logging.StreamHandler() |
| 28 | 28 |
fhformatter = logging.Formatter('%(asctime)s - %(name)s - %(message)s')
|
| 29 |
- chformatter = logging.Formatter('%(message)s')
|
|
| 29 |
+ if loglevel=="debug": |
|
| 30 |
+ chformatter = logging.Formatter('%(asctime)s - %(name)s - %(message)s')
|
|
| 31 |
+ else: |
|
| 32 |
+ chformatter = logging.Formatter('%(message)s')
|
|
| 30 | 33 |
# add formatter to handler |
| 31 | 34 |
fhandler.setFormatter(fhformatter) |
| 32 | 35 |
#fhandler.setLevel(logging.DEBUG) |
| ... | ... |
@@ -47,7 +47,7 @@ class PackageInfo(object): |
| 47 | 47 |
self.pkgList[rpmPkg] = listPkgAttributes |
| 48 | 48 |
self.logger.debug("Added " + rpmPkg + " rpm package to the list")
|
| 49 | 49 |
else: |
| 50 |
- self.logger.error("Missing rpm file for package:" + rpmPkg)
|
|
| 50 |
+ self.logger.debug("Missing rpm file for package:" + rpmPkg)
|
|
| 51 | 51 |
|
| 52 | 52 |
def writePkgListToFile(self, fileName): |
| 53 | 53 |
self.logger.debug("Writing package list to the json file")
|
| ... | ... |
@@ -51,7 +51,13 @@ class PackageManager(object): |
| 51 | 51 |
#TODO image name constants.buildContainerImageName |
| 52 | 52 |
if pkgCount > 0 or not self.dockerClient.images.list("photon_build_container:latest"):
|
| 53 | 53 |
self._createBuildContainer() |
| 54 |
+ self.logger.info("Step 2 : Building stage 2 of the toolchain...")
|
|
| 55 |
+ self.logger.info(constants.listToolChainPackages) |
|
| 56 |
+ self.logger.info("")
|
|
| 54 | 57 |
self._buildGivenPackages(constants.listToolChainPackages, buildThreads) |
| 58 |
+ self.logger.info("The entire toolchain is now available")
|
|
| 59 |
+ self.logger.info(45 * '-') |
|
| 60 |
+ self.logger.info("")
|
|
| 55 | 61 |
if self.pkgBuildType == "container": |
| 56 | 62 |
# Stage 2 build container |
| 57 | 63 |
#TODO: rebuild container only if anything in listToolChainPackages was built |
| ... | ... |
@@ -67,6 +73,9 @@ class PackageManager(object): |
| 67 | 67 |
self._buildGivenPackages(listPackages, buildThreads) |
| 68 | 68 |
else: |
| 69 | 69 |
self.buildToolChainPackages(buildThreads) |
| 70 |
+ self.logger.info("Step 3 : Building the following package(s) and dependencies...")
|
|
| 71 |
+ self.logger.info(listPackages) |
|
| 72 |
+ self.logger.info("")
|
|
| 70 | 73 |
self._buildGivenPackages(listPackages, buildThreads) |
| 71 | 74 |
self.logger.info("Package build has been completed")
|
| 72 | 75 |
self.logger.info("")
|
| ... | ... |
@@ -133,7 +142,6 @@ class PackageManager(object): |
| 133 | 133 |
if (pkg in self.listOfPackagesAlreadyBuilt and |
| 134 | 134 |
not constants.rpmCheck): |
| 135 | 135 |
listPackagesToBuild.remove(pkg) |
| 136 |
- |
|
| 137 | 136 |
if not self._readPackageBuildData(listPackagesToBuild): |
| 138 | 137 |
return False |
| 139 | 138 |
return True |
| ... | ... |
@@ -178,6 +186,12 @@ class PackageManager(object): |
| 178 | 178 |
self.logger.error("Unable to set paramaters. Terminating the package manager.")
|
| 179 | 179 |
raise Exception("Unable to set paramaters")
|
| 180 | 180 |
|
| 181 |
+ listBasePackageNamesAndVersions = list(map(lambda x:SPECS.getData().getBasePkg(x), listPackageNamesAndVersions)) |
|
| 182 |
+ listPackagesToBuild = list((set(listBasePackageNamesAndVersions) - set(alreadyBuiltRPMS))) |
|
| 183 |
+ if listPackagesToBuild: |
|
| 184 |
+ self.logger.info("List of packages yet to be built...")
|
|
| 185 |
+ self.logger.info(listPackagesToBuild) |
|
| 186 |
+ self.logger.info("")
|
|
| 181 | 187 |
statusEvent = threading.Event() |
| 182 | 188 |
self._initializeScheduler(statusEvent) |
| 183 | 189 |
self._initializeThreadPool(statusEvent) |
| ... | ... |
@@ -27,22 +27,22 @@ def main(): |
| 27 | 27 |
parser.add_argument("-i", "--input-type", dest="input_type", default=DEFAULT_INPUT_TYPE)
|
| 28 | 28 |
parser.add_argument("-p", "--pkg", dest="pkg")
|
| 29 | 29 |
parser.add_argument("-f", "--file", dest="json_file", default="packages_minimal.json")
|
| 30 |
- parser.add_argument("-d", "--disp", dest="display_option", default=DEFAULT_DISPLAY_OPTION)
|
|
| 31 |
- parser.add_argument("-s", "--spec-dir", dest="spec_dir", default=SPEC_FILE_DIR)
|
|
| 32 |
- parser.add_argument("-l", "--log-dir", dest="log_dir", default=LOG_FILE_DIR)
|
|
| 30 |
+ parser.add_argument("-d", "--display-option", dest="display_option", default=DEFAULT_DISPLAY_OPTION)
|
|
| 31 |
+ parser.add_argument("-s", "--spec-path", dest="spec_path", default=SPEC_FILE_DIR)
|
|
| 32 |
+ parser.add_argument("-l", "--log-path", dest="log_path", default=LOG_FILE_DIR)
|
|
| 33 | 33 |
parser.add_argument("-y", "--log-level", dest="log_level", default="info")
|
| 34 | 34 |
parser.add_argument("-t", "--stage-dir", dest="stage_dir", default="../../stage")
|
| 35 | 35 |
parser.add_argument("-a", "--input-data-dir", dest="input_data_dir", default="../../common/data/")
|
| 36 | 36 |
parser.add_argument("-o", "--output-dir", dest="output_dir", default="../../stage/common/data")
|
| 37 | 37 |
options = parser.parse_args() |
| 38 | 38 |
|
| 39 |
- constants.setSpecPath(options.spec_dir) |
|
| 40 |
- constants.setLogPath(options.log_dir) |
|
| 39 |
+ constants.setSpecPath(options.spec_path) |
|
| 40 |
+ constants.setLogPath(options.log_path) |
|
| 41 | 41 |
constants.setLogLevel(options.log_level) |
| 42 | 42 |
constants.initialize() |
| 43 | 43 |
|
| 44 | 44 |
cmdUtils = CommandUtils() |
| 45 |
- logger = Logger.getLogger("SpecDeps", options.log_dir, options.log_level)
|
|
| 45 |
+ logger = Logger.getLogger("SpecDeps", options.log_path, options.log_level)
|
|
| 46 | 46 |
|
| 47 | 47 |
if not os.path.isdir(options.output_dir): |
| 48 | 48 |
cmdUtils.runCommandInShell2("mkdir -p "+options.output_dir)
|
| ... | ... |
@@ -50,7 +50,7 @@ def main(): |
| 50 | 50 |
if not options.input_data_dir.endswith('/'):
|
| 51 | 51 |
options.input_data_dir += '/' |
| 52 | 52 |
try: |
| 53 |
- specDeps = SpecDependencyGenerator(options.log_dir, options.log_level) |
|
| 53 |
+ specDeps = SpecDependencyGenerator(options.log_path, options.log_level) |
|
| 54 | 54 |
|
| 55 | 55 |
if options.input_type == "remove-upward-deps": |
| 56 | 56 |
whoNeedsList = specDeps.process("get-upward-deps", options.pkg, options.display_option)
|
| ... | ... |
@@ -79,6 +79,7 @@ class ToolChainUtils(object): |
| 79 | 79 |
|
| 80 | 80 |
def buildCoreToolChainPackages(self): |
| 81 | 81 |
self.logger.info("Step 1 : Building the core toolchain packages.....")
|
| 82 |
+ self.logger.info(constants.listCoreToolChainPackages) |
|
| 82 | 83 |
self.logger.info("")
|
| 83 | 84 |
chrootID = None |
| 84 | 85 |
pkgCount = 0 |
| ... | ... |
@@ -38,7 +38,7 @@ def main(): |
| 38 | 38 |
parser.add_argument("-m", "--tool-chain-stage", dest="toolChainStage", default="None")
|
| 39 | 39 |
parser.add_argument("-c", "--pullsources-config", dest="pullsourcesConfig",
|
| 40 | 40 |
default="pullsources.conf") |
| 41 |
- parser.add_argument("-d", "--dist", dest="dist", default="")
|
|
| 41 |
+ parser.add_argument("-d", "--dist-tag", dest="dist", default="")
|
|
| 42 | 42 |
parser.add_argument("-k", "--input-RPMS-path", dest="inputRPMSPath", default=None)
|
| 43 | 43 |
parser.add_argument("-n", "--build-number", dest="buildNumber", default="0000000")
|
| 44 | 44 |
parser.add_argument("-v", "--release-version", dest="releaseVersion", default="NNNnNNN")
|
| ... | ... |
@@ -57,6 +57,7 @@ def main(): |
| 57 | 57 |
parser.add_argument("-pw", "--package-weights-path", dest="packageWeightsPath", default=None)
|
| 58 | 58 |
parser.add_argument("-bt", "--build-type", dest="pkgBuildType", default="chroot")
|
| 59 | 59 |
parser.add_argument("-F", "--kat-build", dest="katBuild", default=None)
|
| 60 |
+ parser.add_argument("-pj", "--packages-json-input", dest="pkgJsonInput", default=None)
|
|
| 60 | 61 |
parser.add_argument("PackageName", nargs='?')
|
| 61 | 62 |
options = parser.parse_args() |
| 62 | 63 |
cmdUtils = CommandUtils() |
| ... | ... |
@@ -106,6 +107,10 @@ def main(): |
| 106 | 106 |
logger.error("Given input Weights file is not a file:"+options.packageWeightsPath)
|
| 107 | 107 |
errorFlag = True |
| 108 | 108 |
|
| 109 |
+ if options.pkgJsonInput is not None and not os.path.isfile(options.pkgJsonInput): |
|
| 110 |
+ logger.error("Given input packages file is not a file:"+options.pkgJsonInput)
|
|
| 111 |
+ errorFlag = True |
|
| 112 |
+ |
|
| 109 | 113 |
if options.installPackage: |
| 110 | 114 |
if not options.PackageName: |
| 111 | 115 |
logger.error("Please provide package name")
|
| ... | ... |
@@ -175,6 +180,9 @@ def main(): |
| 175 | 175 |
pkgManager.buildToolChainPackages(options.buildThreads) |
| 176 | 176 |
elif options.installPackage: |
| 177 | 177 |
buildAPackage(package, options.buildThreads, options.pkgBuildType) |
| 178 |
+ elif options.pkgJsonInput: |
|
| 179 |
+ buildPackagesInJson(logger, options.buildThreads, pkgInfoJsonFile, |
|
| 180 |
+ options.pkgJsonInput, options.pkgBuildType) |
|
| 178 | 181 |
else: |
| 179 | 182 |
buildPackagesForAllSpecs(logger, options.buildThreads, pkgInfoJsonFile, |
| 180 | 183 |
options.pkgBuildType) |
| ... | ... |
@@ -194,13 +202,24 @@ def buildAPackage(package, buildThreads, pkgBuildType): |
| 194 | 194 |
constants.setTestForceRPMS(copy.copy(listPackages)) |
| 195 | 195 |
pkgManager.buildPackages(listPackages, buildThreads, pkgBuildType) |
| 196 | 196 |
|
| 197 |
+def buildPackagesInJson(logger, buildThreads, pkgInfoJsonFile, pkgJsonInput, pkgBuildType): |
|
| 198 |
+ listPackages = [] |
|
| 199 |
+ with open(pkgJsonInput) as jsonData: |
|
| 200 |
+ pkg_list_json = json.load(jsonData) |
|
| 201 |
+ listPackages = pkg_list_json["packages"] |
|
| 202 |
+ if constants.rpmCheck: |
|
| 203 |
+ constants.setTestForceRPMS(copy.copy(listPackages)) |
|
| 204 |
+ pkgManager = PackageManager(pkgBuildType=pkgBuildType) |
|
| 205 |
+ pkgManager.buildPackages(listPackages, buildThreads, pkgBuildType) |
|
| 206 |
+ |
|
| 207 |
+ # Generating package info file which is required by installer |
|
| 208 |
+ logger.debug("Writing Package info to the file:" + pkgInfoJsonFile)
|
|
| 209 |
+ pkgInfo = PackageInfo() |
|
| 210 |
+ pkgInfo.loadPackagesData() |
|
| 211 |
+ pkgInfo.writePkgListToFile(pkgInfoJsonFile) |
|
| 197 | 212 |
|
| 198 | 213 |
def buildPackagesForAllSpecs(logger, buildThreads, pkgInfoJsonFile, pkgBuildType): |
| 199 | 214 |
listPackages = SPECS.getData().getListPackages() |
| 200 |
- |
|
| 201 |
- logger.debug("List of all packages :")
|
|
| 202 |
- logger.debug(listPackages) |
|
| 203 |
- logger.info("")
|
|
| 204 | 215 |
if constants.rpmCheck: |
| 205 | 216 |
constants.setTestForceRPMS(copy.copy(listPackages)) |
| 206 | 217 |
pkgManager = PackageManager(pkgBuildType=pkgBuildType) |
| ... | ... |
@@ -217,7 +236,7 @@ def get_packages_with_build_options(pkg_build_options_file): |
| 217 | 217 |
if os.path.exists(pkg_build_options_file): |
| 218 | 218 |
with open(pkg_build_options_file) as jsonData: |
| 219 | 219 |
pkg_build_option_json = json.load(jsonData, object_pairs_hook=collections.OrderedDict) |
| 220 |
- constants.setBuidOptions(pkg_build_option_json) |
|
| 220 |
+ constants.setBuildOptions(pkg_build_option_json) |
|
| 221 | 221 |
|
| 222 | 222 |
def get_all_package_names(build_install_option): |
| 223 | 223 |
base_path = os.path.dirname(build_install_option) |