X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=4af9a2e48d656d58da1cd6ccfce4eaaac27b12e8;hp=1caee37f295e93334fd0c37a9b8a3398b181c85e;hb=bf7c473f7b0b0231854ed00e633322b25c5a247b;hpb=786f2c8a296f053a6db934993a0611f1dadb8db5

diff --git a/make.sh b/make.sh
index 1caee37f29..4af9a2e48d 100644
--- a/make.sh
+++ b/make.sh
@@ -400,6 +400,7 @@ buildipfire() {
   ipfiremake hdparm
   ipfiremake ibod
   ipfiremake initscripts
+  ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
   ipfiremake ipp2p			IPT=1
@@ -532,6 +533,7 @@ buildipfire() {
   ipfiremake ethereal
   ipfiremake tftp-hpa
   ipfiremake iptraf
+  ipfiremake bwm-ng
   ipfiremake nagios
 }
 
@@ -540,6 +542,8 @@ buildinstaller() {
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
   ipfiremake syslinux
+  ipfiremake as86
+  ipfiremake mbr
   ipfiremake memtest
   installmake linux-libc-header
   installmake binutils
@@ -599,18 +603,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 [ ! -f ipfire-$VERSION.i586-devel.iso ]; 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
 
@@ -633,7 +636,6 @@ buildpackages() {
   echo -n "###EOF###" >> $BASEDIR/packages/packages_list.txt
 
   cd $PWD
-
 }
 
 ipfirepackages() {
@@ -947,6 +949,7 @@ svn)
 		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
 	;;
@@ -1052,6 +1055,9 @@ pxe)
 	esac
 	exit 0
 	;;
+lang)
+	update_langs
+	;;
 "")
 	clear
 	svn info