[Lunar-commits] r22412 - in lunar-iso/trunk: . conf

[Auke Kok]

Author: sofar
Date: 2006-12-02 19:53:18 +0100 (Sat, 02 Dec 2006)
New Revision: 22412

Modified:
   lunar-iso/trunk/Makefile
   lunar-iso/trunk/conf/config.in
Log:
More fixes - make it know the sub-arch for the final name (so it shows i686 instead of i386) and lose the -subversion for the final release. Also pass ISO_ARCH around


Modified: lunar-iso/trunk/Makefile
===================================================================
--- lunar-iso/trunk/Makefile	2006-12-02 18:48:14 UTC (rev 22411)
+++ lunar-iso/trunk/Makefile	2006-12-02 18:53:18 UTC (rev 22412)
@@ -11,6 +11,8 @@
 
 # define the kernel arch name
 ISO_KARCH=$(shell arch | grep -qw i.86 && echo i386 || arch)
+# and the general arch (i386/i686)
+ISO_ARCH=$(shell arch)
 
 include conf/config
 

Modified: lunar-iso/trunk/conf/config.in
===================================================================
--- lunar-iso/trunk/conf/config.in	2006-12-02 18:48:14 UTC (rev 22411)
+++ lunar-iso/trunk/conf/config.in	2006-12-02 18:53:18 UTC (rev 22412)
@@ -5,11 +5,17 @@
 
 # copy this file to 'config' and edit your settings as needed
 
-# the ISO FULL version number
+# the ISO major version number
 ISO_MAJOR = 1.6.1
+# minor version (pre, rc, etc). leave empty for final release
 ISO_MINOR = rc1
-ISO_VERSION = $(ISO_MAJOR)-$(ISO_MINOR)-$(ISO_KARCH)
 
+ifeq (,$(ISO_MINOR))
+  ISO_VERSION = $(ISO_MAJOR)-$(ISO_ARCH)
+else
+  ISO_VERSION = $(ISO_MAJOR)-$(ISO_MINOR)-$(ISO_ARCH)
+endif
+
 # the ISO codename (i.e. Gen. P. Fault)
 ISO_CODENAME = Moose Drool
 
@@ -17,7 +23,7 @@
 ISO_DATE = 20061130
 
 # the iso BUILD arch:
-ISO_BUILD = $(ISO_KARCH)-pc-linux-gnu
+ISO_BUILD = $(ISO_ARCH)-pc-linux-gnu
 
 # this copncatenates the full name
 ISO_CNAME = $(ISO_VERSION) ($(ISO_CODENAME) - $(ISO_DATE))