Einige Buildfixes

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@355 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index 1898fec885cfd0d2a2cd5b57e76da9ab78bc35c4..81629f08959ec61402f53c06112e21debfe4a3a3 100644 (file)
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -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
 #etc/boot.d/01-unmountinitrd
 #etc/boot.d/02-sethostname
 #etc/boot.d/03-loadkeymap

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 1cfef40b4e177352e663cdf85cc83bbb3772c467..178a5bddeb31d71097e9ae31ace9fa95340653b9 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -91,12 +91,10 @@
 * hdparm-6.6
 * htop-0.6.2
 * httpd-2.2.2
 * hdparm-6.6
 * htop-0.6.2
 * httpd-2.2.2

-* hwinfo

 * iana-etc-2.10
 * ibod
 * iftop-0.17
 * inetutils-1.4.2
 * 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
 * ipac-ng-1.31
 * ipaddr-1.2
 * iproute2-2.6.16-060323

diff --git a/lfs/gettext b/lfs/gettext
index 6cb91a481bc326d916a2fcffdb6aa46f1e99f2e0..8a5cd4bf9966c8e13760558aa5e6ba52344a0f07 100644 (file)
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -41,7 +41,7 @@ ifeq "$(LFS_PASS)" "install"
 else
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --disable-nls
 else
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --disable-nls

-  EXTRA_MAKE = $(MAKETUNING)
+  EXTRA_MAKE = 

   EXTRA_INSTALL =
 endif
 else
   EXTRA_INSTALL =
 endif
 else

diff --git a/make.sh b/make.sh
index da6b4b4ab1ab3854cf4323348ce455348216de7a..8dd989ca1902ef22ab50658cdc3107305382acd6 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -170,7 +170,7 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
     # 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
 
     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 gettext
   installmake kbd
   installmake popt

-  installmake kudzu

   installmake sysvinit
   installmake misc-progs
   installmake e2fsprogs
   installmake sysvinit
   installmake misc-progs
   installmake e2fsprogs


@@ -564,6 +563,7 @@ buildinstaller() {
   installmake util-linux
   installmake pciutils
   installmake pcmciautils
   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
   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
   # 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
 
 
 #  ipfirepackages