X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=b18e02c26bdc94821f9eed064ac6fbf7e6930f3d;hp=3580d813063b2154aa593cc52e35df01145e0d44;hb=a7b1824c6c543afe1884dbb62e80ba219bc90fd1;hpb=c7acba4a59b42c6448a30dc23126fbf8fd761cbd

diff --git a/make.sh b/make.sh
index 3580d81306..b18e02c26b 100644
--- a/make.sh
+++ b/make.sh
@@ -33,6 +33,12 @@
   KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
   MACHINE=`uname -m`
 
+  # Setzen des IPFire Builds
+  if [ -e ./.svn ]; then
+    FIREBUILD=`cat .svn/entries |sed -n 's/^[ \t]*revision=\"// p' | sed -n 's/\".*$// p'`
+#    VERSION="$VERSION (Build:$FIREBUILD)"
+  fi
+
   # Debian specific settings
   if [ ! -e /etc/debian_version ]; then
 	FULLPATH=`which $0`
@@ -55,6 +61,7 @@
   mkdir $BASEDIR/log/ 2>/dev/null
 
   if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE -o 'i486' = $MACHINE -o 'i386' = $MACHINE ]; then
+
 	echo "`date -u '+%b %e %T'`: Machine is ix86 (or equivalent)" | tee -a $LOGFILE
 	MACHINE=i386
 	BUILDTARGET=i386-pc-linux-gnu
@@ -337,7 +344,6 @@ ipfiredist() {
 	if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
 #	   if [ ! `ls -w1 $BASEDIR/packages/*.tar.gz | grep $1` ]; then
 		echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
-		cp -f $BASEDIR/src/scripts/make-packages.sh $BASEDIR/build/usr/local/bin
 		chroot $LFS /tools/bin/env -i 	HOME=/root \
 						TERM=$TERM PS1='\u:\w\$ ' \
 						PATH=/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin \
@@ -638,6 +644,7 @@ buildipcop() {
   ipcopmake Convert-UUlib
   ipcopmake Archive-Tar
   ipcopmake Archive-Zip
+  ipcopmake Text-Tabs+Wrap
   ipcopmake Locale-Country
   ipcopmake GeoIP
   ipcopmake fwhits
@@ -656,7 +663,6 @@ buildipcop() {
   #ipcopmake speedycgi
   ipcopmake saslauthd PASS=1
   ipcopmake openldap
-  ipcopmake saslauthd PASS=2
   ipcopmake squid
   ipcopmake squid-graph
   ipcopmake squidguard
@@ -666,13 +672,17 @@ buildipcop() {
   #ipcopmake wireless
   ipcopmake libsafe
   ipcopmake 3c5x9setup
-  echo -ne "`date -u '+%b %e %T'`: Building ### IPFire modules ### \n" | tee -a $LOGFILE
+#  echo -ne "`date -u '+%b %e %T'`: Building ### IPFire modules ### \n" | tee -a $LOGFILE
   ipcopmake pakfire
   ipcopmake startscripts
 ## Zuerst die Libs und dann die Programme. Ordnung muss sein!
   ipcopmake java
   ipcopmake libtiff
   ipcopmake libjpeg
+  ipcopmake lcms
+  ipcopmake libmng
+  ipcopmake freetype
+  ipcopmake bootsplash
   ipcopmake libxml2
   ipcopmake spandsp
   ipcopmake lzo
@@ -682,6 +692,7 @@ buildipcop() {
   ipcopmake xampp
   ipcopmake pam
   ipcopmake pammysql
+  ipcopmake saslauthd PASS=2
   ipcopmake xinetd
   ipcopmake ghostscript
   ipcopmake cups
@@ -703,29 +714,31 @@ buildipcop() {
   ipcopmake procmail
   ipcopmake fetchmail
   ipcopmake cyrusimap
+  ipcopmake web-cyradm
   ipcopmake mailx
   ipcopmake clamav
   ipcopmake razor
   ipcopmake spamassassin
-  ipcopmake amavisd
+#  ipcopmake amavisd
   echo -ne "`date -u '+%b %e %T'`: Building ### VoIP-Server ### \n" | tee -a $LOGFILE
   ipcopmake stund
   ipcopmake asterisk
+  ipcopmake mpg123
   echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE
   ipcopmake lame
   ipcopmake gnump3d
   echo -ne "`date -u '+%b %e %T'`: Building ### P2P-Clients ### \n" | tee -a $LOGFILE
   ipcopmake applejuice
   ipcopmake edonkeyclc
-  ipcopmake sane
+#  ipcopmake sane
   echo -ne "`date -u '+%b %e %T'`: Building ### Net-Tools ### \n" | tee -a $LOGFILE
   ipcopmake ntop
-  ipcopmake rsync
+#  ipcopmake rsync
   ipcopmake tcpwrapper
   ipcopmake portmap
+  ipcopmake nfs
   ipcopmake nmap
   ipcopmake iftop
-  ipcopmake nfs
   ipcopmake ncftp
   ipcopmake cftp
   ipcopmake etherwake
@@ -836,9 +849,14 @@ buildpackages() {
 }
 
 ipfirepackages() {
+  for i in `ls $BASEDIR/packages`; do
+	touch $BASEDIR/build/install/packages/$i.empty
+  done
+  ipfiredist amavisd
   ipfiredist applejuice
   ipfiredist asterisk
   ipfiredist clamav
+  ipfiredist cups
   ipfiredist cyrusimap
   ipfiredist fetchmail
   ipfiredist gnump3d
@@ -846,15 +864,20 @@ ipfirepackages() {
   ipfiredist lame
   ipfiredist libtiff
   ipfiredist libxml2
+  ipfiredist mailx
+  ipfiredist nfs
+  ipfiredist nmap
   ipfiredist ntop
   ipfiredist postfix
+  ipfiredist procmail
   ipfiredist samba
+  ipfiredist spamassassin
+  ipfiredist web-cyradm
   ipfiredist xampp
   ipfiredist xinetd
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-  mv -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
-  rm -rf $LFS/paks
-  rm -rf $BASEDIR/build/tmp/*
+  mv -f $LFS/install/packages/*.{tar.gz,md5} $BASEDIR/packages >> $LOGFILE 2>&1
+  rm -rf  $BASEDIR/build/install/packages/*
 }
 
 # See what we're supposed to do
@@ -882,8 +905,17 @@ build)
 		echo "`date -u '+%b %e %T'`: Using installed toolchain" | tee -a $LOGFILE
 		prepareenv
 	fi
+
 	buildbase
 	buildipcop
+
+	# Setzen des IPFire Builds
+	if [ $FIREBUILD ]; then
+		echo "$FIREBUILD" > $CONFIG_ROOT/firebuild
+	else
+		echo "_(OvO)_" > $CONFIG_ROOT/firebuild
+	fi
+
 	buildinstaller
 	buildpackages
 	;;
@@ -969,7 +1001,6 @@ newpak)
 		cp $BASEDIR/lfs/postfix $BASEDIR/lfs/$2
 
 		touch ROOTFILES
-		touch CONFFILES
 		touch {,un}install.sh
 	## install.sh
 		echo '#!/bin/bash' > install.sh