Korrekturen damit der Build wieder laeuft

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 10dec874418292ac9d34e6071274b2cf38be4e26..c42cc821b1b8d0fc73960b8c58ff7315b7f18532 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.0rc1t"                                                              # Version number
+VERSION="2.0rc2t"                                                              # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
 NICE=10                                                                                                        # Nice level
@@ -327,13 +327,12 @@ buildipfire() {
   ipfiremake unzip
   ipfiremake linux                     SMP=1
   ipfiremake ipp2p                     SMP=1
-  ipfiremake r8169                     SMP=1
   ipfiremake zaptel                    SMP=1
   ipfiremake linux
   ipfiremake ipp2p
-  ipfiremake r8169
   ipfiremake zaptel
   ipfiremake pkg-config
+  ipfiremake linux-atm
   ipfiremake cpio
   ipfiremake klibc
   ipfiremake mkinitcpio
@@ -395,7 +394,6 @@ buildipfire() {
   ipfiremake iptables
   ipfiremake libupnp
   ipfiremake ipp2p                     IPT=1
-  ipfiremake moblock
   ipfiremake linux-igd
   ipfiremake ipac-ng
   ipfiremake ipaddr
@@ -474,7 +472,7 @@ buildipfire() {
   ipfiremake htop
   ipfiremake postfix
   ipfiremake fetchmail
-  ipfiremake cyrusimap
+  ipfiremake cyrus-imapd
   ipfiremake openmailadmin
   ipfiremake mailx
   ipfiremake clamav
@@ -529,6 +527,8 @@ buildipfire() {
   ipfiremake vsftpd
   ipfiremake which
   ipfiremake lsof
+  ipfiremake centerim
+  ipfiremake br2684ctl
 }
 
 buildinstaller() {
@@ -626,7 +626,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