Browse code

Dist tag: .ph1tp2 (definition is in makedefs.mk)

YustasSwamp authored on 2015/08/12 05:27:30
Showing 3 changed files
... ...
@@ -71,6 +71,7 @@ packages-micro: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)
71 71
                 -p $(PHOTON_PUBLISH_RPMS_DIR) \
72 72
                 -j $(PHOTON_DATA_DIR)/build_install_options_micro.json \
73 73
 		-c $(PHOTON_BINTRAY_CONFIG) \
74
+		-d $(PHOTON_DIST_TAG) \
74 75
                 -t ${THREADS}
75 76
 
76 77
 minimal: minimal-iso
... ...
@@ -120,6 +121,7 @@ packages-minimal: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)
120 120
                 -p $(PHOTON_PUBLISH_RPMS_DIR) \
121 121
                 -j $(PHOTON_DATA_DIR)/build_install_options_minimal.json \
122 122
 		-c $(PHOTON_BINTRAY_CONFIG) \
123
+		-d $(PHOTON_DIST_TAG) \
123 124
                 -t ${THREADS}
124 125
 
125 126
 iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES) ostree-repo
... ...
@@ -145,6 +147,7 @@ packages: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)
145 145
                 -p $(PHOTON_PUBLISH_RPMS_DIR) \
146 146
                 -j $(PHOTON_DATA_DIR)/build_install_options_all.json \
147 147
 		-c $(PHOTON_BINTRAY_CONFIG) \
148
+		-d $(PHOTON_DIST_TAG) \
148 149
                 -t ${THREADS}
149 150
 
150 151
 tool-chain-stage1: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)
... ...
@@ -160,6 +163,7 @@ tool-chain-stage1: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)
160 160
                 -j $(PHOTON_DATA_DIR)/build_install_options_all.json \
161 161
                 -t ${THREADS} \
162 162
 		-c $(PHOTON_BINTRAY_CONFIG) \
163
+		-d $(PHOTON_DIST_TAG) \
163 164
                 -m stage1
164 165
 
165 166
 tool-chain-stage2: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)
... ...
@@ -175,6 +179,7 @@ tool-chain-stage2: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) $(CONTAIN)
175 175
                 -j $(PHOTON_DATA_DIR)/build_install_options_all.json \
176 176
                 -t ${THREADS} \
177 177
 		-c $(PHOTON_BINTRAY_CONFIG) \
178
+		-d $(PHOTON_DIST_TAG) \
178 179
                 -m stage2
179 180
 
180 181
 
... ...
@@ -364,6 +369,7 @@ check-packer-ovf-plugin:
364 364
                               -x $(PHOTON_SRCS_DIR) \
365 365
                               -p $(PHOTON_PUBLISH_RPMS_DIR) \
366 366
                               -c $(PHOTON_BINTRAY_CONFIG) \
367
+			      -d $(PHOTON_DIST_TAG) \
367 368
                               -l $(PHOTON_LOGS_DIR)
368 369
 
369 370
 $(TOOLS_BIN):
... ...
@@ -45,3 +45,4 @@ PHOTON_PACKER_TEMPLATES=$(SRCROOT)/support/packer-templates
45 45
 
46 46
 PHOTON_CHROOT_PATH:=$(PHOTON_STAGE)/photonroot
47 47
 PHOTON_FS_ROOT=/usr/src/photon
48
+PHOTON_DIST_TAG?=.ph1tp2
... ...
@@ -28,7 +28,7 @@ def main():
28 28
     parser.add_option("-t",  "--threads", dest="buildThreads",  default=1, type="int", help="Numbeer of working threads")
29 29
     parser.add_option("-m",  "--tool-chain-stage", dest="toolChainStage",  default="None")
30 30
     parser.add_option("-c",  "--pullsources-config", dest="pullsourcesConfig",  default="pullsources.conf")
31
-    parser.add_option("-d",  "--dist", dest="dist",  default="phTP2")
31
+    parser.add_option("-d",  "--dist", dest="dist",  default="")
32 32
 
33 33
     (options,  args) = parser.parse_args()
34 34
     cmdUtils=CommandUtils()