X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=abb99ec85d2c186d62e670ce82501c38501c52a4;hb=ae440541d67b6ab659d18fe87e3c3166a139e511;hp=f2dfe6c9a6b75e117ed6bd5ce8383d5545303e69;hpb=24fd09e43c97759d1817da0c0b05dc075c1e0e11;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/make.sh b/make.sh
index f2dfe6c9a6..abb99ec85d 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.0beta1"							# Version number
+VERSION="2.1"										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
 NICE=10													# Nice level
@@ -35,11 +35,6 @@ SVN_REVISION=`svn info | grep Revision | cut -c 11-`
 
 IPFVER="full"				# Which versions should be compiled? (full|devel)
 
-# Set an information about the build number
-if [ -e ./.svn ]; then
-	FIREBUILD=`cat .svn/entries |sed -n 's/^[ \t]*revision=\"// p' | sed -n 's/\".*$// p'`
-fi
-
 # Debian specific settings
 if [ ! -e /etc/debian_version ]; then
 	FULLPATH=`which $0`
@@ -318,23 +313,34 @@ buildipfire() {
   LOGFILE="$BASEDIR/log/_build.ipfire.log"
   export LOGFILE
   ipfiremake configroot
+  ipfiremake backup
   ipfiremake dhcp
   ipfiremake dhcpcd
   ipfiremake libusb
   ipfiremake libpcap
-  ipfiremake linux-atm
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip
   ipfiremake linux			SMP=1
   ipfiremake ipp2p			SMP=1
-  ipfiremake r8169			SMP=1
   ipfiremake zaptel			SMP=1
+  ipfiremake r8169			SMP=1
+  ipfiremake r8168			SMP=1
+  ipfiremake mcs7830			SMP=1
+  ipfiremake atl1			SMP=1
+  ipfiremake kqemu			SMP=1
+  ipfiremake sane		KMOD=1	SMP=1
   ipfiremake linux
   ipfiremake ipp2p
-  ipfiremake r8169
   ipfiremake zaptel
+  ipfiremake r8169
+  ipfiremake r8168
+  ipfiremake mcs7830
+  ipfiremake atl1
+  ipfiremake kqemu
+  ipfiremake sane		KMOD=1
   ipfiremake pkg-config
+  ipfiremake linux-atm
   ipfiremake cpio
   ipfiremake klibc
   ipfiremake mkinitcpio
@@ -347,6 +353,7 @@ buildipfire() {
   ipfiremake curl
   ipfiremake python
   ipfiremake libnet
+  ipfiremake libidn
   ipfiremake libjpeg
   ipfiremake libpng
   ipfiremake libtiff
@@ -377,6 +384,7 @@ buildipfire() {
   ipfiremake dosfstools
   ipfiremake squashfstools
   ipfiremake reiserfsprogs
+  ipfiremake xfsprogs
   ipfiremake sysfsutils
   ipfiremake fuse
   ipfiremake ntfs-3g
@@ -388,13 +396,13 @@ buildipfire() {
   ipfiremake GD-TextUtil
   ipfiremake gnupg
   ipfiremake hdparm
+  ipfiremake sdparm
   ipfiremake mtools
   ipfiremake initscripts
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
   ipfiremake ipp2p			IPT=1
-  ipfiremake moblock
   ipfiremake linux-igd
   ipfiremake ipac-ng
   ipfiremake ipaddr
@@ -402,6 +410,7 @@ buildipfire() {
   ipfiremake iputils
   ipfiremake l7-protocols
   ipfiremake mISDN
+  ipfiremake capi4k-utils
   ipfiremake hwdata
   ipfiremake kudzu
   ipfiremake logrotate
@@ -462,6 +471,7 @@ buildipfire() {
   ipfiremake cups
   ipfiremake ghostscript
   ipfiremake foomatic
+  ipfiremake hplip
   ipfiremake samba
   ipfiremake sudo
   ipfiremake mc
@@ -473,9 +483,8 @@ buildipfire() {
   ipfiremake htop
   ipfiremake postfix
   ipfiremake fetchmail
-  ipfiremake cyrusimap
-  ipfiremake webcyradm
-  ipfiremake mailx
+  ipfiremake cyrus-imapd
+  ipfiremake openmailadmin
   ipfiremake clamav
   ipfiremake spamassassin
   ipfiremake amavisd
@@ -496,12 +505,9 @@ buildipfire() {
   ipfiremake mpc
   ipfiremake xvid
   ipfiremake libmpeg2
-  #ipfiremake ffmpeg
   ipfiremake videolan
   ipfiremake libpri
-  ipfiremake stund
   ipfiremake asterisk
-  ipfiremake backup
   ipfiremake gnump3d
   ipfiremake libsigc++
   ipfiremake applejuice
@@ -516,18 +522,37 @@ buildipfire() {
   ipfiremake nfs
   ipfiremake nmap
   ipfiremake mbmon
-  ipfiremake iftop
   ipfiremake ncftp
-  ipfiremake cftp
   ipfiremake etherwake
-  ipfiremake ethereal
-  ipfiremake tftp-hpa
   ipfiremake bwm-ng
   ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
   ipfiremake which
   ipfiremake lsof
+  ipfiremake centerim
+  ipfiremake br2684ctl
+  ipfiremake pcmciautils
+  ipfiremake collectd
+  ipfiremake lcd4linux
+  ipfiremake neon
+  ipfiremake subversion
+  ipfiremake tcptrack
+  ipfiremake teamspeak
+  ipfiremake elinks
+  ipfiremake igmpproxy
+  ipfiremake sdl
+  ipfiremake qemu
+  ipfiremake sane
+  ipfiremake netpbm
+  ipfiremake phpSANE
+  ipfiremake tunctl
+  ipfiremake nagios
+  ipfiremake ebtables
+  ipfiremake arptables
+  ipfiremake fontconfig
+  ipfiremake freefont
+  ipfiremake vdr
 }
 
 buildinstaller() {
@@ -565,6 +590,7 @@ buildinstaller() {
   installmake wget
   installmake hwdata
   installmake kudzu
+  installmake pcmciautils
   installmake installer
   installmake initrd
 }
@@ -598,7 +624,6 @@ buildpackages() {
   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
   	ipfiremake usb-stick
   fi
-  ipfiremake pxe
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages
@@ -626,7 +651,12 @@ buildpackages() {
 ipfirepackages() {
 	ipfiremake core-updates
 	for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
-		[ -e $BASEDIR/lfs/$i ] && ipfiredist $i
+		if [ -e $BASEDIR/lfs/$i ]; then
+			ipfiredist $i
+		else
+			echo -n $i
+			beautify message SKIP
+		fi
 	done
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
   mv -f $LFS/install/packages/* $BASEDIR/packages >> $LOGFILE 2>&1
@@ -669,8 +699,8 @@ build)
 	buildipfire
 
 	# Setzen des IPFire Builds
-	if [ "$FIREBUILD" ]; then
-		echo "$FIREBUILD" > $BASEDIR/build/var/ipfire/firebuild
+	if [ "$SVN_REVISION" ]; then
+		echo "$SVN_REVISION" > $BASEDIR/build/var/ipfire/firebuild
 	else
 		echo "_(OvO)_" > $BASEDIR/build/var/ipfire/firebuild
 	fi
@@ -909,13 +939,13 @@ uploadsrc)
 	PWD=`pwd`
 	cd $BASEDIR/cache/
 	echo -e "Uploading cache to ftp server:"
-	ncftpls -u $FTP_CACHE_USER -p $FTP_CACHE_PASS ftp://$FTP_CACHE_URL$FTP_CACHE_PATH/ > /tmp/ftplist
+	ncftpls -u $FTP_CACHE_USER -p $FTP_CACHE_PASS ftp://$FTP_CACHE_URL/$FTP_CACHE_PATH/ > /tmp/ftplist
 	for i in *; do
-		if [ "$i" == "toolchains" ]; then continue; fi
-		grep -q $i /tmp/ftplist
+		if [ "$(basename $i)" == "toolchains" ]; then continue; fi
+		grep -q $(basename $i) /tmp/ftplist
 		if [ "$?" -ne "0" ]; then
-			echo -ne "$i"
-			ncftpput -u $FTP_CACHE_USER -p $FTP_CACHE_PASS $FTP_CACHE_URL $FTP_CACHE_PATH/ $i
+			echo -ne "$(basename $i)"
+			ncftpput -u $FTP_CACHE_USER -p $FTP_CACHE_PASS $FTP_CACHE_URL $FTP_CACHE_PATH/ $(basename $i)
 			if [ "$?" -ne "0" ]; then
 				beautify message FAIL
 			fi