From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 c5f804db8e65aa91d41d819f991b1c76c56bb551
Date: Wed, 28 May 2014 20:50:51 +0200
Message-ID: <20140528185051.732A5213CA@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6341676304633920101=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============6341676304633920101==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  c5f804db8e65aa91d41d819f991b1c76c56bb551 (commit)
       via  949544f5b36ee1ba45c71f96c8d1aefb3e49ce84 (commit)
      from  5930a368ad783c21e4e5542aea64561f409cbd68 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c5f804db8e65aa91d41d819f991b1c76c56bb551
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 28 20:48:22 2014 +0200

    make.sh: Update help instructions.

commit 949544f5b36ee1ba45c71f96c8d1aefb3e49ce84
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 28 20:48:05 2014 +0200

    make.sh: Allow to permanently set TARGET_ARCH in .config.

-----------------------------------------------------------------------

Summary of changes:
 doc/make.sh-usage | 8 ++++++++
 make.sh           | 8 ++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/doc/make.sh-usage b/doc/make.sh-usage
index c025a5c..78a73ef 100644
--- 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 37339ed..40717c9 100755
--- 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)


hooks/post-receive
--
IPFire 2.x development tree

--===============6341676304633920101==--