X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=5702de8c016e49fb9c9759d4b36510c99d142845;hp=2a85a962455ec74798b9f6008f4b4d846f7d52af;hb=7afbf8c47a96ac8cb575a2aaa7b8e98b2996dfa1;hpb=7c7ea34ad7458e279212b55371a5c77713b6e6d2

diff --git a/make.sh b/make.sh
index 2a85a96245..5702de8c01 100755
--- a/make.sh
+++ b/make.sh
@@ -24,19 +24,20 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.6"							# Version number
-CORE="37"							# Core Level (Filename)
-PAKFIRE_CORE="36"						# Core Level (PAKFIRE)
+VERSION="2.7"							# Version number
+CORE="39"							# Core Level (Filename)
+PAKFIRE_CORE="38"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
 NICE=10								# Nice level
 MAX_RETRIES=1							# prefetch/check loop
+BUILD_IMAGES=1							# Build USB, Flash and Xen Images
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 GIT_TAG=$(git tag | tail -1)					# Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)	# Last commit
-TOOLCHAINVER=1
+TOOLCHAINVER=2
 IPFVER="full"				# Which versions should be compiled? (full|devel)
 
 # Debian specific settings
@@ -341,26 +342,35 @@ buildipfire() {
   ipfiremake unzip
   ipfiremake which
   ipfiremake xz
-#  ipfiremake linux			XEN=1
-#  ipfiremake kqemu			XEN=1
-#  #ipfiremake kvm-kmod			XEN=1
-#  ipfiremake v4l-dvb			XEN=1
-#  ipfiremake madwifi			XEN=1
-#  #ipfiremake alsa			XEN=1 KMOD=1
-#  ipfiremake dahdi			XEN=1 KMOD=1
-#  ipfiremake openswan			XEN=1 KMOD=1
-#  ipfiremake mISDN			XEN=1
-#  ipfiremake compat-wireless		XEN=1
+  ipfiremake linux-firmware
+  ipfiremake linux			XEN=1
+  ipfiremake kqemu			XEN=1
+  ipfiremake v4l-dvb			XEN=1
+  ipfiremake madwifi			XEN=1
+  ipfiremake mISDN			XEN=1
+  ipfiremake dahdi			XEN=1 KMOD=1
+  ipfiremake cryptodev			XEN=1
+  ipfiremake compat-wireless		XEN=1
+  ipfiremake r8169			XEN=1
+  ipfiremake r8168			XEN=1
+  ipfiremake r8101			XEN=1
+  ipfiremake e1000			XEN=1
+  ipfiremake e1000e			XEN=1
   ipfiremake linux
   ipfiremake kqemu
-  #ipfiremake kvm-kmod
+  ipfiremake kvm-kmod
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa			KMOD=1
+  ipfiremake mISDN
   ipfiremake dahdi			KMOD=1
-  ipfiremake openswan			KMOD=1
-  #ipfiremake mISDN
-  #ipfiremake compat-wireless
+  ipfiremake cryptodev
+  ipfiremake compat-wireless
+  ipfiremake r8169
+  ipfiremake r8168
+  ipfiremake r8101
+  ipfiremake e1000
+  ipfiremake e1000e
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -544,7 +554,7 @@ buildipfire() {
   ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
-  ipfiremake openswan
+  ipfiremake strongswan
   ipfiremake lsof
   ipfiremake centerim
   ipfiremake br2684ctl
@@ -553,13 +563,13 @@ buildipfire() {
   ipfiremake liboping
   ipfiremake collectd
   ipfiremake lcd4linux
-  ipfiremake tcptrack
   ipfiremake teamspeak
   ipfiremake elinks
   ipfiremake igmpproxy
   ipfiremake fbset
   ipfiremake sdl
   ipfiremake qemu
+  ipfiremake qemu-kqemu
   ipfiremake sane
   ipfiremake netpbm
   ipfiremake phpSANE
@@ -583,7 +593,6 @@ buildipfire() {
   ipfiremake git
   ipfiremake squidclamav
   ipfiremake bc
-  ipfiremake esniper
   ipfiremake vnstat
   ipfiremake vnstati
   ipfiremake iw
@@ -601,7 +610,6 @@ buildipfire() {
   ipfiremake netcat
   ipfiremake 7zip
   ipfiremake lynis
-  #ipfiremake cryptsetup
   ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
@@ -611,8 +619,6 @@ buildipfire() {
   ipfiremake sslh
   ipfiremake perl-gettext
   ipfiremake vdradmin
-#  ipfiremake x11libs
-#  ipfiremake xen
   ipfiremake miau
   ipfiremake netsnmpd
   ipfiremake perl-DBI
@@ -633,6 +639,9 @@ buildipfire() {
   ipfiremake usb_modeswitch
   ipfiremake zerofree
   ipfiremake mdadm
+  ipfiremake eject
+  ipfiremake pound
+  ipfiremake minicom
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -642,7 +651,7 @@ buildipfire() {
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
   echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
-  if [ "$GIT_BRANCH" = "next" ]; then
+  if [ "$GIT_BRANCH" = "master" ]; then
 	echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
   else
 	echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
@@ -718,7 +727,7 @@ buildpackages() {
 	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
+  if [ $BUILD_IMAGES == 1 ] &&  ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
 	ipfiremake usb-stick ED=$IPFVER
 	ipfiremake flash-images ED=$IPFVER
   fi
@@ -727,15 +736,15 @@ buildpackages() {
 
   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/
-#        cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
-#	ipfiremake xen-image ED=$IPFVER
-#	rm -rf $LFS/install/packages/linux-xen-*.ipfire
-#	rm -rf $LFS/install/packages/meta-linux-xen
-#  fi
-#  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
+  # Check if there is a loop device for building in virtual environments
+  if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]); then
+        cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
+        cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
+	ipfiremake xen-image ED=$IPFVER
+	rm -rf $LFS/install/packages/linux-xen-*.ipfire
+	rm -rf $LFS/install/packages/meta-linux-xen
+  fi
+  mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
 
   # Cleanup
   stdumount