X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=make.sh;h=e952b085eeef625ec848766a4023406daeb3da40;hb=034c2b7e288590c35d1ec2f6f5baa324420340a6;hp=1bc721405bb49d8ccf00801f3e7e0ac51b61efaf;hpb=1aa810ea14f540622b65056736be81db16ec12f6;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/make.sh b/make.sh
index 1bc721405b..e952b085ee 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,8 @@
 
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.3-test"
+VERSION="2.3"
+CORE="28"
 GIT_BRANCH=master:master										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
@@ -306,7 +307,7 @@ buildbase() {
     lfsmake2 make
     lfsmake2 man
     lfsmake2 mktemp
-    lfsmake2 modutils
+    lfsmake2 module-init-tools
     lfsmake2 mtd
     lfsmake2 net-tools
     lfsmake2 patch
@@ -334,6 +335,7 @@ buildipfire() {
   ipfiremake libpcap
   ipfiremake ppp
   ipfiremake rp-pppoe
+  ipfiremake pptp
   ipfiremake unzip
   ipfiremake linux
   ipfiremake atl2
@@ -405,7 +407,6 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-  ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
   ipfiremake iputils
@@ -503,10 +504,6 @@ buildipfire() {
   ipfiremake lame
   ipfiremake sox
   ipfiremake libshout
-  ipfiremake icecast
-  ipfiremake icegenerator
-  ipfiremake mpd
-  ipfiremake mpc
   ipfiremake xvid
   ipfiremake libmpeg2
   ipfiremake cmake
@@ -561,6 +558,10 @@ buildipfire() {
   ipfiremake videolan
   ipfiremake vdr
   ipfiremake w_scan
+  ipfiremake icecast
+  ipfiremake icegenerator
+  ipfiremake mpd
+  ipfiremake mpc
   ipfiremake git
   ipfiremake squidclamav
   ipfiremake bc
@@ -571,7 +572,7 @@ buildipfire() {
   ipfiremake hostapd
   ipfiremake urlgrabber
   ipfiremake syslinux
-  ipfiremake tftp-hpa
+  ipfiremake tftpd
   ipfiremake cpufrequtils
   ipfiremake dbus
   ipfiremake bluetooth
@@ -581,6 +582,16 @@ buildipfire() {
   ipfiremake netcat
   ipfiremake 7zip
   ipfiremake lynis
+  ipfiremake cryptsetup
+  ipfiremake splix
+  ipfiremake streamripper
+  ipfiremake sshfs
+  ipfiremake sqlite
+  ipfiremake taglib
+#  ipfiremake mediatomb
+  ipfiremake sslh
+  ipfiremake perl-gettext
+  ipfiremake vdradmin
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -589,6 +600,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
 }
 
 buildinstaller() {
@@ -657,15 +669,15 @@ 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
-  ipfiremake updater
+  #ipfiremake updater
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages
@@ -857,7 +869,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
@@ -937,21 +949,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
 	;;