Added a lot of dependencies...

diff --git a/lfs/bind b/lfs/bind
index af92e58ac764bd3a52512dce58cf2888f7ac7e0c..4233b5b79ad4208f5a67dbe07fffbebe3ba8b80a 100644 (file)
--- a/lfs/bind
+++ b/lfs/bind
@@ -38,7 +38,7 @@ MAINTAINER =
 GROUP      = Networking/Tools
 EXTRA      = no
 DEBUG      = no
-DEPS       =
+DEPS       = openssl
 
 URL        = http://www.isc.org/products/BIND/
 LICENSE    = Proprietary

diff --git a/lfs/binutils b/lfs/binutils
index b52dbfbc443408937ff505bf6b4ff0c621dc6eeb..fc41e0ab5d6dfda8359e3574baf2c7b7b2c6e74a 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -42,7 +42,7 @@ MAINTAINER =
 GROUP      = Development/Tools
 EXTRA      = no
 DEBUG      = no
-DEPS       =
+DEPS       = zlib
 
 URL        = http://www.gnu.org/software/binutils/
 LICENSE    = GPLv2+

diff --git a/lfs/cracklib b/lfs/cracklib
index 9cd5d9eff713ef5fb2f0ee92c5e73c7d81468e2f..e1a36102383f1578d8b3eaed81784cd12b942a7f 100644 (file)
--- a/lfs/cracklib
+++ b/lfs/cracklib
@@ -38,7 +38,7 @@ MAINTAINER =
 GROUP      = Security/Password
 EXTRA      = no
 DEBUG      = no
-DEPS       =
+DEPS       = python
 
 URL        = http://sourceforge.net/projects/cracklib/
 LICENSE    = GPLv2

diff --git a/lfs/curl b/lfs/curl
index fc46d4c343c87f2b108b7053cb8aceab79645596..32e7d995d14a0f8dac51cb043bd3412941114888 100644 (file)
--- a/lfs/curl
+++ b/lfs/curl
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+DEPS       = pkg-config openssl openldap
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################

diff --git a/lfs/cyrus-sasl b/lfs/cyrus-sasl
index ec9d3b8c2841bd44c6dfc1cc8d99ab95750e0c72..6039486d18e79308b5ccf22c0731cbdd538b2526 100644 (file)
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -38,7 +38,7 @@ MAINTAINER =
 GROUP      = System/Libraries
 EXTRA      = no
 DEBUG      = no
-DEPS       =
+DEPS       = openssl pam
 
 URL        = http://asg.web.cmu.edu/sasl/sasl-library.html
 LICENSE    = BSD

diff --git a/lfs/dbus b/lfs/dbus
index a047bbde1b2db901ff22e1d401c955092fa978c2..e12feff4c717820db795b98bd937f7c7e7399a91 100644 (file)
--- a/lfs/dbus
+++ b/lfs/dbus
@@ -38,7 +38,7 @@ MAINTAINER =
 GROUP      = System/Libraries
 EXTRA      = no
 DEBUG      = no
-DEPS       =
+DEPS       = expat
 
 URL        = http://www.freedesktop.org/software/dbus/
 LICENSE    = GPLv2+ AFL

diff --git a/lfs/dbus-glib b/lfs/dbus-glib
index e79f87912989192805d464acdb8627727d8182f4..240faa183728d78237b6d3f201e0c1ff6b8c3fc5 100644 (file)
--- a/lfs/dbus-glib
+++ b/lfs/dbus-glib
@@ -38,7 +38,7 @@ MAINTAINER =
 GROUP      = System/Libraries
 EXTRA      = no
 DEBUG      = no
-DEPS       =
+DEPS       = dbus glib expat
 
 URL        = http://www.freedesktop.org/software/dbus/
 LICENSE    = GPLv2+ AFL

diff --git a/lfs/fcron b/lfs/fcron
index 47ac7a6e056a1a5c64ec23ad424a81ebfa40b1f1..057aaac0db3cf7a02b14a7db6b8f7a71782417ae 100644 (file)
--- a/lfs/fcron
+++ b/lfs/fcron
@@ -38,7 +38,7 @@ MAINTAINER =
 GROUP      = System/Daemons
 EXTRA      = no
 DEBUG      = no
-DEPS       =
+DEPS       = pam vim
 
 URL        = http://fcron.free.fr/
 LICENSE    = GPLv2+

