Merge branch 'master' into perl_5.12.2

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

diff --git a/make.sh b/make.sh
index 110d926dec3197d4feaa8fa51a2d5f0b033ef993..f144ec4f7ad24ee0c7b2cf0b0abe2f5010a58f4c 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.8test"                                              # Version number
-CORE="43"                                                      # Core Level (Filename)
-PAKFIRE_CORE="42"                                              # Core Level (PAKFIRE)
+VERSION="2.9"                                                  # Version number
+CORE="45"                                                      # Core Level (Filename)
+PAKFIRE_CORE="45"                                              # 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
@@ -327,7 +327,6 @@ buildbase() {
     lfsmake2 man
     lfsmake2 mktemp
     lfsmake2 module-init-tools
-    lfsmake2 mtd
     lfsmake2 net-tools
     lfsmake2 patch
     lfsmake2 psmisc
@@ -382,9 +381,9 @@ buildipfire() {
   ipfiremake dahdi                     PAE=1 KMOD=1
   ipfiremake cryptodev                 PAE=1
   ipfiremake compat-wireless           PAE=1
-  ipfiremake r8169                     PAE=1
-  ipfiremake r8168                     PAE=1
-  ipfiremake r8101                     PAE=1
+#  ipfiremake r8169                    PAE=1
+#  ipfiremake r8168                    PAE=1
+#  ipfiremake r8101                    PAE=1
   ipfiremake e1000                     PAE=1
   ipfiremake e1000e                    PAE=1
   ipfiremake igb                       PAE=1
@@ -398,9 +397,9 @@ buildipfire() {
   ipfiremake dahdi                     KMOD=1
   ipfiremake cryptodev
   ipfiremake compat-wireless
-  ipfiremake r8169
-  ipfiremake r8168
-  ipfiremake r8101
+#  ipfiremake r8169
+#  ipfiremake r8168
+#  ipfiremake r8101
   ipfiremake e1000
   ipfiremake e1000e
   ipfiremake igb
@@ -418,6 +417,7 @@ buildipfire() {
   ipfiremake openssl
   ipfiremake curl
   ipfiremake python
+  ipfiremake fireinfo
   ipfiremake libnet
   ipfiremake libnl
   ipfiremake libidn
@@ -432,6 +432,7 @@ buildipfire() {
   ipfiremake slang
   ipfiremake newt
   ipfiremake attr
+  ipfiremake acl
   ipfiremake libcap
   ipfiremake pciutils
   ipfiremake usbutils
@@ -519,6 +520,8 @@ buildipfire() {
   ipfiremake rrdtool
   ipfiremake setserial
   ipfiremake setup
+  ipfiremake libdnet
+  ipfiremake daq
   ipfiremake snort
   ipfiremake oinkmaster
   ipfiremake squid
@@ -572,8 +575,6 @@ buildipfire() {
   ipfiremake gnump3d
   ipfiremake libsigc++
   ipfiremake applejuice
-  ipfiremake ocaml
-  ipfiremake mldonkey
   ipfiremake libtorrent
   ipfiremake rtorrent
   ipfiremake ipfireseeder
@@ -681,6 +682,10 @@ buildipfire() {
   ipfiremake ddrescue
   ipfiremake tcl
   ipfiremake imspector
+  ipfiremake miniupnpd
+  ipfiremake client175
+  ipfiremake powertop
+  ipfiremake parted
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -690,7 +695,7 @@ 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_BRANCH" = "next" ]; then
+  if [ "$GIT_BRANCH" = "master" ]; then
        echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
   else
        echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
@@ -758,6 +763,12 @@ buildpackages() {
   fi
   mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1
 
+  cd $BASEDIR
+  for i in `ls *.bz2 *.img.gz *.iso`; do
+       md5sum $i > $i.md5
+  done
+  cd $PWD
+
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*
@@ -834,8 +845,10 @@ build)
        buildpackages
        
        beautify build_stage "Checking Logfiles for new Files"
-       cd ..
+
+       cd $BASEDIR
        tools/checknewlog.pl
+       cd $PWD
 
        beautify build_end
        ;;
@@ -867,6 +880,7 @@ clean)
        if [ -h /tools ]; then
                rm -f /tools
        fi
+       rm -f $BASEDIR/ipfire-*
        beautify message DONE
        ;;
 downloadsrc)