[nst-cvs] livecd/include/make iso.mk,1.3,1.4

[Paul B. <pbl...@us...>]

Update of /cvsroot/nst/livecd/include/make
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27072/livecd/include/make

Modified Files:
	iso.mk 
Log Message:
Changed name of final ISO from: nst-2.10.0.iso to nst-2.10.0.$(uname
-i).iso to include the hardware platform of the OS in the file name.

Ron, it looks like the dvd+rw target should be OK (I did a make -n - but
didn't actually burn a disk).



Index: iso.mk
===================================================================
RCS file: /cvsroot/nst/livecd/include/make/iso.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** iso.mk	28 Apr 2009 19:54:50 -0000	1.3
--- iso.mk	29 Apr 2009 01:51:03 -0000	1.4
***************
*** 8,12 ****
  PROCESS_TEMPLATE = sed -f "tmp/sed/process_template.sed"
  
! ISO = $(TAG)-$(NST_RPM_VERSION).iso
  
  #
--- 8,12 ----
  PROCESS_TEMPLATE = sed -f "tmp/sed/process_template.sed"
  
! ISO = $(TAG)-$(NST_RPM_VERSION).$(HWARCH).iso
  
  #
***************
*** 102,106 ****
  	  time livecd-creator \
  	    --config="tmp/livecd/$(TAG)-livecd.ks" \
! 	    --fslabel="nst-$(NST_RPM_VERSION)" \
  	    --tmpdir="$(SRCDIR)/livecd/tmp" \
  	    --cache="cache" 2>&1 | tee iso.log; \
--- 102,106 ----
  	  time livecd-creator \
  	    --config="tmp/livecd/$(TAG)-livecd.ks" \
! 	    --fslabel="nst-$(NST_RPM_VERSION).$(HWARCH)" \
  	    --tmpdir="$(SRCDIR)/livecd/tmp" \
  	    --cache="cache" 2>&1 | tee iso.log; \
***************
*** 108,112 ****
  	  time livecd-creator \
  	    --config="tmp/livecd/$(TAG)-livecd.ks" \
! 	    --fslabel="nst-$(NST_RPM_VERSION)" \
  	    --tmpdir="$(SRCDIR)/livecd/tmp" \
  	    --cache="cache"; \
--- 108,112 ----
  	  time livecd-creator \
  	    --config="tmp/livecd/$(TAG)-livecd.ks" \
! 	    --fslabel="nst-$(NST_RPM_VERSION).$(HWARCH)" \
  	    --tmpdir="$(SRCDIR)/livecd/tmp" \
  	    --cache="cache"; \
***************
*** 120,124 ****
  	    --base-on="tmp/$(ISO)" \
  	    --config="tmp/livecd/$(TAG)-livecd.ks" \
! 	    --fslabel="nst-$(NST_RPM_VERSION)" \
  	    --tmpdir="$(SRCDIR)/livecd/tmp" \
  	    --cache="cache"; \
--- 120,124 ----
  	    --base-on="tmp/$(ISO)" \
  	    --config="tmp/livecd/$(TAG)-livecd.ks" \
! 	    --fslabel="nst-$(NST_RPM_VERSION).$(HWARCH)" \
  	    --tmpdir="$(SRCDIR)/livecd/tmp" \
  	    --cache="cache"; \
***************
*** 144,151 ****
  	time livecd-creator \
  	    --config="tmp/livecd/$(PKG)-livecd.ks" \
! 	    --fslabel="nst-$(NST_RPM_VERSION)" \
  	    --tmpdir="$(SRCDIR)/livecd/tmp" \
  	    --cache="cache";
! 	$(MV) "nst-$(NST_RPM_VERSION).iso" "$(PKG)-$(NST_RPM_VERSION).iso";
  
  #
--- 144,151 ----
  	time livecd-creator \
  	    --config="tmp/livecd/$(PKG)-livecd.ks" \
! 	    --fslabel="nst-$(NST_RPM_VERSION).$(HWARCH)" \
  	    --tmpdir="$(SRCDIR)/livecd/tmp" \
  	    --cache="cache";
! 	$(MV) "nst-$(NST_RPM_VERSION).$(HWARCH).iso" "$(PKG)-$(NST_RPM_VERSION).$(HWARCH).iso";
  
  #