X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=9e86c64ae1521c07d85a22cf932c3c08bd9268cb;hb=4a52eae459b248456969c85b3421e1958bb521be;hp=933ae7f3bc675ceb412ab3ec3891cd29c9fbc648;hpb=2231d107153183f079cd780bd49085983d995015;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/make.sh b/make.sh
index 933ae7f3b..9e86c64ae 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.0rc2"								# 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`
@@ -329,9 +324,17 @@ buildipfire() {
   ipfiremake linux			SMP=1
   ipfiremake ipp2p			SMP=1
   ipfiremake zaptel			SMP=1
+  ipfiremake r8169			SMP=1
+  ipfiremake r8168			SMP=1
+  ipfiremake mcs7830			SMP=1
+#  ipfiremake dm9601			SMP=1
   ipfiremake linux
   ipfiremake ipp2p
   ipfiremake zaptel
+  ipfiremake r8169
+  ipfiremake r8168
+  ipfiremake mcs7830
+#  ipfiremake dm9601
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -377,6 +380,7 @@ buildipfire() {
   ipfiremake dosfstools
   ipfiremake squashfstools
   ipfiremake reiserfsprogs
+  ipfiremake xfsprogs
   ipfiremake sysfsutils
   ipfiremake fuse
   ipfiremake ntfs-3g
@@ -523,6 +527,11 @@ buildipfire() {
   ipfiremake lsof
   ipfiremake centerim
   ipfiremake br2684ctl
+  ipfiremake pcmciautils
+  ipfiremake collectd
+  ipfiremake lcd4linux
+  ipfiremake neon
+  ipfiremake subversion
 }
 
 buildinstaller() {
@@ -560,6 +569,7 @@ buildinstaller() {
   installmake wget
   installmake hwdata
   installmake kudzu
+  installmake pcmciautils
   installmake installer
   installmake initrd
 }
@@ -668,8 +678,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