Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next

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

diff --git a/make.sh b/make.sh
index d56ee48ef5e46f79c0dbcb94cfe6b614e98d962d..6a7c63aa0b99944b3e219d3754cc969ed5af3f3b 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -22,18 +22,20 @@
 ############################################################################
 #
 
-NAME="IPFire"                                                                          # Software name
-SNAME="ipfire"                                                                 # Short name
-VERSION="2.5"
-CORE="31"
-GIT_BRANCH=master:master                                                                               # Version number
-SLOGAN="www.ipfire.org"                                        # Software slogan
-CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
-NICE=10                                                                                                        # Nice level
-MAX_RETRIES=1                                                                          # prefetch/check loop
+NAME="IPFire"                                                  # Software name
+SNAME="ipfire"                                                 # Short name
+VERSION="2.6"                                                  # Version number
+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
+NICE=10                                                                # Nice level
+MAX_RETRIES=1                                                  # prefetch/check loop
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
-GIT_TAG=$(git tag | tail -1)
+GIT_TAG=$(git tag | tail -1)                                   # Git Tag
+GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
 TOOLCHAINVER=1
 IPFVER="full"                          # Which versions should be compiled? (full|devel)
 
@@ -338,28 +340,29 @@ buildipfire() {
   ipfiremake pptp
   ipfiremake unzip
   ipfiremake which
+  ipfiremake xz
   ipfiremake linux                     XEN=1
-  ipfiremake atl2                      XEN=1
-  ipfiremake hso                       XEN=1
-  ipfiremake e1000e                    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 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 mISDN                    XEN=1
+  #ipfiremake compat-wireless          XEN=1
+  ipfiremake cryptodev                 XEN=1
   ipfiremake linux
-  ipfiremake atl2
-  ipfiremake hso
-  ipfiremake e1000e
   ipfiremake kqemu
+  #ipfiremake kvm-kmod
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa                      KMOD=1
+  ipfiremake dahdi                     KMOD=1
   ipfiremake openswan                  KMOD=1
-  ipfiremake mISDN
-  ipfiremake compat-wireless
+  #ipfiremake mISDN
+  #ipfiremake compat-wireless
+  ipfiremake cryptodev
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -524,8 +527,6 @@ buildipfire() {
   ipfiremake xvid
   ipfiremake libmpeg2
   ipfiremake cmake
-  ipfiremake libpri
-  ipfiremake asterisk
   ipfiremake gnump3d
   ipfiremake libsigc++
   ipfiremake applejuice
@@ -551,6 +552,7 @@ buildipfire() {
   ipfiremake br2684ctl
   ipfiremake pcmciautils
   ipfiremake lm_sensors
+  ipfiremake liboping
   ipfiremake collectd
   ipfiremake lcd4linux
   ipfiremake tcptrack
@@ -570,6 +572,7 @@ buildipfire() {
   ipfiremake freefont
   ipfiremake directfb
   ipfiremake dfb++
+  ipfiremake faad2
   ipfiremake ffmpeg
   ipfiremake videolan
   ipfiremake vdr
@@ -577,6 +580,7 @@ buildipfire() {
   ipfiremake icecast
   ipfiremake icegenerator
   ipfiremake mpd
+  ipfiremake libmpdclient
   ipfiremake mpc
   ipfiremake git
   ipfiremake squidclamav
@@ -615,7 +619,6 @@ buildipfire() {
   ipfiremake netsnmpd
   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
-  ipfiremake lcr
   ipfiremake cacti
   ipfiremake icecc
   ipfiremake open-vm-tools
@@ -624,6 +627,15 @@ buildipfire() {
   ipfiremake motion
   ipfiremake joe
   ipfiremake nut
+  ipfiremake watchdog
+  ipfiremake libpri
+  ipfiremake dahdi
+  ipfiremake asterisk
+  ipfiremake lcr
+  ipfiremake usb_modeswitch
+  ipfiremake zerofree
+  ipfiremake mdadm
+  ipfiremake eject
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -632,8 +644,12 @@ 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
-  echo $NAME $VERSION - Core$CORE > $BASEDIR/build/etc/system-release
+  echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
+  if [ "$GIT_BRANCH" = "next" ]; then
+       echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
+  else
+       echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
+  fi
 }
 
 buildinstaller() {
@@ -893,7 +909,7 @@ toolchain)
        buildtoolchain
        BUILDMACHINE=`uname -m`
        echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
-       test -d $BASEDIR/cache/toolchains || mkdir $BASEDIR/cache/toolchains
+       test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
        cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \
                build/{bin,etc,usr/bin,usr/local} \
                build/tools/{bin,etc,*-linux-gnu,include,lib,libexec,sbin,share,var} \
@@ -908,7 +924,7 @@ gettoolchain)
        PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE
        if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then
                URL_TOOLCHAIN=`grep URL_TOOLCHAIN lfs/Config | awk '{ print $3 }'`
-               test -d $BASEDIR/cache/toolchains || mkdir $BASEDIR/cache/toolchains
+               test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
                echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
                cd $BASEDIR/cache/toolchains
                wget -U "IPFireSourceGrabber/2.x" $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null
@@ -979,7 +995,7 @@ git)
                [ -z $GIT_USER ] && exiterror "You have to setup GIT_USER first."
                        GIT_URL="ssh://${GIT_USER}@git.ipfire.org/pub/git/ipfire-2.x"
                        
-               git push ${GIT_URL} ${GIT_BRANCH} $3
+               git push ${GIT_URL} $3
                ;;
          log)
                [ -z $GIT_TAG ]  || LAST_TAG=$GIT_TAG