Added some new useragents.

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

diff --git a/make.sh b/make.sh
index d777da4b379e03140ae54fe80e3bbd10dc0bf41d..7f62482ece9cd6dca143fe5436e6b8354d556988 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -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)
 
@@ -332,28 +333,25 @@ buildipfire() {
   ipfiremake ppp
   ipfiremake rp-pppoe
   ipfiremake unzip
-  ipfiremake linux                     SMP=1
+#  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 openswan          KMOD=1  SMP=1
+#  ipfiremake atl2                     SMP=1
+#  ipfiremake kqemu                    SMP=1
+#  ipfiremake v4l-dvb                  SMP=1
+#  ipfiremake madwifi                    SMP=1
+#  ipfiremake alsa             KMOD=1  SMP=1
+#  ipfiremake sane             KMOD=1  SMP=1
+#  ipfiremake openswan         KMOD=1  SMP=1
   ipfiremake linux
-#  ipfiremake linux-fusion
-#  ipfiremake ipp2p
-#  ipfiremake r8169
-#  ipfiremake r8168
-#  ipfiremake atl1
+  ipfiremake linux-fusion
   ipfiremake atl2
+  ipfiremake r8168
+  ipfiremake r8169
   ipfiremake kqemu
   ipfiremake v4l-dvb
   ipfiremake madwifi
+  ipfiremake alsa              KMOD=1
   ipfiremake sane              KMOD=1
   ipfiremake openswan          KMOD=1
   ipfiremake pkg-config
@@ -419,7 +417,6 @@ buildipfire() {
   ipfiremake whatmask
   ipfiremake iptables
   ipfiremake libupnp
-#  ipfiremake ipp2p                    IPT=1
   ipfiremake linux-igd
   ipfiremake ipaddr
   ipfiremake iptstate
@@ -457,6 +454,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
@@ -469,7 +471,6 @@ buildipfire() {
   ipfiremake snort
   ipfiremake oinkmaster
   ipfiremake squid
-  ipfiremake squid-graph
   ipfiremake squidguard
   ipfiremake calamaris
   ipfiremake tcpdump
@@ -504,7 +505,6 @@ buildipfire() {
   ipfiremake spamassassin
   ipfiremake amavisd
   ipfiremake alsa
-  ipfiremake mpg123
   ipfiremake mpfire
   ipfiremake guardian
   ipfiremake libid3tag
@@ -552,8 +552,6 @@ buildipfire() {
   ipfiremake lm_sensors
   ipfiremake collectd
   ipfiremake lcd4linux
-  ipfiremake neon
-  ipfiremake subversion
   ipfiremake tcptrack
   ipfiremake teamspeak
   ipfiremake elinks
@@ -567,7 +565,6 @@ buildipfire() {
   ipfiremake tunctl
   ipfiremake nagios
   ipfiremake ebtables
-  ipfiremake arptables
   ipfiremake fontconfig
   ipfiremake freefont
   ipfiremake directfb
@@ -585,6 +582,15 @@ buildipfire() {
   ipfiremake wpa_supplicant
   ipfiremake hostapd
   ipfiremake urlgrabber
+  ipfiremake syslinux
+  ipfiremake tftp-hpa
+  ipfiremake cpufrequtils
+  ipfiremake dbus
+  ipfiremake bluetooth
+  ipfiremake gutenprint
+  ipfiremake apcupsd
+  ipfiremake iperf
+  ipfiremake netcat
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -599,7 +605,6 @@ buildinstaller() {
   # Run installer scripts one by one
   LOGFILE="$BASEDIR/log/_build.installer.log"
   export LOGFILE
-  ipfiremake syslinux
   ipfiremake as86
   ipfiremake mbr
   ipfiremake memtest
@@ -656,6 +661,10 @@ 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
@@ -746,6 +755,11 @@ build)
 
        beautify build_stage "Building packages"
        buildpackages
+       
+       beautify build_stage "Checking Logfiles for new Files"
+       cd ..
+       tools/checknewlog.pl
+
        beautify build_end
        ;;
 shell)
@@ -855,7 +869,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
@@ -921,6 +935,12 @@ git)
                        
                git push ${GIT_URL} ${GIT_BRANCH}
                ;;
+         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)