X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=6c09095236d7a7082a8a8234c7a0717d3c02e89a;hp=d13e8aac872cac1579172ab98f38181dd2e0fcd0;hb=8b71215c3d4f20308a0b36d03d66ddc5bee47d38;hpb=3317ed27dedcf2fcb2560322759e9ac0cb520e0a

diff --git a/make.sh b/make.sh
index d13e8aac87..6c09095236 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.5"							# Version number
-CORE="34"							# Core Level (Filename)
-PAKFIRE_CORE="33"						# Core Level (PAKFIRE)
+CORE="37"							# Core Level (Filename)
+PAKFIRE_CORE="36"						# 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
@@ -340,24 +340,30 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
-#  ipfiremake linux			XEN=1
-#  ipfiremake atl2			XEN=1
-#  ipfiremake hso			XEN=1
-#  ipfiremake e1000e			XEN=1
-#  ipfiremake r8101			XEN=1
-#  ipfiremake r8169			XEN=1
-#  ipfiremake r8168			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			XEN=1
+  ipfiremake atl1c			XEN=1
+  ipfiremake atl2			XEN=1
+  ipfiremake hso			XEN=1
+  ipfiremake e1000e			XEN=1
+  ipfiremake et131x			XEN=1
+  ipfiremake r8101			XEN=1
+  ipfiremake r8169			XEN=1
+  ipfiremake r8168			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
+  ipfiremake atl1c
   ipfiremake atl2
   ipfiremake hso
   ipfiremake e1000e
+  ipfiremake et131x
   ipfiremake r8101
   ipfiremake r8169
   ipfiremake r8168
@@ -366,6 +372,7 @@ buildipfire() {
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa			KMOD=1
+  ipfiremake dahdi			KMOD=1
   ipfiremake openswan			KMOD=1
   ipfiremake mISDN
   ipfiremake compat-wireless
@@ -533,8 +540,6 @@ buildipfire() {
   ipfiremake xvid
   ipfiremake libmpeg2
   ipfiremake cmake
-  ipfiremake libpri
-  ipfiremake asterisk
   ipfiremake gnump3d
   ipfiremake libsigc++
   ipfiremake applejuice
@@ -579,6 +584,7 @@ buildipfire() {
   ipfiremake freefont
   ipfiremake directfb
   ipfiremake dfb++
+  ipfiremake faad
   ipfiremake ffmpeg
   ipfiremake videolan
   ipfiremake vdr
@@ -586,6 +592,7 @@ buildipfire() {
   ipfiremake icecast
   ipfiremake icegenerator
   ipfiremake mpd
+  ipfiremake libmpdclient
   ipfiremake mpc
   ipfiremake git
   ipfiremake squidclamav
@@ -624,7 +631,6 @@ buildipfire() {
   ipfiremake netsnmpd
   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
-  ipfiremake lcr
   ipfiremake cacti
   ipfiremake icecc
   ipfiremake open-vm-tools
@@ -634,6 +640,13 @@ buildipfire() {
   ipfiremake joe
   ipfiremake nut
   ipfiremake watchdog
+  ipfiremake libpri
+  ipfiremake dahdi
+  ipfiremake asterisk
+  ipfiremake lcr
+  ipfiremake usb_modeswitch
+  ipfiremake zerofree
+  ipfiremake mdadm
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -728,14 +741,14 @@ 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
+  # 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
 
   # Cleanup