X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=7f68f293d461440e3dd4dcaea65f728f738c8080;hp=d02a1ad035cc0d21a72c2393de473a300271c5d0;hb=2ca7e12e9e37f35c5a6a549f5598cd4cd519b9c8;hpb=4fafa702e8cfe55114230f350327b92c267156ff

diff --git a/make.sh b/make.sh
index d02a1ad035..7f68f293d4 100755
--- a/make.sh
+++ b/make.sh
@@ -24,8 +24,8 @@
 
 NAME="IPFire"										# Software name
 SNAME="ipfire"									# Short name
-VERSION="2.3"
-CORE="28"
+VERSION="2.5"
+CORE="31"
 GIT_BRANCH=master:master										# Version number
 SLOGAN="www.ipfire.org"					# Software slogan
 CONFIG_ROOT=/var/ipfire					# Configuration rootdir
@@ -337,14 +337,29 @@ buildipfire() {
   ipfiremake rp-pppoe
   ipfiremake pptp
   ipfiremake unzip
+  ipfiremake which
+#  ipfiremake linux			XEN=1
+#  ipfiremake atl2			XEN=1
+#  ipfiremake hso			XEN=1
+#  ipfiremake e1000e			XEN=1
+#  ipfiremake kqemu			XEN=1
+#  ipfiremake v4l-dvb			XEN=1
+#  ipfiremake madwifi			XEN=1
+##  ipfiremake alsa			XEN=1 KMOD=1
+#  ipfiremake openswan			XEN=1 KMOD=1
+#  ipfiremake mISDN			XEN=1
+#  ipfiremake compat-wireless		XEN=1
   ipfiremake linux
   ipfiremake atl2
+  ipfiremake hso
+  ipfiremake e1000e
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa			KMOD=1
   ipfiremake openswan			KMOD=1
   ipfiremake mISDN
+  ipfiremake compat-wireless
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -359,6 +374,7 @@ buildipfire() {
   ipfiremake curl
   ipfiremake python
   ipfiremake libnet
+  ipfiremake libnl
   ipfiremake libidn
   ipfiremake libjpeg
   ipfiremake libpng
@@ -529,7 +545,6 @@ buildipfire() {
   ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
-  ipfiremake which
   ipfiremake openswan
   ipfiremake lsof
   ipfiremake centerim
@@ -569,6 +584,7 @@ buildipfire() {
   ipfiremake esniper
   ipfiremake vnstat
   ipfiremake vnstati
+  ipfiremake iw
   ipfiremake wpa_supplicant
   ipfiremake hostapd
   ipfiremake urlgrabber
@@ -583,7 +599,7 @@ buildipfire() {
   ipfiremake netcat
   ipfiremake 7zip
   ipfiremake lynis
-  ipfiremake cryptsetup
+  #ipfiremake cryptsetup
   ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
@@ -593,11 +609,19 @@ buildipfire() {
   ipfiremake sslh
   ipfiremake perl-gettext
   ipfiremake vdradmin
+#  ipfiremake x11libs
+#  ipfiremake xen
   ipfiremake miau
   ipfiremake net-snmp
   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
   ipfiremake lcr
+  ipfiremake cacti
+  ipfiremake icecc
+  ipfiremake open-vm-tools
+  ipfiremake nagiosql
+  ipfiremake iftop
+  ipfiremake motion
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -607,6 +631,7 @@ buildipfire() {
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
   echo $CORE > $BASEDIR/build/opt/pakfire/db/core/mine
+  echo $NAME $VERSION - Core$CORE > $BASEDIR/build/etc/system-release
 }
 
 buildinstaller() {
@@ -676,18 +701,25 @@ buildpackages() {
 
   # Create images for install
 	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 ED=$IPFVER
+	ipfiremake flash-images ED=$IPFVER
   fi
 
-  # Create updater package
-  #ipfiremake updater
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages
 
+#  # Check if there is a loop device for building in virtual environments
+#  if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
+#        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
+#	ipfiremake xen-image ED=$IPFVER
+#	rm -rf $LFS/install/packages/linux-xen-*.ipfire
+#  fi
+#  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
+
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*
@@ -973,52 +1005,6 @@ uploadsrc)
 	cd $PWD
 	exit 0
 	;;
-upload)
-	FTP_ISO_PORT=`echo "$FTP_ISO_URL" | awk -F: '{ print $2 }'`
-	FTP_ISO_URL=`echo "$FTP_ISO_URL" | awk -F: '{ print $1 }'`
-	if [ -z $FTP_ISO_PORT ]; then
-	    FTP_ISO_PORT=21
-	fi
-	cat <<EOF > .ftp-commands
-mkdir -p $FTP_ISO_PATH$SVN_REVISION
-mkdir -p $FTP_ISO_PATH$SVN_REVISION/paks
-quit
-EOF
-	ncftp -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL < .ftp-commands
-	rm -f .ftp-commands
-		
-	case "$2" in
-	  iso)
-		echo -e "Uploading the iso to $FTP_ISO_PATH/$SVN_REVISION."
-
-		md5sum ipfire-$VERSION.$MACHINE-full.iso > ipfire-$VERSION.$MACHINE-full.iso.md5
-		for i in svn_status ipfire-source-r$SVN_REVISION.tar.gz ipfire-$VERSION.$MACHINE-full.iso ipfire-$VERSION.$MACHINE-full.iso.md5 ipfire-$VERSION.$MACHINE-devel.iso ipfire-$VERSION.$MACHINE-devel.iso.md5; do
-				if [ -e "$i" ]; then
-			    ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/ $i
-					if [ "$?" -eq "0" ]; then
-						echo "The file with name $i was successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/."
-					else
-						echo "There was an error while uploading the file $i to the ftp server."
-						exit 1
-					fi
-				fi
-		done
-		rm -f ipfire-$VERSION.$MACHINE-full.iso.md5
-		if [ "$3" = "--with-sources-cd" ]; then
-			ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH/$SVN_REVISION/ ipfire-sources-cd-$VERSION.$MACHINE.iso
-		fi
-		;;
-	  paks)
-		ncftpput -u $FTP_ISO_USER -p $FTP_ISO_PASS -P $FTP_ISO_PORT $FTP_ISO_URL $FTP_ISO_PATH$SVN_REVISION/paks packages/*
-		if [ "$?" -eq "0" ]; then
-			echo -e "The packages were successfully uploaded to $FTP_ISO_URL$FTP_ISO_PATH$SVN_REVISION/."
-		else
-			echo -e "There was an error while uploading the packages to the ftp server."
-			exit 1
-		fi
-	  ;;
-	esac
-	;;
 batch)
 	if [ "$2" = "--background" ]; then
 		batch_script