diff --git a/lfs/fontconfig b/lfs/fontconfig
index 62aa6ee189ba114946bd43cc8060968caf066aa3..39b5398f543811261d943a273b536ceb8a615fcf 100644 (file)
--- a/lfs/fontconfig
+++ b/lfs/fontconfig
@@ -38,7 +38,7 @@ MAINTAINER =
 GROUP      = System/Libraries
 EXTRA      = no
 DEBUG      = no
-DEPS       =
+DEPS       = freetype libxml2
 
 URL        = http://fontconfig.org/
 LICENSE    = MIT

diff --git a/lfs/glib b/lfs/glib
index 2975c9f0c4eb564c731f8066ce5f2d140fce5a33..09643f0f251115b9cd11db53a4e3d8f910ca7263 100644 (file)
--- a/lfs/glib
+++ b/lfs/glib
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+DEPS       = pkg-config
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################

diff --git a/lfs/gnupg b/lfs/gnupg
index d770bf9ed182da116e986de0891d4d07c435f352..4b7e8c1f4dee942dd9c1d52695f9eebb2394b77b 100644 (file)
--- a/lfs/gnupg
+++ b/lfs/gnupg
@@ -38,7 +38,7 @@ MAINTAINER =
 GROUP      = Security/Tools
 EXTRA      = no
 DEBUG      = no
-DEPS       = libassuan libgcrypt libksba pinentry pth
+DEPS       = curl libassuan libgcrypt libksba pinentry pth
 
 URL        = http://www.gnupg.org/
 LICENSE    = GPLv3+

diff --git a/lfs/hal b/lfs/hal
index 8613fb85167e6a4f6f554cc43a86a872288e319b..2bc34aa5bbe6febb467d8c0500a6e0da0700970b 100644 (file)
--- a/lfs/hal
+++ b/lfs/hal
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+DEPS       = dbus-glib parted pciutils perl-xml-parser python usbutils
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################

diff --git a/lfs/libtiff b/lfs/libtiff
index aa260ad99621e1a0a13428c95cfb3b8a9bca4729..38855bb83f521f2894a9b912a8426646fc73d66c 100644 (file)
--- a/lfs/libtiff
+++ b/lfs/libtiff
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = tiff-$(VER).tar.gz
 DIR_APP    = $(DIR_SRC)/tiff-$(VER)
 
+DEPS       = libjpeg
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################

diff --git a/lfs/libusb-compat b/lfs/libusb-compat
index abbc6c88ab6dee634f47bddaaea5b8053a8c5430..2f8a29ab7531de7f359b2c0684833e31299bb390 100644 (file)
--- a/lfs/libusb-compat
+++ b/lfs/libusb-compat
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+DEPS       = libusb
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################

diff --git a/lfs/libxslt b/lfs/libxslt
index b76b5416de66a574c057c44b5b1a5159fb53031f..766aabad23eb3e8062eeb902f0f1a3aedf4a6969 100644 (file)
--- a/lfs/libxslt
+++ b/lfs/libxslt
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+DEPS       = libxml2
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################

diff --git a/lfs/mc b/lfs/mc
index bf4e3dfc7aad7999719333b848f33c88074af61e..d73c7c1b94e91735c2ae2f1acf67746c171474d7 100644 (file)
--- a/lfs/mc
+++ b/lfs/mc
@@ -29,6 +29,7 @@ VER        = 4.6.1
 
 EXTRA      = yes
 DEBUG      = no
+DEPS       = glib slang
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz

diff --git a/lfs/nano b/lfs/nano
index 5109c4ee5f3b07fe675df2f43aebeddce42b0176..10e8f3142270449c878a27d4b2bf36052db8204e 100644 (file)
--- a/lfs/nano
+++ b/lfs/nano
@@ -29,6 +29,7 @@ VER        = 2.0.7
 
 EXTRA      = yes
 DEBUG      = no
+DEPS       = slang
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz

diff --git a/lfs/ntp b/lfs/ntp
index 5e65842a37f118a285aa9b8016ebda78e0288993..a1a96fd7ec5158e2f12a8b7e7493237e5d234dbc 100644 (file)
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+DEPS       = openssl
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################

diff --git a/lfs/openldap b/lfs/openldap
index 9c453bf97c315809c80c5ecbc211ec296cc2d097..8f19537cc850616df0cf43b3e93d910685f158a7 100644 (file)
--- a/lfs/openldap
+++ b/lfs/openldap
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tgz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+DEPS       = berkeley cyrus-sasl openssl pth
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 CFLAGS    += -D_GNU_SOURCE

