Korrekturen im Code, es wird langsam ....

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

diff --git a/make.sh b/make.sh
index a899f1a9d973fd60e559181ace1bca0bc719adcc..8d43614ef7777bc0287e26c1ca05dfa307fcdc9d 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -348,6 +348,7 @@ buildipfire() {
   ipfiremake zaptel
   ipfiremake fuse
   ipfiremake pkg-config
+  ipfiremake cpio
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
@@ -393,10 +394,13 @@ buildipfire() {
   ipfiremake ez-ipupdate
   ipfiremake fcron
   ipfiremake GD
+  ipfiremake GD-Graph
+  ipfiremake GD-TextUtil
   ipfiremake gnupg
   ipfiremake hdparm
   ipfiremake ibod
   ipfiremake initscripts
+  ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
   ipfiremake ipp2p                     IPT=1
@@ -410,7 +414,6 @@ buildipfire() {
   ipfiremake isapnptools
 #  ipfiremake isdn4k-utils # What about mISDN???
   ipfiremake hwdata
-  ipfiremake dbus
   ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch
@@ -442,6 +445,8 @@ buildipfire() {
   ipfiremake Text-Tabs+Wrap
   ipfiremake Locale-Country
   ipfiremake XML-Parser
+  ipfiremake glib
+  ipfiremake dbus
   ipfiremake hal
   ipfiremake hwinfo
   ipfiremake GeoIP
@@ -471,7 +476,6 @@ buildipfire() {
   ipfiremake spandsp
   ipfiremake lzo
   ipfiremake openvpn
-  ipfiremake glib
   ipfiremake pammysql
   ipfiremake xinetd
   ipfiremake ghostscript
@@ -537,6 +541,8 @@ buildinstaller() {
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
   ipfiremake syslinux
+  ipfiremake as86
+  ipfiremake mbr
   ipfiremake memtest
   installmake linux-libc-header
   installmake binutils
@@ -561,7 +567,13 @@ buildinstaller() {
   installmake sysfsutils
   installmake util-linux
   installmake pciutils
+  installmake zlib
+  installmake wget
+  installmake libxml2
+  installmake dbus
+  installmake hal
   installmake hwdata
+  installmake hwinfo
   installmake kudzu
   installmake installer
   installmake initrd
@@ -600,8 +612,13 @@ buildpackages() {
                ipfiremake cdrom ED=$i
        fi
   done
+  
+  # Check if there is a loop device for building in virtual environments
+  if [ -e /dev/loop0 ]; then
+       ipfiremake usb-stick
+  fi
   ipfiremake pxe
-  cp -f $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
+  mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
 
 #  ipfirepackages
 
@@ -624,7 +641,6 @@ buildpackages() {
   echo -n "###EOF###" >> $BASEDIR/packages/packages_list.txt
 
   cd $PWD
-
 }
 
 ipfirepackages() {
@@ -902,9 +918,12 @@ svn)
                                $0 changelog
                        fi
                fi
+               update_langs
                svn commit
                $0 svn up
-               $0 uploadsrc
+               if [ -n "$FTP_CACHE_URL" ]; then
+                       $0 uploadsrc
+               fi
          ;;
          dist)
                if [ $3 ]; then