Merge branch 'cacti-update' into next

diff --git a/doc/make.sh-usage b/doc/make.sh-usage
index c025a5c32e663042a4b07a754d079cd673bb25bb..78a73efacbbce7c881805c9c499a650c474911c8 100644 (file)
--- a/doc/make.sh-usage
+++ b/doc/make.sh-usage
@@ -13,3 +13,11 @@ Maintainer / advanced commands
     toolchain : Create our own toolchain package to save 20% of build time.
         shell : Enter a shell inside the chroot, used to tune lfs script
                  and / or during kernel upgrade to rebuild a new .config
+
+
+Options:
+    --target=[armv5tel|i586] : Cross-compile for this target architecture.
+                               Uses the QEMU emulator if needed to virtualise
+                               the desired target architecture.
+                               Can be permanently set with TARGET_ARCH= in
+                               .config.

diff --git a/make.sh b/make.sh
index 3f30a23ae60289e4e2a41240c376f50ddd1ccbda..277d29e8ff7d9e1d9b8b61b8e3bd477724e042fd 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -65,12 +65,16 @@ mkdir $BASEDIR/log/ 2>/dev/null
 # Include funtions
 . tools/make-functions
 
-configure_target "default"
-
 if [ -f .config ]; then
        . .config
 fi
 
+if [ -n "${TARGET_ARCH}" ]; then
+       configure_target "${TARGET_ARCH}"
+else
+       configure_target "default"
+fi
+
 if [ -z $EDITOR ]; then
        for i in nano emacs vi; do
                EDITOR=$(which $i 2>/dev/null)