Browse code

Add new targets in Makefile. Fix bug in mk-install-iso script.

Touseef Liaqat authored on 2015/08/08 18:58:40
Showing 2 changed files
... ...
@@ -44,7 +44,7 @@ clean-install clean-chroot
44 44
 
45 45
 THREADS?=1
46 46
 
47
-all: iso micro-iso minimal-iso docker-image
47
+all: iso micro-iso minimal-iso docker-image ostree-host-iso live-iso
48 48
 
49 49
 micro: micro-iso
50 50
 
... ...
@@ -122,7 +122,7 @@ packages-minimal: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)
122 122
 		-c $(PHOTON_BINTRAY_CONFIG) \
123 123
                 -t ${THREADS}
124 124
 
125
-iso: 
125
+iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES) ostree-repo
126 126
 	@echo "Building Photon FUll ISO..."
127 127
 	@cd $(PHOTON_INSTALLER_DIR) && \
128 128
         sudo $(PHOTON_INSTALLER) -i $(PHOTON_STAGE)/photon.iso \
... ...
@@ -38,7 +38,11 @@ WORKINGDIR=${BUILDROOT}
38 38
 BUILDROOT=${BUILDROOT}/photon-chroot
39 39
 
40 40
 cp -r BUILD_DVD/isolinux ${WORKINGDIR}/
41
-mv ${WORKINGDIR}/isolinux/live-menu.cfg ${WORKINGDIR}/isolinux/menu.cfg
41
+
42
+if [ "$LIVE_CD" = true ] ; then
43
+    mv ${WORKINGDIR}/isolinux/live-menu.cfg ${WORKINGDIR}/isolinux/menu.cfg
44
+fi
45
+
42 46
 cp sample_ks.cfg ${WORKINGDIR}/isolinux/
43 47
 
44 48
 find ${BUILDROOT} -name linux-[0-9]*.rpm | head -1 | xargs rpm2cpio | cpio -iv --to-stdout ./boot/vmlinuz* > ${WORKINGDIR}/isolinux/vmlinuz
... ...
@@ -160,7 +164,3 @@ mkisofs -R -l -L -D -b isolinux/isolinux.bin -c isolinux/boot.cat \
160 160
 		$WORKINGDIR >$ISO_OUTPUT_NAME
161 161
 
162 162
 popd
163
-
164
-
165
-
166
-