X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=cbae806fca1ec5395d6b6bef53bfb248c7b1d8c0;hp=8b586376543e533f398b5734a1e2cb1eb3ebfb86;hb=77f63267798e0a5ea6f7281741d3cd76726a56d8;hpb=eedc26d9513bfccac956100cb32f81424e7b85fb

diff --git a/make.sh b/make.sh
index 8b58637654..cbae806fca 100755
--- a/make.sh
+++ b/make.sh
@@ -432,8 +432,6 @@ buildipfire() {
   ipfiremake Text-Tabs+Wrap
   ipfiremake Locale-Country
   ipfiremake XML-Parser
-  ipfiremake MP3-Info
-  ipfiremake MP3-Tag
   ipfiremake glib
   ipfiremake GeoIP
   ipfiremake fwhits
@@ -476,7 +474,7 @@ buildipfire() {
   ipfiremake postfix
   ipfiremake fetchmail
   ipfiremake cyrusimap
-  ipfiremake webcyradm
+  ipfiremake openmailadmin
   ipfiremake mailx
   ipfiremake clamav
   ipfiremake spamassassin
@@ -485,6 +483,7 @@ buildipfire() {
   ipfiremake mpg123
   ipfiremake mpfire
   ipfiremake guardian
+  ipfiremake libid3tag
   ipfiremake libmad
   ipfiremake libogg
   ipfiremake libvorbis
@@ -493,7 +492,12 @@ buildipfire() {
   ipfiremake libshout
   ipfiremake icecast
   ipfiremake icegenerator
-  ipfiremake mp3blaster
+  ipfiremake mpd
+  ipfiremake mpc
+  ipfiremake xvid
+  ipfiremake libmpeg2
+  #ipfiremake ffmpeg
+  ipfiremake videolan
   ipfiremake libpri
   ipfiremake stund
   ipfiremake asterisk
@@ -581,7 +585,7 @@ buildpackages() {
 	fi
   done
   echo "== List of softwares used to build $NAME Version: $VERSION ==" > $BASEDIR/doc/packages-list.txt
-  grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$\|.tgz$\|-config$\|_missing_rootfile$' \
+  grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$\|.tgz$\|-config$\|_missing_rootfile$\|install1$\|install2$\|pass1$\|pass2$\|pass3$' \
 	$BASEDIR/doc/packages-list | sort >> $BASEDIR/doc/packages-list.txt
   rm -f $BASEDIR/doc/packages-list
   # packages-list.txt is ready to be displayed for wiki page
@@ -594,7 +598,6 @@ buildpackages() {
   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
   	ipfiremake usb-stick
   fi
-  ipfiremake pxe
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages
@@ -905,13 +908,13 @@ uploadsrc)
 	PWD=`pwd`
 	cd $BASEDIR/cache/
 	echo -e "Uploading cache to ftp server:"
-	ncftpls -u $FTP_CACHE_USER -p $FTP_CACHE_PASS ftp://$FTP_CACHE_URL$FTP_CACHE_PATH/ > /tmp/ftplist
+	ncftpls -u $FTP_CACHE_USER -p $FTP_CACHE_PASS ftp://$FTP_CACHE_URL/$FTP_CACHE_PATH/ > /tmp/ftplist
 	for i in *; do
-		if [ "$i" == "toolchains" ]; then continue; fi
-		grep -q $i /tmp/ftplist
+		if [ "$(basename $i)" == "toolchains" ]; then continue; fi
+		grep -q $(basename $i) /tmp/ftplist
 		if [ "$?" -ne "0" ]; then
-			echo -ne "$i"
-			ncftpput -u $FTP_CACHE_USER -p $FTP_CACHE_PASS $FTP_CACHE_URL $FTP_CACHE_PATH/ $i
+			echo -ne "$(basename $i)"
+			ncftpput -u $FTP_CACHE_USER -p $FTP_CACHE_PASS $FTP_CACHE_URL $FTP_CACHE_PATH/ $(basename $i)
 			if [ "$?" -ne "0" ]; then
 				beautify message FAIL
 			fi