Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index de92e58a2987ca00404b6f40c588616e4e102b08..b008bdb98d5d0f00dee33fbb085083f2ddbdaa42 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,6 +25,7 @@
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
 VERSION="2.3"
+CORE="27"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -503,10 +504,6 @@ buildipfire() {
   ipfiremake lame
   ipfiremake sox
   ipfiremake libshout
-  ipfiremake icecast
-  ipfiremake icegenerator
-  ipfiremake mpd
-  ipfiremake mpc
   ipfiremake xvid
   ipfiremake libmpeg2
   ipfiremake cmake
@@ -561,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
@@ -571,7 +572,7 @@ buildipfire() {
   ipfiremake hostapd
   ipfiremake urlgrabber
   ipfiremake syslinux
-  ipfiremake tftp-hpa
+  ipfiremake tftpd
   ipfiremake cpufrequtils
   ipfiremake dbus
   ipfiremake bluetooth
@@ -585,12 +586,11 @@ buildipfire() {
   ipfiremake splix
   ipfiremake streamripper
   ipfiremake sshfs
-  ipfiremake libdlna
-  ipfiremake ushare
   ipfiremake sqlite
   ipfiremake taglib
   ipfiremake mediatomb
   ipfiremake sslh
+  ipfiremake perl-gettext
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -599,6 +599,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() {