X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=9aa1aca80db2c4ce5ecb6747379a5d955914a42f;hp=6a7c63aa0b99944b3e219d3754cc969ed5af3f3b;hb=451a2f6806e4bc1c0b8c2b47e205916df509ed3f;hpb=6803ea5902156881c55829f108a4273e7db0f259

diff --git a/make.sh b/make.sh
index 6a7c63aa0b..9aa1aca80d 100755
--- a/make.sh
+++ b/make.sh
@@ -25,18 +25,19 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.6"							# Version number
-CORE="37"							# Core Level (Filename)
-PAKFIRE_CORE="36"						# Core Level (PAKFIRE)
+CORE="38"							# Core Level (Filename)
+PAKFIRE_CORE="37"						# 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,6 +342,7 @@ buildipfire() {
   ipfiremake unzip
   ipfiremake which
   ipfiremake xz
+  ipfiremake linux-firmware
   ipfiremake linux			XEN=1
   ipfiremake kqemu			XEN=1
   #ipfiremake kvm-kmod			XEN=1
@@ -348,18 +350,18 @@ buildipfire() {
   ipfiremake madwifi			XEN=1
   #ipfiremake alsa			XEN=1 KMOD=1
   ipfiremake dahdi			XEN=1 KMOD=1
-  ipfiremake openswan			XEN=1 KMOD=1
+  #ipfiremake openswan			XEN=1 KMOD=1
   #ipfiremake mISDN			XEN=1
   #ipfiremake compat-wireless		XEN=1
   ipfiremake cryptodev			XEN=1
   ipfiremake linux
   ipfiremake kqemu
-  #ipfiremake kvm-kmod
+  ipfiremake kvm-kmod
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa			KMOD=1
   ipfiremake dahdi			KMOD=1
-  ipfiremake openswan			KMOD=1
+#  ipfiremake openswan			KMOD=1
   #ipfiremake mISDN
   #ipfiremake compat-wireless
   ipfiremake cryptodev
@@ -546,7 +548,8 @@ buildipfire() {
   ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
-  ipfiremake openswan
+#  ipfiremake openswan
+  ipfiremake strongswan
   ipfiremake lsof
   ipfiremake centerim
   ipfiremake br2684ctl
@@ -562,6 +565,7 @@ buildipfire() {
   ipfiremake fbset
   ipfiremake sdl
   ipfiremake qemu
+  ipfiremake qemu-kqemu
   ipfiremake sane
   ipfiremake netpbm
   ipfiremake phpSANE
@@ -636,6 +640,7 @@ buildipfire() {
   ipfiremake zerofree
   ipfiremake mdadm
   ipfiremake eject
+  ipfiremake pound
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -645,7 +650,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
@@ -721,7 +726,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
@@ -731,7 +736,7 @@ buildpackages() {
   ipfirepackages
 
   # 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
         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