X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=de92e58a2987ca00404b6f40c588616e4e102b08;hp=d1eecd0ca4bc12c52c5aa3f671b695d40586d6ae;hb=5e0f55e76bf0495af37854604a8042052afafb70;hpb=cab25d67ad7f0b0efec2332ae9dddf3c8d380e89

diff --git a/make.sh b/make.sh
index d1eecd0ca4..de92e58a29 100755
--- a/make.sh
+++ b/make.sh
@@ -406,7 +406,6 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-  ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
   ipfiremake iputils
@@ -586,6 +585,12 @@ buildipfire() {
   ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
+  ipfiremake libdlna
+  ipfiremake ushare
+  ipfiremake sqlite
+  ipfiremake taglib
+  ipfiremake mediatomb
+  ipfiremake sslh
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -662,11 +667,11 @@ buildpackages() {
   $0 git log
 
   # Create images for install
-	ipfiremake cdrom ED=full
+	ipfiremake cdrom ED=$IPFVER
 	
   # Check if there is a loop device for building in virtual environments
   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
-  	ipfiremake usb-stick
+	ipfiremake usb-stick ED=$IPFVER
   fi
 
   # Create updater package
@@ -862,7 +867,7 @@ gettoolchain)
 		test -d $BASEDIR/cache/toolchains || mkdir $BASEDIR/cache/toolchains
 		echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
 		cd $BASEDIR/cache/toolchains
-		wget $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null
+		wget -U "IPFireSourceGrabber/2.x" $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null
 		if [ $? -ne 0 ]; then
 			echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
 		else