X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=b51d3b6ce2c3ad1ece5fbf027c1fd521df13ca62;hp=5f47f1a2f120abdc036711de76c429aad8ce9375;hb=316160b0f25bd314c019478a83f0215ef0955ebf;hpb=a20e696311dec49d4f5c5e6715a3ece554a76f86

diff --git a/make.sh b/make.sh
index 5f47f1a2f1..b51d3b6ce2 100644
--- a/make.sh
+++ b/make.sh
@@ -337,7 +337,7 @@ ipcopmake() {
 ipfiredist() {
 	if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
 		echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
-		cp -f $BASEDIR/src/scripts/make-packages.sh $BASEDIR/build/usr/sbin/
+		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 \
@@ -356,12 +356,8 @@ ipfiredist() {
 	else
 		exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
 	fi
-	if [ -e $BASEDIR/packages ]; then
-		mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
-	else
-		mkdir -p $BASEDIR/packages
-		mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
-	fi
+#	test -d $BASEDIR/packages || mkdir $BASEDIR/packages
+#	mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
 	return 0
 }
 
@@ -647,32 +643,45 @@ buildipcop() {
   ipcopmake libsafe
   ipcopmake 3c5x9setup
   echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE
-  ipcopmake sudo
-##ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
-  ipcopmake xinetd
+## Zuerst die Libs und dann die Programme. Ordnung muss sein!
+  ipcopmake berkeley
+  ipcopmake libtiff
+  ipcopmake libjpeg
+  ipcopmake libxml2
+  ipcopmake spandsp
+  ipcopmake lzo
   ipcopmake pkg-config
   ipcopmake glib
-  ipcopmake wget
-  ipcopmake berkeley-DB
   ipcopmake xampp
-  ipcopmake bridge-utils
   ipcopmake pam
   ipcopmake pammysql
   ipcopmake saslauthd PASS=1
   ipcopmake openldap
   ipcopmake saslauthd PASS=2
+  ipcopmake xinetd
+  ipcopmake ghostscript
+  ipcopmake cups
   ipcopmake samba
+  ipcopmake sudo
   ipcopmake mc
-  ipcopmake postfix
-  ipcopmake stund
-  ipcopmake lpd
   ipcopmake pwlib
   ipcopmake openh323
+  ipcopmake wget
+  ipcopmake bridge-utils
+  ipcopmake postfix
+  ipcopmake fetchmail
+  ipcopmake cyrusimap
+  ipcopmake stund
+#  ipcopmake lpd
+  ipcopmake openvpn
+  ipcopmake asterisk
+  ipcopmake edonkeyclc
+  ipcopmake sane
+  ipcopmake lame
+  ipcopmake gnump3d
 #  wget http://www.guzu.net/linux/hddtemp.db && mv hddtemp.db $BASEDIR/build/etc/hddtemp.db
 #  ipcopmake hddtemp
-  ipcopmake lzo
-  ipcopmake openvpn
-
+# ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
 }
 
 buildinstaller() {
@@ -762,10 +771,22 @@ buildpackages() {
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
   # Build IPFire packages
+  ipfiredist asterisk
+  ipfiredist cyrusimap
+  ipfiredist fetchmail
+  ipfiredist libtiff
+  ipfiredist libxml2
   ipfiredist mc
   ipfiredist postfix
+  ipfiredist pwlib
+  ipfiredist sane
+  ipfiredist spandsp
   ipfiredist sudo
+  ipfiredist xampp
   ipfiredist xinetd
+  test -d $BASEDIR/packages || mkdir $BASEDIR/packages
+  cp -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
+
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*
@@ -1083,7 +1104,7 @@ gettoolchain)
 	URL_IPFIRE=`grep URL_IPFIRE lfs/Config | awk '{ print $3 }'`
 	echo "`date -u '+%b %e %T'`: Load toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
 	cd $BASEDIR/cache
-	wget -c $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5
+	wget $URL_IPFIRE/toolchains/$PACKAGE.tar.gz $URL_IPFIRE/toolchains/$PACKAGE.md5
 	if [ $? -ne 0 ]; then
 		echo "`date -u '+%b %e %T'`: error downloading toolchain for $BUILDMACHINE machine" | tee -a $LOGFILE
 	else