[Lunar-commits] r15061 - lunar-iso/branches/lunar-iso-2.6/conf

[Jaime Buffery]

Author: nestu
Date: 2005-05-25 21:44:00 +0000 (Wed, 25 May 2005)
New Revision: 15061

Modified:
   lunar-iso/branches/lunar-iso-2.6/conf/base.list
   lunar-iso/branches/lunar-iso-2.6/conf/config.in
   lunar-iso/branches/lunar-iso-2.6/conf/extended.list
   lunar-iso/branches/lunar-iso-2.6/conf/sources.list
Log:
Syncing with trunk


Modified: lunar-iso/branches/lunar-iso-2.6/conf/base.list
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/conf/base.list	2005-05-25 21:36:36 UTC (rev 15060)
+++ lunar-iso/branches/lunar-iso-2.6/conf/base.list	2005-05-25 21:44:00 UTC (rev 15061)
@@ -50,3 +50,8 @@
 pciutils
 hdparm
 net-tools
+console-data
+console-tools
+popt
+rsync
+zile

Modified: lunar-iso/branches/lunar-iso-2.6/conf/config.in
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/conf/config.in	2005-05-25 21:36:36 UTC (rev 15060)
+++ lunar-iso/branches/lunar-iso-2.6/conf/config.in	2005-05-25 21:44:00 UTC (rev 15061)
@@ -11,8 +11,8 @@
 # the ISO codename (i.e. Gen. P. Fault)
 ISO_CODENAME = UNNAMED
 
-# the release/offical date tag
-ISO_DATE = $(shell date -u +%Y%m%d)
+# the release/offical date tag - must be in the form of YYYYMMDD
+ISO_DATE = 20050201
 
 # this copncatenates the full name
 ISO_CNAME = $(ISO_VERSION) ($(ISO_CODENAME) - $(ISO_DATE))
@@ -26,3 +26,5 @@
 # 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

Modified: lunar-iso/branches/lunar-iso-2.6/conf/extended.list
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/conf/extended.list	2005-05-25 21:36:36 UTC (rev 15060)
+++ lunar-iso/branches/lunar-iso-2.6/conf/extended.list	2005-05-25 21:44:00 UTC (rev 15061)
@@ -7,19 +7,15 @@
 xdelta
 cracklib
 chkconfig
-popt
 installwatch
 check
 diffutils
 texinfo
 portmap
 lunar-tools
-console-data
 rpmunpack
 ppp
 tnftp
-rsync
-console-tools
 lynx
 pppconfig
 nfs-utils
@@ -45,7 +41,6 @@
 gettext
 nasm
 mailx
-db
 iproute2
 iptables
 xinetd
@@ -54,3 +49,4 @@
 acl
 attr
 vim
+joe

Modified: lunar-iso/branches/lunar-iso-2.6/conf/sources.list
===================================================================
--- lunar-iso/branches/lunar-iso-2.6/conf/sources.list	2005-05-25 21:36:36 UTC (rev 15060)
+++ lunar-iso/branches/lunar-iso-2.6/conf/sources.list	2005-05-25 21:44:00 UTC (rev 15061)
@@ -1,7 +1,12 @@
 makedev
+iptables
 pcmcia-cs
 hostap-driver
 mwavem
 dhcp
 wlan-ng-driver
 isdn4k-utils
+slmodem
+pctel
+ltmodem
+NFORCE