X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=190732ef10012f4d35a3922311e4a7098b70eb4b;hp=8a1b9832225fd177fa713f67691d0f86cf7a713b;hb=5b2a12ff8ad39591a5a57a0f2122edc2934f5ec3;hpb=9674ef0d418c7fbb6cff5b0981966b9206131569

diff --git a/make.sh b/make.sh
old mode 100644
new mode 100755
index 8a1b983222..190732ef10
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"				# Software name
 SNAME="ipfire"			# Short name
-VERSION="2.0b"			# Version number
+VERSION="2.0t4"			# Version number
 SLOGAN="www.ipfire.org"		# Software slogan
 CONFIG_ROOT=/var/ipfire		# Configuration rootdir
 NICE=10				# Nice level
@@ -298,6 +298,7 @@ buildbase() {
     lfsmake2 man
     lfsmake2 mktemp
     lfsmake2 modutils
+    lfsmake2 mtd
     lfsmake2 net-tools
     lfsmake2 patch
     lfsmake2 psmisc
@@ -329,13 +330,13 @@ buildipfire() {
   ipfiremake ipp2p			SMP=1
   ipfiremake fcdsl			SMP=1
   ipfiremake fcdsl2			SMP=1
-  ipfiremake fcdslsl			SMP=1
+  ipfiremake fcdslsl		SMP=1
   ipfiremake fcdslusb		SMP=1
-  ipfiremake fcdslslusb		SMP=1
-  ipfiremake fcpci			SMP=1
+  ipfiremake fcdslslusb	SMP=1
 #  ipfiremake promise-sata-300-tx	SMP=1
   ipfiremake zaptel			SMP=1
-  ipfiremake fuse			SMP=1
+  ipfiremake fuse				SMP=1
+  #ipfiremake linux			XEN=1
   ipfiremake linux
   ipfiremake ipp2p
   ipfiremake fcdsl
@@ -343,12 +344,14 @@ buildipfire() {
   ipfiremake fcdslsl
   ipfiremake fcdslusb
   ipfiremake fcdslslusb
-  ipfiremake fcpci
 #  ipfiremake promise-sata-300-tx
   ipfiremake zaptel
   ipfiremake fuse
   ipfiremake pkg-config
   ipfiremake cpio
+  ipfiremake klibc
+  ipfiremake mkinitcpio
+  ipfiremake udev				KLIBC=1
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
@@ -359,10 +362,8 @@ buildipfire() {
   ipfiremake libjpeg
   ipfiremake libpng
   ipfiremake libtiff
-  ipfiremake lcms
-  ipfiremake libmng
-  ipfiremake freetype
   ipfiremake libart
+  ipfiremake freetype
   ipfiremake gd
   ipfiremake popt
   ipfiremake pcre
@@ -371,6 +372,7 @@ buildipfire() {
   ipfiremake libcap
   ipfiremake pciutils
   ipfiremake libxml2
+  ipfiremake libxslt
   ipfiremake BerkeleyDB
   ipfiremake mysql
   ipfiremake cyrus-sasl
@@ -384,7 +386,6 @@ buildipfire() {
   ipfiremake capi4k-utils
   ipfiremake cdrtools
   ipfiremake dnsmasq
-  ipfiremake libaal
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
   ipfiremake squashfstools
@@ -411,8 +412,8 @@ buildipfire() {
   ipfiremake iptstate
   ipfiremake iputils
   ipfiremake l7-protocols
-  ipfiremake isapnptools
-#  ipfiremake isdn4k-utils # What about mISDN???
+  ipfiremake isdn4k-utils
+  ipfiremake mISDN
   ipfiremake hwdata
   ipfiremake kudzu
   ipfiremake logrotate
@@ -420,7 +421,6 @@ buildipfire() {
   ipfiremake misc-progs
   ipfiremake mtools
   ipfiremake nano
-  ipfiremake nash
   ipfiremake nasm
   ipfiremake URI
   ipfiremake HTML-Tagset
@@ -471,7 +471,6 @@ buildipfire() {
   ipfiremake 3c5x9setup
   ipfiremake pakfire
   ipfiremake java
-  ipfiremake bootsplash
   ipfiremake spandsp
   ipfiremake lzo
   ipfiremake openvpn
@@ -524,6 +523,9 @@ buildipfire() {
   ipfiremake bwm-ng
   ipfiremake tripwire
   ipfiremake sysstat
+  ipfiremake vsftpd
+  ipfiremake alsa
+  ipfiremake mp3blaster
 }
 
 buildinstaller() {
@@ -558,6 +560,7 @@ buildinstaller() {
   installmake util-linux
   installmake pciutils
   installmake zlib
+  installmake mtd
   installmake wget
   installmake hwdata
   installmake kudzu
@@ -623,23 +626,30 @@ buildpackages() {
 }
 
 ipfirepackages() {
+  ipfiredist alsa
 #  ipfiredist amavisd
 #  ipfiredist applejuice
 #  ipfiredist asterisk
   ipfiredist clamav
-#  ipfiredist cups
-#  ipfiredist cyrusimap
+  ipfiredist cups
+  ipfiredist cyrus-sasl
 #  ipfiredist fetchmail
 #  ipfiredist gnump3d
 #  ipfiredist java
+  ipfiredist libogg
+  ipfiredist libvorbis
 #  ipfiredist mailx
 #  ipfiredist mldonkey
+  ipfiredist mp3blaster
+  ipfiredist mpg123
 #  ipfiredist nfs
+  ipfiredist openldap
 #  ipfiredist postfix
   ipfiredist samba
 #  ipfiredist sox
 #  ipfiredist spamassassin
   ipfiredist tripwire
+  ipfiredist vsftpd
 #  ipfiredist webcyradm
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
   mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1
@@ -947,7 +957,7 @@ upload)
 	  iso)
 		echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION."
 		cat <<EOF > .ftp-commands
-mkdir -p $FTP_ISO_PATH/$SVN_REVISION
+mkdir -p $FTP_ISO_PATH$SVN_REVISION
 ls -lah
 quit
 EOF
@@ -975,7 +985,7 @@ EOF
 		;;
 	  paks)
 		cat <<EOF > .ftp-commands
-mkdir -p $FTP_ISO_PATH/$SVN_REVISION/paks
+mkdir -p $FTP_ISO_PATH$SVN_REVISION/paks
 ls -lah
 quit
 EOF