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

[Auke Kok]

Author: sofar
Date: 2006-12-02 19:07:04 +0100 (Sat, 02 Dec 2006)
New Revision: 22408

Modified:
   lunar-iso/trunk/Makefile
   lunar-iso/trunk/conf/config.in
Log:
Minor changes - pass ISO_KARCH around, minor/major version numbers.


Modified: lunar-iso/trunk/Makefile
===================================================================
--- lunar-iso/trunk/Makefile	2006-12-02 17:59:16 UTC (rev 22407)
+++ lunar-iso/trunk/Makefile	2006-12-02 18:07:04 UTC (rev 22408)
@@ -6,17 +6,22 @@
 # all user configurable options are in conf/config
 #
 
+# need to make this defined during run-time
+ISO_SOURCE = $(shell bash -c "pwd -P")
+
+# define the kernel arch name
+ISO_KARCH=$(shell arch | grep -qw i.86 && echo i386 || arch)
+
 include conf/config
 
 ISO_KSUFFIX = $(shell if echo $(ISO_KVER) | grep -q "^2\.6\." ; then echo 2.6 ; else echo 2.4 ; fi ;)
 
-# need to make this defined during run-time
-ISO_SOURCE = $(shell bash -c "pwd -P")
-
 # define the location where the ISO will be generated
 ISO_TARGET = $(ISO_SOURCE)/BUILD
 
-export ISO_SOURCE ISO_TARGET ISO_VERSION ISO_CODENAME ISO_DATE ISO_CNAME ISO_KVER ISO_PVER ISO_GRSVER ISO_LUNAR_MODULE ISO_KSUFFIX ISO_MAKES ISO_REDUCE ISO_BUILD
+export ISO_SOURCE ISO_TARGET ISO_MAJOR ISO_MINOR ISO_VERSION ISO_CODENAME \
+       ISO_DATE ISO_CNAME ISO_KVER ISO_PVER ISO_GRSVER ISO_LUNAR_MODULE \
+       ISO_KSUFFIX ISO_MAKES ISO_REDUCE ISO_BUILD ISO_KARCH
 
 all: iso
 
@@ -102,7 +107,7 @@
 	rm -f kernels/safe kernels/safe.map
 
 dist: lunar-$(ISO_VERSION).iso
-	bzip2 < lunar-$(ISO_VERSION).iso > lunar-$(ISO_VERSION).iso.bz2
+	bzip2 -k lunar-$(ISO_VERSION).iso
 	md5sum lunar-$(ISO_VERSION).iso > lunar-$(ISO_VERSION).iso.md5
 	md5sum lunar-$(ISO_VERSION).iso.bz2 > lunar-$(ISO_VERSION).iso.bz2.md5
 

Modified: lunar-iso/trunk/conf/config.in
===================================================================
--- lunar-iso/trunk/conf/config.in	2006-12-02 17:59:16 UTC (rev 22407)
+++ lunar-iso/trunk/conf/config.in	2006-12-02 18:07:04 UTC (rev 22408)
@@ -6,16 +6,18 @@
 # copy this file to 'config' and edit your settings as needed
 
 # the ISO FULL version number
-ISO_VERSION = NOVERSION
+ISO_MAJOR = 1.6.1
+ISO_MINOR = rc1
+ISO_VERSION = $(ISO_MAJOR)-$(ISO_MINOR)-$(ISO_KARCH)
 
 # the ISO codename (i.e. Gen. P. Fault)
-ISO_CODENAME = UNNAMED
+ISO_CODENAME = Moose Drool
 
 # the release/offical date tag - must be in the form of YYYYMMDD
-ISO_DATE = 20050201
+ISO_DATE = 20061130
 
 # the iso BUILD arch:
-ISO_BUILD = i686-pc-linux-gnu
+ISO_BUILD = $(ISO_KARCH)-pc-linux-gnu
 
 # this copncatenates the full name
 ISO_CNAME = $(ISO_VERSION) ($(ISO_CODENAME) - $(ISO_DATE))
@@ -29,14 +31,12 @@
 
 ## for 2.6 kernels - read this:
 # the kernel version used on the ISO
-ISO_KVER = 2.6.14
+ISO_KVER = 2.6.18
 # the patch LEVEL used (from kernel.org)
-ISO_PVER = 2.6.14.4
-# and for grsecurity
-ISO_GRSVER = 2.1.7-2.6.14.3-200512111706
+ISO_PVER = 2.6.18.3
 
 # which lunar core tools do we want on the ISO
 ISO_LUNAR_MODULE = lunar
 
 # set this to number of makes for parallel builds or leave empty
-#ISO_MAKES = 2
+# ISO_MAKES = 2