X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=d454a6cc5daa8f23b2c9b9a37549e4c718d3757e;hp=5263f5c7dae5249c3fbcc2b61bcf6184a22a6622;hb=791b22708cdc60bf9aeb22c8718016a22dbebd55;hpb=a01fc4746ba7fa8257e94300b4396fd6c4662f4f

diff --git a/make.sh b/make.sh
index 5263f5c7da..d454a6cc5d 100755
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
 VERSION="2.3"
-CORE="27"
+CORE="28"
 GIT_BRANCH=master:master										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
@@ -588,8 +588,11 @@ buildipfire() {
   ipfiremake sshfs
   ipfiremake sqlite
   ipfiremake taglib
-  ipfiremake mediatomb
+#  ipfiremake mediatomb
   ipfiremake sslh
+  ipfiremake perl-gettext
+  ipfiremake vdradmin
+  ipfiremake miau
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -598,7 +601,7 @@ buildipfire() {
   git status >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
-  echo $(CORE) > $BASEDIR/build/opt/pakfire/db/core/mine
+  echo $CORE > $BASEDIR/build/opt/pakfire/db/core/mine
 }
 
 buildinstaller() {
@@ -947,21 +950,21 @@ git)
 	;;
 uploadsrc)
 	PWD=`pwd`
+	if [ -z $IPFIRE_USER ]; then
+		echo -n "You have to setup IPFIRE_USER first. See .config for details."
+		beautify message FAIL
+		exit 1
+	fi
+	URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }')
+	REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
+
 	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
-	for i in *; do
-		if [ "$(basename $i)" == "toolchains" ]; then continue; fi
-		grep -q $(basename $i) /tmp/ftplist
-		if [ "$?" -ne "0" ]; then
-			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
-		fi
+	for file in $(ls -1); do
+		grep -q "$file" <<<$REMOTE_FILES && continue
+		NEW_FILES="$NEW_FILES $file"
 	done
-	rm -f /tmp/ftplist
+	[ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE}
+	cd $BASEDIR
 	cd $PWD
 	exit 0
 	;;