X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=cc1f540d4ea8cee2b4aa80c219188988dd2948e1;hb=92df1ce6e72af21e835780d63ae4c20a49706131;hp=09a9d0041b2cd476a3d067bfcf85f43cbac7ee66;hpb=4f1b7a27db6b0282eb2bb70fb9e20608d155c4e8;p=ipfire-2.x.git

diff --git a/make.sh b/make.sh
index 09a9d0041b..cc1f540d4e 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="27"
 GIT_BRANCH=master:master										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
@@ -177,7 +178,9 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j6"
+    if [ -z $MAKETUNING ]; then
+       MAKETUNING="-j6"
+    fi
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
@@ -304,7 +307,7 @@ buildbase() {
     lfsmake2 make
     lfsmake2 man
     lfsmake2 mktemp
-    lfsmake2 modutils
+    lfsmake2 module-init-tools
     lfsmake2 mtd
     lfsmake2 net-tools
     lfsmake2 patch
@@ -332,34 +335,21 @@ buildipfire() {
   ipfiremake libpcap
   ipfiremake ppp
   ipfiremake rp-pppoe
+  ipfiremake pptp
   ipfiremake unzip
-#  ipfiremake linux			SMP=1
-#  ipfiremake linux-fusion		SMP=1
-#  ipfiremake ipp2p			SMP=1
-#  ipfiremake atl2			SMP=1
-#  ipfiremake kqemu			SMP=1
-#  ipfiremake v4l-dvb			SMP=1
-#  ipfiremake madwifi                    SMP=1
-#  ipfiremake alsa		KMOD=1	SMP=1
-#  ipfiremake sane		KMOD=1	SMP=1
-#  ipfiremake openswan		KMOD=1	SMP=1
   ipfiremake linux
-  ipfiremake linux-fusion
   ipfiremake atl2
-  ipfiremake r8168
-  ipfiremake r8169
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
-  ipfiremake alsa		KMOD=1
-  ipfiremake sane		KMOD=1
-  ipfiremake openswan		KMOD=1
+  ipfiremake alsa			KMOD=1
+  ipfiremake openswan			KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
   ipfiremake klibc
   ipfiremake mkinitcpio
-  ipfiremake udev				KLIBC=1
+  ipfiremake udev			KLIBC=1
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
@@ -417,7 +407,6 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-  ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
   ipfiremake iputils
@@ -515,10 +504,6 @@ buildipfire() {
   ipfiremake lame
   ipfiremake sox
   ipfiremake libshout
-  ipfiremake icecast
-  ipfiremake icegenerator
-  ipfiremake mpd
-  ipfiremake mpc
   ipfiremake xvid
   ipfiremake libmpeg2
   ipfiremake cmake
@@ -573,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
@@ -583,12 +572,24 @@ buildipfire() {
   ipfiremake hostapd
   ipfiremake urlgrabber
   ipfiremake syslinux
-  ipfiremake tftp-hpa
+  ipfiremake tftpd
   ipfiremake cpufrequtils
   ipfiremake dbus
   ipfiremake bluetooth
   ipfiremake gutenprint
   ipfiremake apcupsd
+  ipfiremake iperf
+  ipfiremake netcat
+  ipfiremake 7zip
+  ipfiremake lynis
+  ipfiremake cryptsetup
+  ipfiremake splix
+  ipfiremake streamripper
+  ipfiremake sshfs
+  ipfiremake sqlite
+  ipfiremake taglib
+  ipfiremake mediatomb
+  ipfiremake sslh
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -597,6 +598,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() {
@@ -665,15 +667,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
@@ -865,7 +867,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
@@ -898,6 +900,8 @@ othersrc)
 git)
 	case "$2" in
 	  update|up)
+	  		## REMOVES ALL UNCOMMITTED CHANGES!
+	  		[ "$3" == "--force" ] && git checkout -f
 			git pull
 	  	;;
 	  commit|ci)
@@ -931,7 +935,7 @@ git)
 	  	[ -z $GIT_USER ] && exiterror "You have to setup GIT_USER first."
 			GIT_URL="ssh://${GIT_USER}@git.ipfire.org/pub/git/ipfire-2.x"
 			
-	  	git push ${GIT_URL} ${GIT_BRANCH}
+		git push ${GIT_URL} ${GIT_BRANCH} $3
 	  	;;
 	  log)
 		[ -z $GIT_TAG ]  || LAST_TAG=$GIT_TAG