kernel: Update xen kernel config (IPVS changes).

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

diff --git a/make.sh b/make.sh
index 8c2bb0d0e8aa3306adb1ca526c28cb653f634dc6..6be04a3faf1a2c7ef09ee46bb425ba440ef4f2a3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.13beta2"                                                    # Version number
-CORE="65"                                                      # Core Level (Filename)
-PAKFIRE_CORE="65"                                              # Core Level (PAKFIRE)
+VERSION="2.13"                                                 # Version number
+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,21 +424,21 @@ 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"
@@ -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
@@ -536,6 +536,7 @@ buildipfire() {
   ipfiremake Net-IPv4Addr
   ipfiremake Net_SSLeay
   ipfiremake IO-Stringy
+  ipfiremake IO-Socket-SSL
   ipfiremake Unix-Syslog
   ipfiremake Mail-Tools
   ipfiremake MIME-Tools
@@ -663,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
@@ -696,6 +700,7 @@ buildipfire() {
   ipfiremake mediatomb
   ipfiremake sslh
   ipfiremake perl-gettext
+  ipfiremake perl-Sort-Naturally
   ipfiremake vdradmin
   ipfiremake miau
   ipfiremake netsnmpd
@@ -754,6 +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
@@ -763,12 +781,17 @@ 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 status -s | wc -l)" == "0" ]; then
+       GIT_STATUS=""
+  else
+       GIT_STATUS="-dirty"
+  fi
   case "$GIT_BRANCH" in
        core*|beta?|rc?)
-           echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
+           echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH$GIT_STATUS" > $BASEDIR/build/etc/system-release
            ;;
        *)
-           echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT" > $BASEDIR/build/etc/system-release
+           echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" > $BASEDIR/build/etc/system-release
            ;;
   esac
 }