X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=cb047636f9e74f498ce3d0be1b074ff384e837a2;hp=0101bb090a20257d646ef574c7ba2c60fd4fd9ea;hb=fc466a563f2a5694213077680407d1f60a735421;hpb=d0d3fe9d266c265697250dabba0bfdac316314ff

diff --git a/make.sh b/make.sh
index 0101bb090..cb047636f 100755
--- a/make.sh
+++ b/make.sh
@@ -24,10 +24,10 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.13"							# Version number
-CORE="73"							# Core Level (Filename)
-PAKFIRE_CORE="73"						# Core Level (PAKFIRE)
-GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
+VERSION="2.15"							# Version number
+CORE="76-beta1"							# Core Level (Filename)
+PAKFIRE_CORE="76"						# Core Level (PAKFIRE)
+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
@@ -360,7 +360,7 @@ buildbase() {
     lfsmake2 make
     lfsmake2 man
     lfsmake2 mktemp
-    lfsmake2 module-init-tools
+    lfsmake2 kmod
     lfsmake2 net-tools
     lfsmake2 patch
     lfsmake2 psmisc
@@ -369,8 +369,8 @@ buildbase() {
     lfsmake2 sysvinit
     lfsmake2 tar
     lfsmake2 texinfo
-    lfsmake2 udev
     lfsmake2 util-linux
+    lfsmake2 udev
     lfsmake2 vim
     lfsmake2 xz
     lfsmake2 paxctl
@@ -460,6 +460,7 @@ buildipfire() {
   ipfiremake gdbm
   ipfiremake pam
   ipfiremake openssl
+  ipfiremake openssl-compat
   ipfiremake curl
   ipfiremake tcl
   ipfiremake sqlite
@@ -730,7 +731,6 @@ buildipfire() {
   ipfiremake usb_modeswitch_data
   ipfiremake zerofree
   ipfiremake mdadm
-  ipfiremake eject
   ipfiremake pound
   ipfiremake minicom
   ipfiremake ddrescue
@@ -767,7 +767,6 @@ buildipfire() {
   ipfiremake stress
   ipfiremake libstatgrab
   ipfiremake sarg
-  ipfiremake fstrim
   ipfiremake check_mk_agent
   ipfiremake libdaemon
   ipfiremake avahi
@@ -1084,11 +1083,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}