samba: updated to 3.6.13.

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

diff --git a/make.sh b/make.sh
index 94e45edf027ad99a2c33a2b58dad6fbcca5a1fd7..359542143cc225d55702159a50637e027f47cd96 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
-CORE="64"                                                      # Core Level (Filename)
-PAKFIRE_CORE="64"                                              # Core Level (PAKFIRE)
+CORE="68"                                                      # Core Level (Filename)
+PAKFIRE_CORE="67"                                              # 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"
@@ -396,10 +396,9 @@ buildipfire() {
     ipfiremake linux                   KCFG="-pae"
     ipfiremake kvm-kmod                        KCFG="-pae"
     ipfiremake v4l-dvb                 KCFG="-pae"
-    ipfiremake alsa                    KCFG="-pae" KMOD=1
     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"
@@ -410,10 +409,9 @@ buildipfire() {
     ipfiremake linux                   KCFG=""
     ipfiremake kvm-kmod                        KCFG=""
     ipfiremake v4l-dvb                 KCFG=""
-    ipfiremake alsa                    KCFG="" KMOD=1
     ipfiremake mISDN                   KCFG=""
     ipfiremake cryptodev               KCFG=""
-    ipfiremake compat-wireless         KCFG=""
+    ipfiremake compat-drivers          KCFG=""
     ipfiremake r8169                   KCFG=""
     ipfiremake r8168                   KCFG=""
     ipfiremake r8101                   KCFG=""
@@ -426,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"
@@ -511,7 +509,9 @@ buildipfire() {
   ipfiremake mtools
   ipfiremake initscripts
   ipfiremake whatmask
+  ipfiremake libmnl
   ipfiremake iptables
+  ipfiremake conntrack-tools
   ipfiremake libupnp
   ipfiremake ipaddr
   ipfiremake iputils
@@ -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
@@ -590,6 +591,7 @@ buildipfire() {
   ipfiremake ghostscript
   ipfiremake foomatic
   ipfiremake hplip
+  ipfiremake cifs-utils
   ipfiremake samba
   ipfiremake sudo
   ipfiremake mc
@@ -749,6 +751,15 @@ buildipfire() {
   ipfiremake gpgme
   ipfiremake pygpgme
   ipfiremake pakfire3
+  ipfiremake stress
+  ipfiremake libstatgrab
+  ipfiremake sarg
+  ipfiremake fstrim
+  ipfiremake check_mk_agent
+  ipfiremake libdaemon
+  ipfiremake avahi
+  ipfiremake nginx
+  ipfiremake sendEmail
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -758,12 +769,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*)
-           echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
+       core*|beta?|rc?)
+           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
 }