Disabled building an usb key image. This is not done, yet.

Glibc is everytime built on the local machine.

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

diff --git a/lfs/glibc b/lfs/glibc
index 7906ce8c6db437b485030d9c18fd26d3364a484b..1530ab93c24b8ea1ad2a2e80d5a342051d3a0261 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -66,7 +66,7 @@ ifeq "$(STAGE)" "toolchain"
                --without-gd --with-headers=$(TOOLS_DIR)/include \
                --without-selinux
                
-       cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=-j$(PARALLELISM)
+       cd $(DIR_SRC)/glibc-build && DISTCC_HOSTS=localhost make PARALLELMFLAGS=-j$(PARALLELISM)
        -mkdir -v $(TOOLS_DIR)/etc
        touch $(TOOLS_DIR)/etc/ld.so.conf
        cd $(DIR_SRC)/glibc-build && make install
@@ -84,7 +84,7 @@ ifeq "$(STAGE)" "base"
     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
                --libexecdir=/usr/lib/glibc
        
-       cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=-j$(PARALLELISM)
+       cd $(DIR_SRC)/glibc-build && DISTCC_HOSTS=localhost make PARALLELMFLAGS=-j$(PARALLELISM)
        touch /etc/ld.so.conf
        cd $(DIR_SRC)/glibc-build && make install
        

diff --git a/make.sh b/make.sh
index 9774668852af3fb3ccd8247190f17f1ed46cecdb..06636d0713500ed4f395e8ed69393a9aedeff53c 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -418,9 +418,9 @@ packages_build() {
        ipfire_make cdrom
        
   # Check if there is a loop device for building in virtual environments
-  if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
-       ipfire_make usb-stick
-  fi
+  #if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
+  #    ipfire_make usb-stick
+  #fi
   mv $LFS/$IMAGES_DIR/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
 
        #ipfire_make core-updates