X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=3fd133fc166a32b3b21a79758f3f68bddca3705a;hp=19152c5cea02d0e98336fa6134dc56a01b331fd8;hb=069ae085ad8e635055e7e126723e8994a779c722;hpb=44254afd445354c03bf345c8d56d84dd0e4d8c9f

diff --git a/make.sh b/make.sh
index 19152c5cea..3fd133fc16 100644
--- 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
@@ -387,15 +388,19 @@ buildipfire() {
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
   ipfiremake squashfstools
+  ipfiremake sysfsutils
   ipfiremake ntfs-3g
   ipfiremake ethtool
   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
@@ -408,6 +413,7 @@ buildipfire() {
   ipfiremake l7-protocols
   ipfiremake isapnptools
 #  ipfiremake isdn4k-utils # What about mISDN???
+  ipfiremake hwdata
   ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch
@@ -438,6 +444,11 @@ buildipfire() {
   ipfiremake Archive-Zip
   ipfiremake Text-Tabs+Wrap
   ipfiremake Locale-Country
+  ipfiremake XML-Parser
+  ipfiremake glib
+  ipfiremake dbus
+  ipfiremake hal
+  ipfiremake hwinfo
   ipfiremake GeoIP
   ipfiremake fwhits
   ipfiremake noip_updater
@@ -453,6 +464,7 @@ buildipfire() {
   ipfiremake squid
   ipfiremake squid-graph
   ipfiremake squidguard
+  ipfiremake calamaris
   ipfiremake tcpdump
   ipfiremake traceroute
   ipfiremake vlan
@@ -465,7 +477,6 @@ buildipfire() {
   ipfiremake spandsp
   ipfiremake lzo
   ipfiremake openvpn
-  ipfiremake glib
   ipfiremake pammysql
   ipfiremake xinetd
   ipfiremake ghostscript
@@ -523,7 +534,10 @@ buildipfire() {
   ipfiremake ethereal
   ipfiremake tftp-hpa
   ipfiremake iptraf
+  ipfiremake bwm-ng
   ipfiremake nagios
+  ipfiremake tripwire
+  ipfiremake sysstat
 }
 
 buildinstaller() {
@@ -531,6 +545,8 @@ buildinstaller() {
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
   ipfiremake syslinux
+  ipfiremake as86
+  ipfiremake mbr
   ipfiremake memtest
   installmake linux-libc-header
   installmake binutils
@@ -551,9 +567,17 @@ buildinstaller() {
   installmake e2fsprogs
   installmake libaal
   installmake reiser4progs
+  installmake reiserfsprogs
   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
@@ -582,18 +606,17 @@ buildpackages() {
   beautify message DONE
 
   # Create images for install
-  for i in $IPFVER
-  do
-	if [ $i == "devel" ]; then
-		if [ ! -e ipfire-$VERSION.i586-devel.iso ]; then
-			ipfiremake cdrom ED=$i
-		fi
-	else
-		ipfiremake cdrom ED=$i
+  if [ "$DEVEL" == "1" ]; then
+		ipfiremake cdrom ED=devel
 	fi
-  done
+	ipfiremake cdrom ED=full
+	
+  # 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
 
@@ -616,7 +639,6 @@ buildpackages() {
   echo -n "###EOF###" >> $BASEDIR/packages/packages_list.txt
 
   cd $PWD
-
 }
 
 ipfirepackages() {
@@ -894,9 +916,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
@@ -923,10 +948,12 @@ svn)
 		evaluate 1
 	  ;;
 	  diff|di)
+	  update_langs
 		echo -ne "Make a local diff to last svn revision"
 		svn diff > ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff
 		evaluate 1
 		echo "Diff was successfully saved to ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff"
+		svn status
 	  ;;
 	esac
 	;;
@@ -1032,6 +1059,9 @@ pxe)
 	esac
 	exit 0
 	;;
+lang)
+	update_langs
+	;;
 "")
 	clear
 	svn info