[Lunar-commits] r22793 - in lunar-iso/trunk: . conf scripts template/etc/lunar/local

[Auke Kok]

Author: sofar
Date: 2006-12-29 17:56:38 +0100 (Fri, 29 Dec 2006)
New Revision: 22793

Modified:
   lunar-iso/trunk/Makefile
   lunar-iso/trunk/conf/config.in
   lunar-iso/trunk/scripts/aaa_base
   lunar-iso/trunk/scripts/rebuild
   lunar-iso/trunk/template/etc/lunar/local/optimizations.GCC_3_4
Log:
Make the gcc optimization part of the config to facilitate building differently optimized iso's easily


Modified: lunar-iso/trunk/Makefile
===================================================================
--- lunar-iso/trunk/Makefile	2006-12-29 16:49:06 UTC (rev 22792)
+++ lunar-iso/trunk/Makefile	2006-12-29 16:56:38 UTC (rev 22793)
@@ -23,7 +23,7 @@
 
 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
+       ISO_KSUFFIX ISO_MAKES ISO_REDUCE ISO_BUILD ISO_KARCH ISO_GCCARCH
 
 all: iso
 

Modified: lunar-iso/trunk/conf/config.in
===================================================================
--- lunar-iso/trunk/conf/config.in	2006-12-29 16:49:06 UTC (rev 22792)
+++ lunar-iso/trunk/conf/config.in	2006-12-29 16:56:38 UTC (rev 22793)
@@ -7,8 +7,9 @@
 
 # the ISO major version number
 ISO_MAJOR = 1.6.1
+
 # minor version (pre, rc, etc). leave empty for final release
-ISO_MINOR = rc1
+ISO_MINOR = rc2
 
 ifeq (,$(ISO_MINOR))
   ISO_VERSION = $(ISO_MAJOR)-$(ISO_ARCH)
@@ -20,7 +21,7 @@
 ISO_CODENAME = Moose Drool
 
 # the release/offical date tag - must be in the form of YYYYMMDD
-ISO_DATE = 20061130
+ISO_DATE = 20061228
 
 # the iso BUILD arch:
 ISO_BUILD = $(ISO_ARCH)-pc-linux-gnu
@@ -37,12 +38,15 @@
 
 ## for 2.6 kernels - read this:
 # the kernel version used on the ISO
-ISO_KVER = 2.6.18
+ISO_KVER = 2.6.19
 # the patch LEVEL used (from kernel.org)
-ISO_PVER = 2.6.18.3
+ISO_PVER = 2.6.19.1
 
 # 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
+
+# set this to the base optimization (e.g. i386, i586, i686, x86-64)
+ISO_GCCARCH = i686

Modified: lunar-iso/trunk/scripts/aaa_base
===================================================================
--- lunar-iso/trunk/scripts/aaa_base	2006-12-29 16:49:06 UTC (rev 22792)
+++ lunar-iso/trunk/scripts/aaa_base	2006-12-29 16:56:38 UTC (rev 22793)
@@ -22,7 +22,7 @@
 chroot $ISO_TARGET ccache -M 256M
 rm -rf $ISO_TARGET/etc/ssh/ssh_host_*key $ISO_TARGET/etc/ssh/ssh_host_*key.pub
 rmdir /usr/lib/locale/*
-sed -i 's/^MAKES=.*/MAKES=/' $ISO_TARGET/etc/lunar/local/optimizations
+sed -i 's/^MAKES=.*/MAKES=/' $ISO_TARGET/etc/lunar/local/optimizations.GNU_MAKE
 # this might go wrong so force it's removal before creating it as empty file:
 rm -f $ISO_TARGET/etc/mtab
 > $ISO_TARGET/etc/mtab

Modified: lunar-iso/trunk/scripts/rebuild
===================================================================
--- lunar-iso/trunk/scripts/rebuild	2006-12-29 16:49:06 UTC (rev 22792)
+++ lunar-iso/trunk/scripts/rebuild	2006-12-29 16:56:38 UTC (rev 22793)
@@ -1,16 +1,16 @@
 #!/bin/bash
 
-echo "+ Starting rebuild of all modules"
-. /etc/lunar/config
-
 export LC_ALL=C
 
+echo "CPU=$ISO_GCCARCH" >> $ISO_TARGET/etc/lunar/local/optimizations.GCC_3_4
 # do the parallel thingy?
 if [ -n "$ISO_MAKES" ]; then
-  sedit '/MAKES=/d' $ISO_TARGET/etc/lunar/local/optimizations
-  echo "MAKES=$ISO_MAKES" >> $ISO_TARGET/etc/lunar/local/optimizations
+  echo "MAKES=$ISO_MAKES" >> $ISO_TARGET/etc/lunar/local/optimizations.GNU_MAKE
 fi
 
+echo "+ Starting rebuild of all modules"
+. /etc/lunar/config
+
 export VERBOSE=off
 export BOOTLOADER=none
 

Modified: lunar-iso/trunk/template/etc/lunar/local/optimizations.GCC_3_4
===================================================================
--- lunar-iso/trunk/template/etc/lunar/local/optimizations.GCC_3_4	2006-12-29 16:49:06 UTC (rev 22792)
+++ lunar-iso/trunk/template/etc/lunar/local/optimizations.GCC_3_4	2006-12-29 16:56:38 UTC (rev 22793)
@@ -1,4 +1,3 @@
-CPU=i686
 BOPT=Faster
 SPD=(  )
 XTRA=(  )