X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=9d93f071e3c0a8bce7170bba7304c92bd9d2a90d;hp=b92d47a5d24ce93b9b3a55677ccc77ad7eb92850;hb=dc735c40c38315b8c11f9c99c22cff9000c286f7;hpb=cf4657e0091ccee44de0462c77bd64d08aa7b503

diff --git a/make.sh b/make.sh
index b92d47a5d2..9d93f071e3 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.13"							# Version number
-CORE="66"							# Core Level (Filename)
-PAKFIRE_CORE="66"						# Core Level (PAKFIRE)
+CORE="70"							# Core Level (Filename)
+PAKFIRE_CORE="69"						# 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
@@ -384,7 +384,7 @@ buildipfire() {
     ipfiremake v4l-dvb			KCFG="-xen"
     ipfiremake mISDN			KCFG="-xen"
     ipfiremake cryptodev		KCFG="-xen"
-    ipfiremake compat-wireless		KCFG="-xen"
+    ipfiremake compat-drivers		KCFG="-xen"
     ipfiremake r8169			KCFG="-xen"
     ipfiremake r8168			KCFG="-xen"
     ipfiremake r8101			KCFG="-xen"
@@ -398,7 +398,7 @@ buildipfire() {
     ipfiremake v4l-dvb			KCFG="-pae"
     ipfiremake mISDN			KCFG="-pae"
     ipfiremake cryptodev		KCFG="-pae"
-    ipfiremake compat-wireless		KCFG="-pae"
+    ipfiremake compat-drivers		KCFG="-pae"
     ipfiremake r8169			KCFG="-pae"
     ipfiremake r8168			KCFG="-pae"
     ipfiremake r8101			KCFG="-pae"
@@ -411,7 +411,7 @@ buildipfire() {
     ipfiremake v4l-dvb			KCFG=""
     ipfiremake mISDN			KCFG=""
     ipfiremake cryptodev		KCFG=""
-    ipfiremake compat-wireless		KCFG=""
+    ipfiremake compat-drivers		KCFG=""
     ipfiremake r8169			KCFG=""
     ipfiremake r8168			KCFG=""
     ipfiremake r8101			KCFG=""
@@ -424,25 +424,25 @@ buildipfire() {
     ipfiremake v4l-dvb			KCFG="-rpi"
     ipfiremake mISDN			KCFG="-rpi" NOPCI=1
     ipfiremake cryptodev		KCFG="-rpi"
-    ipfiremake compat-wireless		KCFG="-rpi"
+    ipfiremake compat-drivers		KCFG="-rpi"
 
     # arm-omap (Panda Board) kernel build
     ipfiremake linux			KCFG="-omap"
     ipfiremake v4l-dvb			KCFG="-omap"
     ipfiremake mISDN			KCFG="-omap" NOPCI=1
     ipfiremake cryptodev		KCFG="-omap"
-    ipfiremake compat-wireless		KCFG="-omap"
+    ipfiremake compat-drivers		KCFG="-omap"
 
     # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
     ipfiremake linux			KCFG="-kirkwood"
     ipfiremake v4l-dvb			KCFG="-kirkwood"
     ipfiremake mISDN			KCFG="-kirkwood"
     ipfiremake cryptodev		KCFG="-kirkwood"
-    ipfiremake compat-wireless		KCFG="-kirkwood"
+    ipfiremake compat-drivers		KCFG="-kirkwood"
     ipfiremake r8169			KCFG="-kirkwood"
     ipfiremake r8168			KCFG="-kirkwood"
     ipfiremake r8101			KCFG="-kirkwood"
-    ipfiremake e1000e			KCFG="-kirkwood"
+#    ipfiremake e1000e			KCFG="-kirkwood"
     ipfiremake igb			KCFG="-kirkwood"
 
   fi
@@ -462,6 +462,7 @@ buildipfire() {
   ipfiremake libnet
   ipfiremake libnl
   ipfiremake libidn
+  ipfiremake nasm
   ipfiremake libjpeg
   ipfiremake libexif
   ipfiremake libpng
@@ -523,7 +524,6 @@ buildipfire() {
   ipfiremake logwatch
   ipfiremake misc-progs
   ipfiremake nano
-  ipfiremake nasm
   ipfiremake URI
   ipfiremake HTML-Tagset
   ipfiremake HTML-Parser
@@ -664,6 +664,9 @@ buildipfire() {
   ipfiremake faad2
   ipfiremake ffmpeg
   ipfiremake vdr
+  ipfiremake vdr_streamdev
+  ipfiremake vdr_vnsiserver3
+  ipfiremake vdr_epgsearch
   ipfiremake w_scan
   ipfiremake icecast
   ipfiremake icegenerator
@@ -697,6 +700,7 @@ buildipfire() {
   ipfiremake mediatomb
   ipfiremake sslh
   ipfiremake perl-gettext
+  ipfiremake perl-Sort-Naturally
   ipfiremake vdradmin
   ipfiremake miau
   ipfiremake netsnmpd
@@ -755,7 +759,19 @@ buildipfire() {
   ipfiremake libstatgrab
   ipfiremake sarg
   ipfiremake fstrim
+  ipfiremake check_mk_agent
+  ipfiremake libdaemon
+  ipfiremake avahi
+  ipfiremake nginx
   ipfiremake sendEmail
+  ipfiremake sysbench
+  ipfiremake strace
+  ipfiremake ipfire-netboot
+  ipfiremake lcdproc
+  ipfiremake bitstream
+  ipfiremake multicat
+  ipfiremake keepalived
+  ipfiremake ipvsadm
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -934,6 +950,7 @@ build)
 
 	cd $BASEDIR
 	tools/checknewlog.pl
+	tools/checkwronginitlinks
 	cd $PWD
 
 	beautify build_end