Einige Buildfixes
authorms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Tue, 5 Dec 2006 14:32:03 +0000 (14:32 +0000)
committerms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Tue, 5 Dec 2006 14:32:03 +0000 (14:32 +0000)
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@355 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

config/rootfiles/common/initscripts
doc/packages-list.txt
lfs/gettext
make.sh

index 1898fec..81629f0 100644 (file)
@@ -1,4 +1,4 @@
-etc/boot.d
+#etc/boot.d
 #etc/boot.d/01-unmountinitrd
 #etc/boot.d/02-sethostname
 #etc/boot.d/03-loadkeymap
index 1cfef40..178a5bd 100644 (file)
 * hdparm-6.6
 * htop-0.6.2
 * httpd-2.2.2
-* hwinfo
 * iana-etc-2.10
 * ibod
 * iftop-0.17
 * inetutils-1.4.2
-* initscripts_old
 * ipac-ng-1.31
 * ipaddr-1.2
 * iproute2-2.6.16-060323
index 6cb91a4..8a5cd4b 100644 (file)
@@ -41,7 +41,7 @@ ifeq "$(LFS_PASS)" "install"
 else
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --disable-nls
-  EXTRA_MAKE = $(MAKETUNING)
+  EXTRA_MAKE = 
   EXTRA_INSTALL =
 endif
 else
diff --git a/make.sh b/make.sh
index da6b4b4..8dd989c 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -170,7 +170,7 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    MAKETUNING="-j8"
+    MAKETUNING="-j12"
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
@@ -555,7 +555,6 @@ buildinstaller() {
   installmake gettext
   installmake kbd
   installmake popt
-  installmake kudzu
   installmake sysvinit
   installmake misc-progs
   installmake e2fsprogs
@@ -564,6 +563,7 @@ buildinstaller() {
   installmake util-linux
   installmake pciutils
   installmake pcmciautils
+  installmake kudzu
   installmake installer
   installmake scsi.img # this is to be deleted
   installmake driver.img       # this is to be deleted
@@ -598,7 +598,7 @@ buildpackages() {
   # Create images for install
   ipfiremake cdrom
   ipfiremake pxe
-  cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
+  cp -f $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
 #  ipfirepackages