X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=58d7e24d698a197ec6bad59e258134f0e5b5d80a;hp=63ffa6edb9158032d96f6cb88763670495ecad75;hb=5fd302326dd90d17abb8496d575c795a61c033d8;hpb=d02350a277a2087f3f774400d1c380510bfbfba9

diff --git a/make.sh b/make.sh
index 63ffa6edb9..58d7e24d69 100644
--- a/make.sh
+++ b/make.sh
@@ -33,7 +33,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 SVN_REVISION=`svn info | grep Revision | cut -c 11-`
 
-IPFVER="full devel"				# Which versions should be compiled? (full|light|voice|devel)
+IPFVER="full"				# Which versions should be compiled? (full|light|voice|devel)
 
 # Set an information about the build number
 if [ -e ./.svn ]; then
@@ -170,7 +170,7 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j12"
+    MAKETUNING="-j4"
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
@@ -284,7 +284,6 @@ buildbase() {
     lfsmake2 file
     lfsmake2 findutils
     lfsmake2 flex
-    lfsmake2 grub
     lfsmake2 gawk
     lfsmake2 gettext
     lfsmake2 grep
@@ -294,6 +293,7 @@ buildbase() {
     lfsmake2 iproute2
     lfsmake2 kbd
     lfsmake2 less
+    lfsmake2 libaal
     lfsmake2 make
     lfsmake2 man
     lfsmake2 mktemp
@@ -301,6 +301,7 @@ buildbase() {
     lfsmake2 net-tools
     lfsmake2 patch
     lfsmake2 psmisc
+    lfsmake2 reiser4progs
     lfsmake2 shadow
     lfsmake2 sysklogd
     lfsmake2 sysvinit
@@ -309,6 +310,7 @@ buildbase() {
     lfsmake2 udev
     lfsmake2 util-linux
     lfsmake2 vim
+    lfsmake2 grub
 }
 
 buildipfire() {
@@ -345,6 +347,8 @@ buildipfire() {
 #  ipfiremake promise-sata-300-tx
   ipfiremake zaptel
   ipfiremake fuse
+  ipfiremake pkg-config
+  ipfiremake cpio
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
@@ -380,14 +384,17 @@ buildipfire() {
   ipfiremake capi4k-utils
   ipfiremake cdrtools
   ipfiremake dnsmasq
+  ipfiremake libaal
   ipfiremake dosfstools
   ipfiremake reiserfsprogs
   ipfiremake squashfstools
+  ipfiremake sysfsutils
   ipfiremake ntfs-3g
   ipfiremake ethtool
   ipfiremake ez-ipupdate
   ipfiremake fcron
   ipfiremake GD
+  ipfiremake GD-Graph
   ipfiremake gnupg
   ipfiremake hdparm
   ipfiremake ibod
@@ -404,6 +411,7 @@ buildipfire() {
   ipfiremake l7-protocols
   ipfiremake isapnptools
 #  ipfiremake isdn4k-utils # What about mISDN???
+  ipfiremake hwdata
   ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch
@@ -434,6 +442,11 @@ buildipfire() {
   ipfiremake Archive-Zip
   ipfiremake Text-Tabs+Wrap
   ipfiremake Locale-Country
+  ipfiremake XML-Parser
+  ipfiremake glib
+  ipfiremake dbus
+  ipfiremake hal
+  ipfiremake hwinfo
   ipfiremake GeoIP
   ipfiremake fwhits
   ipfiremake noip_updater
@@ -461,8 +474,6 @@ buildipfire() {
   ipfiremake spandsp
   ipfiremake lzo
   ipfiremake openvpn
-  ipfiremake pkg-config
-  ipfiremake glib
   ipfiremake pammysql
   ipfiremake xinetd
   ipfiremake ghostscript
@@ -521,7 +532,6 @@ buildipfire() {
   ipfiremake tftp-hpa
   ipfiremake iptraf
   ipfiremake nagios
-  ipfiremake yasuc
 }
 
 buildinstaller() {
@@ -547,10 +557,19 @@ buildinstaller() {
   installmake sysvinit
   installmake misc-progs
   installmake e2fsprogs
+  installmake libaal
+  installmake reiser4progs
   installmake reiserfsprogs
   installmake sysfsutils
   installmake util-linux
   installmake pciutils
+  installmake zlib
+  installmake wget
+  installmake libxml2
+  installmake dbus
+  installmake hal
+  installmake hwdata
+  installmake hwinfo
   installmake kudzu
   installmake installer
   installmake initrd
@@ -582,7 +601,7 @@ buildpackages() {
   for i in $IPFVER
   do
 	if [ $i == "devel" ]; then
-		if [ ! -f ipfire-$VER.i586-devel.iso ]; then
+		if [ ! -e ipfire-$VERSION.i586-devel.iso ]; then
 			ipfiremake cdrom ED=$i
 		fi
 	else
@@ -992,7 +1011,7 @@ EOF
 	esac
 	;;
 batch)
-	if [ "$2" -eq "--background" ]; then
+	if [ "$2" = "--background" ]; then
 		batch_script
 		exit $?
 	fi