Addons are tagged now and one can decide wheather to build them or not.

diff --git a/.config-default b/.config-default
index 0b6abd260a9e463b90d00dc5bdb6360463486f7a..ca1cb7b923e3e0db99f37d93cc1d56d5fbfd6e26 100644 (file)
--- a/.config-default
+++ b/.config-default
@@ -89,6 +89,19 @@
 
 #PAX=1
 
+###############################################################################
+# Addons + Debugging tools                                                    #
+###############################################################################
+# These switches let the user say if the build should do the addons or not.   #
+# One can also set if the system should build the debugging tools.            #
+# Purpose is to save build time.                                              #
+# BUILD_EXTRAS is enabled by default. To disable set it to zero.              #
+# BUILD_DEBUG is disabled by default. To enable set it to one.                #
+###############################################################################
+
+#BUILD_EXTRAS=1
+#BUILD_DEBUG=0
+
 ###############################################################################
 # Niceness                                                                    #
 ###############################################################################

diff --git a/tools/make-include b/tools/make-include
index a7f7453ad16bf552463ae33f91df1d2bf8c0b199..e2b1e80307fa9637dc0d9c37bf6c3d92c01d1dae 100644 (file)
--- a/tools/make-include
+++ b/tools/make-include
@@ -39,6 +39,10 @@ PAX=1
 # Embedded build
 EMB=0
 
+# Building options
+BUILD_EXTRAS=1
+BUILD_DEBUG=0
+
 # Parallelism flag
 PARALLELISMFLAGS=-j$(( $(grep processor < /proc/cpuinfo | wc -l) * 2 + 1 ))
 DISTCC_HOSTS=localhost
@@ -281,6 +285,20 @@ lfsmakecommoncheck()
                fi
        done
 
+       # Don't create addons?
+       local EXTRA=`grep ^EXTRA $BASEDIR/lfs/$1 | awk '{print $3}'`
+       if [ "$EXTRA" == "yes" -a "$BUILD_EXTRAS" == "0" ]; then
+                       beautify result SKIP
+                       return 1
+       fi
+
+       # Don't create debugging tools?
+       local DEBUG=`grep ^DEBUG $BASEDIR/lfs/$1 | awk '{print $3}'`
+       if [ "$DEBUG" == "yes" -a "$BUILD_DEBUG" == "1" ]; then
+                       beautify result SKIP
+                       return 1
+       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