X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=0e9099b2193043df1c45deaafc7e0ee6757dbf6e;hp=fa153c445c972f976a6ae325c23d254fed4ca81e;hb=7d7d5092d3a17ec38f3a8baa5a214075dc269ed3;hpb=dc3c6687c9c78f7e94f06f6c327d8f14777da179

diff --git a/make.sh b/make.sh
index fa153c445..0e9099b21 100755
--- a/make.sh
+++ b/make.sh
@@ -27,7 +27,7 @@ SNAME="ipfire"							# Short name
 VERSION="2.15"							# Version number
 CORE="76-beta1"							# Core Level (Filename)
 PAKFIRE_CORE="76"						# Core Level (PAKFIRE)
-GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
+GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
 NICE=10								# Nice level
@@ -651,6 +651,7 @@ buildipfire() {
   ipfiremake sysstat
   ipfiremake vsftpd
   ipfiremake strongswan
+  ipfiremake rng-tools
   ipfiremake lsof
   ipfiremake br2684ctl
   ipfiremake pcmciautils
@@ -715,6 +716,8 @@ buildipfire() {
   ipfiremake netsnmpd
   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
+  ipfiremake perl-DBD-SQLite
+  ipfiremake perl-File-ReadBackwards
   ipfiremake cacti
   ipfiremake icecc
   ipfiremake openvmtools
@@ -1083,11 +1086,11 @@ uploadsrc)
 	fi
 
 	URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }')
-	REMOTE_FILES=$(echo "ls -1 --ignore=toolchains" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
+	REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
 
-	cd $BASEDIR/cache/
-	for file in $(ls -1 --ignore=toolchains); do
-		grep -q "$file" <<<$REMOTE_FILES && continue
+	for file in ${BASEDIR}/cache/*; do
+		[ -d "${file}" ] && continue
+		grep -q "$(basename ${file})" <<<$REMOTE_FILES && continue
 		NEW_FILES="$NEW_FILES $file"
 	done
 	[ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE}