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

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

diff --git a/make.sh b/make.sh
index a253100a897175943be9d73976b9a71ca4686de9..d8327c3fbdea1a71838a75f54a737067f7569177 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.3-test"
+VERSION="2.3"
 GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
@@ -32,6 +32,7 @@ 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)
 
 IPFVER="full"                          # Which versions should be compiled? (full|devel)
 
@@ -176,7 +177,9 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j6"
+    if [ -z $MAKETUNING ]; then
+       MAKETUNING="-j6"
+    fi
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
@@ -303,7 +306,7 @@ buildbase() {
     lfsmake2 make
     lfsmake2 man
     lfsmake2 mktemp
-    lfsmake2 modutils
+    lfsmake2 module-init-tools
     lfsmake2 mtd
     lfsmake2 net-tools
     lfsmake2 patch
@@ -331,35 +334,21 @@ buildipfire() {
   ipfiremake libpcap
   ipfiremake ppp
   ipfiremake rp-pppoe
+  ipfiremake pptp
   ipfiremake unzip
-  ipfiremake linux                     SMP=1
-#  ipfiremake linux-fusion             SMP=1
-#  ipfiremake ipp2p                    SMP=1
-#  ipfiremake r8169                    SMP=1
-#  ipfiremake r8168                    SMP=1
-#  ipfiremake atl1                     SMP=1
-  ipfiremake atl2                      SMP=1
-  ipfiremake kqemu                     SMP=1
-  ipfiremake v4l-dvb                   SMP=1
-  ipfiremake madwifi                    SMP=1
-  ipfiremake sane              KMOD=1  SMP=1
   ipfiremake linux
-#  ipfiremake linux-fusion
-#  ipfiremake ipp2p
-#  ipfiremake r8169
-#  ipfiremake r8168
-#  ipfiremake atl1
   ipfiremake atl2
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
-  ipfiremake sane              KMOD=1
+  ipfiremake alsa                      KMOD=1
+  ipfiremake openswan                  KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
   ipfiremake klibc
   ipfiremake mkinitcpio
-  ipfiremake udev                              KLIBC=1
+  ipfiremake udev                      KLIBC=1
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
@@ -417,8 +406,6 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-#  ipfiremake ipp2p                    IPT=1
-  ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
   ipfiremake iputils
@@ -455,6 +442,11 @@ buildipfire() {
   ipfiremake Text-Tabs+Wrap
   ipfiremake Locale-Country
   ipfiremake XML-Parser
+  ipfiremake python-setuptools
+  ipfiremake python-clientform
+  ipfiremake python-mechanize
+  ipfiremake python-feedparser
+  ipfiremake python-rssdler
   ipfiremake glib
   ipfiremake GeoIP
   ipfiremake fwhits
@@ -467,7 +459,6 @@ buildipfire() {
   ipfiremake snort
   ipfiremake oinkmaster
   ipfiremake squid
-  ipfiremake squid-graph
   ipfiremake squidguard
   ipfiremake calamaris
   ipfiremake tcpdump
@@ -502,7 +493,6 @@ buildipfire() {
   ipfiremake spamassassin
   ipfiremake amavisd
   ipfiremake alsa
-  ipfiremake mpg123
   ipfiremake mpfire
   ipfiremake guardian
   ipfiremake libid3tag
@@ -550,8 +540,6 @@ buildipfire() {
   ipfiremake lm_sensors
   ipfiremake collectd
   ipfiremake lcd4linux
-  ipfiremake neon
-  ipfiremake subversion
   ipfiremake tcptrack
   ipfiremake teamspeak
   ipfiremake elinks
@@ -565,7 +553,6 @@ buildipfire() {
   ipfiremake tunctl
   ipfiremake nagios
   ipfiremake ebtables
-  ipfiremake arptables
   ipfiremake fontconfig
   ipfiremake freefont
   ipfiremake directfb
@@ -585,6 +572,21 @@ buildipfire() {
   ipfiremake urlgrabber
   ipfiremake syslinux
   ipfiremake tftp-hpa
+  ipfiremake cpufrequtils
+  ipfiremake dbus
+  ipfiremake bluetooth
+  ipfiremake gutenprint
+  ipfiremake apcupsd
+  ipfiremake iperf
+  ipfiremake netcat
+  ipfiremake 7zip
+  ipfiremake lynis
+  ipfiremake cryptsetup
+  ipfiremake splix
+  ipfiremake streamripper
+  ipfiremake sshfs
+  ipfiremake libdlna
+  ipfiremake ushare
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -655,17 +657,21 @@ buildpackages() {
   rm -f $BASEDIR/doc/packages-list
   # packages-list.txt is ready to be displayed for wiki page
   beautify message DONE
+  
+  # Update changelog
+  cd $BASEDIR
+  $0 git log
 
   # Create images for install
-       ipfiremake cdrom ED=full
+       ipfiremake cdrom ED=$IPFVER
        
   # Check if there is a loop device for building in virtual environments
   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
-       ipfiremake usb-stick
+       ipfiremake usb-stick ED=$IPFVER
   fi
 
   # Create updater package
-  ipfiremake updater
+  #ipfiremake updater
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages
@@ -745,6 +751,11 @@ build)
 
        beautify build_stage "Building packages"
        buildpackages
+       
+       beautify build_stage "Checking Logfiles for new Files"
+       cd ..
+       tools/checknewlog.pl
+
        beautify build_end
        ;;
 shell)
@@ -854,7 +865,7 @@ gettoolchain)
                cd $BASEDIR/cache/toolchains
                wget $URL_TOOLCHAIN/$PACKAGE.tar.gz $URL_TOOLCHAIN/$PACKAGE.md5 >& /dev/null
                if [ $? -ne 0 ]; then
-                       echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
+                       echo "`date -u '+%b %e %T'`: error downloading $PACKAGE toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
                else
                        if [ "`md5sum $PACKAGE.tar.gz | awk '{print $1}'`" = "`cat $PACKAGE.md5 | awk '{print $1}'`" ]; then
                                echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
@@ -885,6 +896,8 @@ othersrc)
 git)
        case "$2" in
          update|up)
+                       ## REMOVES ALL UNCOMMITTED CHANGES!
+                       [ "$3" == "--force" ] && git checkout -f
                        git pull
                ;;
          commit|ci)
@@ -918,8 +931,14 @@ 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}
+               git push ${GIT_URL} ${GIT_BRANCH} $3
                ;;
+         log)
+               [ -z $GIT_TAG ]  || LAST_TAG=$GIT_TAG
+               [ -z $LAST_TAG ] || EXT="$LAST_TAG..HEAD"
+
+               git log -n 500 --no-merges --pretty=medium --shortstat $EXT > $BASEDIR/doc/ChangeLog
+       ;;
        esac
        ;;
 uploadsrc)