diff --git a/lfs/openssh b/lfs/openssh
index 8231e3f2187dea0a52a594210aebc82dbc09b79c..dd2ba09d7e288c770d7e591fe2246bb731afaa57 100644 (file)
--- a/lfs/openssh
+++ b/lfs/openssh
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+DEPS       = openssl pam
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 INITSCRIPT = sshd

diff --git a/lfs/pam b/lfs/pam
index d6e0a49e1cd4d2b3d410e7f867e911c389b42c7c..081d4a353309819878045e74337a1f4148924d80 100644 (file)
--- a/lfs/pam
+++ b/lfs/pam
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+DEPS       = cracklib
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)-pass$(PASS)
 
 ###############################################################################

diff --git a/lfs/pam_ldap b/lfs/pam_ldap
index 7dfba475960c6f6c44b62fbfca8c2fa74d843cd5..c4e10b6599074c33781ea06ae02c94d531732645 100644 (file)
--- a/lfs/pam_ldap
+++ b/lfs/pam_ldap
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+DEPS       = openldap
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################

diff --git a/lfs/ppp b/lfs/ppp
index b505c61092d146d237b066a7245ae213f97e4335..551da9d17aa3d744a2d678908b1dbf89560abdd8 100644 (file)
--- a/lfs/ppp
+++ b/lfs/ppp
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+DEPS       = libpcap linux-atm
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################

diff --git a/lfs/python-dbus b/lfs/python-dbus
index 642e0254b7e495a0ffd04aacff6ab0af7d1079ba..18273507f036f2d47f1361628159021e3b0f102c 100644 (file)
--- a/lfs/python-dbus
+++ b/lfs/python-dbus
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+DEPS       = dbus-glib python
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################

diff --git a/lfs/slang b/lfs/slang
index 955bc3faf158e60894a05e1ca1e5f3705a186664..f719336c8c51915856eca944ba0c4b25fe843e08 100644 (file)
--- a/lfs/slang
+++ b/lfs/slang
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+DEPS       = pcre
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################

diff --git a/lfs/usbutils b/lfs/usbutils
index 78d9f3a29e54cf3b5a03e1091f2a0109a531fed0..2e66f9a9922b08965adff72a20fdf6e7e6b4de9a 100644 (file)
--- a/lfs/usbutils
+++ b/lfs/usbutils
@@ -31,6 +31,8 @@ THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
+DEPS       = libusb-compat
+
 OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################

diff --git a/make.sh b/make.sh
index 567317142338c984820c28d10816286e11f2b492..798eaacf05c7d318425155b7b51c2a443f847fd4 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -198,7 +198,7 @@ ipfire_build() {
        ipfire_make dbus
        ipfire_make dbus-glib
        ipfire_make openssl
-       ipfire_make perl                        ### We are building the modules here.
+       ipfire_make perl-xml-parser
        ipfire_make python
        ipfire_make python-dbus
        ipfire_make python-urlgrabber
@@ -291,6 +291,7 @@ ipfire_build() {
        ipfire_make hdparm
        ipfire_make smartmontools
        ipfire_make lm-sensors
+       ipfire_make parted
        ipfire_make hal
        ipfire_make hal-info
 
@@ -312,7 +313,6 @@ ipfire_build() {
        #ipfire_make logwatch   
        ipfire_make cpio
        ipfire_make cdrtools
-       ipfire_make parted
        ipfire_make python-parted
        ipfire_make memtest86+
        #ipfire_make pakfire

diff --git a/tools/make-include b/tools/make-include
index 4fe184a827a924e77b87481a76f757d54725dcfd..e5a3764dc141b1738520e3fecc854ff87c393e92 100644 (file)
--- a/tools/make-include
+++ b/tools/make-include
@@ -163,6 +163,9 @@ entershell() {
 ################################################################################
 lfsmakecommoncheck()
 {
+       logger "Building $*"
+       build_spy package $1
+
        # Script present?
        if [ ! -f $BASEDIR/lfs/$1 ]; then
                exiterror "No such file or directory: $BASEDIR/lfs/$1"
@@ -224,15 +227,12 @@ lfsmakecommoncheck()
                fi
        fi
 
-       echo -e "$(date -u '+%b %e %T'): Building $* " >> $LOGFILE
-
        cd $BASEDIR/lfs && make -s -f $* MACHINE=$MACHINE LFS_BASEDIR=$BASEDIR MESSAGE="$1\t " download  >> $LOGFILE 2>&1
        if [ $? -ne 0 ]; then
                exiterror "Download error in $1"
        fi
 
-       build_spy package $1
-       distcc_reload
+       distcc_reload &
 
        return 0        # pass all!
 } # End of lfsmakecommoncheck()