1. photon
  2. Commit f50010534452d837c9d162bd09fd94bd5618e5cd
Browse code

Adding make option to enable rpm check

Change-Id: Ib4777614e21109839be9256aa41138cc6ba99201
Reviewed-on: http://photon-jenkins.eng.vmware.com/298
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: Sharath George

dthaluru authored on 2016/01/05 09:36:41
Showing 1 changed files
Makefile
History View file @ f500105
... ... 
@@ -41,6 +41,12 @@ else
41 41 
 PHOTON_PUBLISH_RPMS := publish-rpms
42 42 
 endif
43 43
44 
+ifdef PHOTON_ENABLE_RPMCHECK
45 
+PHOTON_RPMCHECK_OPTION := -u
46 
+else
47 
+PHOTON_RPMCHECK_OPTION :=
48 
+endif
49 
+
44 50 
 TOOLS_BIN := $(SRCROOT)/tools/bin
45 51 
 CONTAIN := $(TOOLS_BIN)/contain
46 52
... ... 
@@ -84,6 +90,7 @@ packages-micro: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) g
84 84 
                 -d $(PHOTON_DIST_TAG) \
85 85 
                 -n $(PHOTON_BUILD_NUMBER) \
86 86 
                 -v $(PHOTON_RELEASE_VERSION) \
87 
+                $(PHOTON_RPMCHECK_OPTION) \
87 88 
                 -t ${THREADS}
88 89
89 90 
 minimal: minimal-iso
... ... 
@@ -146,6 +153,7 @@ packages-minimal: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)
146 146 
                 -d $(PHOTON_DIST_TAG) \
147 147 
                 -n $(PHOTON_BUILD_NUMBER) \
148 148 
                 -v $(PHOTON_RELEASE_VERSION) \
149 
+                $(PHOTON_RPMCHECK_OPTION) \
149 150 
                 -t ${THREADS}
150 151
151 152 
 iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES) ostree-repo
... ... 
@@ -190,6 +198,7 @@ packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTA
190 190 
                 -d $(PHOTON_DIST_TAG) \
191 191 
                 -n $(PHOTON_BUILD_NUMBER) \
192 192 
                 -v $(PHOTON_RELEASE_VERSION) \
193 
+                $(PHOTON_RPMCHECK_OPTION) \
193 194 
                 -t ${THREADS}
194 195
195 196 
 updated-packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists
... ... 
@@ -208,6 +217,7 @@ updated-packages: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)
208 208 
                 -n $(PHOTON_BUILD_NUMBER) \
209 209 
                 -v $(PHOTON_RELEASE_VERSION) \
210 210 
                 -k $(PHOTON_INPUT_RPMS_DIR) \
211 
+                $(PHOTON_RPMCHECK_OPTION) \
211 212 
                 -t ${THREADS}
212 213
213 214 
 tool-chain-stage1: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists
... ... 
@@ -227,6 +237,7 @@ tool-chain-stage1: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES
227 227 
                 -d $(PHOTON_DIST_TAG) \
228 228 
                 -n $(PHOTON_BUILD_NUMBER) \
229 229 
                 -v $(PHOTON_RELEASE_VERSION) \
230 
+                $(PHOTON_RPMCHECK_OPTION) \
230 231 
                 -m stage1
231 232
232 233 
 tool-chain-stage2: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN) generate-dep-lists
... ... 
@@ -246,6 +257,7 @@ tool-chain-stage2: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES
246 246 
                 -d $(PHOTON_DIST_TAG) \
247 247 
                 -n $(PHOTON_BUILD_NUMBER) \
248 248 
                 -v $(PHOTON_RELEASE_VERSION) \
249 
+                $(PHOTON_RPMCHECK_OPTION) \
249 250 
                 -m stage2
250 251
251 252
... ... 
@@ -454,6 +466,7 @@ check-packer-ovf-plugin:
454 454 
                               -d $(PHOTON_DIST_TAG) \
455 455 
                               -n $(PHOTON_BUILD_NUMBER) \
456 456 
                               -v $(PHOTON_RELEASE_VERSION) \
457 
+                              $(PHOTON_RPMCHECK_OPTION) \
457 458 
                               -l $(PHOTON_LOGS_DIR)
458 459
459 460 
 $(TOOLS_BIN):