From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id ECC781381F3 for ; Mon, 15 Jul 2013 21:25:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8890AE09D2; Mon, 15 Jul 2013 21:25:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 20C95E09D2 for ; Mon, 15 Jul 2013 21:25:50 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 34AF433E758 for ; Mon, 15 Jul 2013 21:25:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C1942E468F for ; Mon, 15 Jul 2013 21:25:47 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1373923661.f4d30cbbcbb9357bfaa38bd5d9849ddb9854fe56.blueness@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools-uclibc/ X-VCS-Repository: proj/releng X-VCS-Files: tools-uclibc/run-armv7a.sh X-VCS-Directories: tools-uclibc/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: f4d30cbbcbb9357bfaa38bd5d9849ddb9854fe56 X-VCS-Branch: master Date: Mon, 15 Jul 2013 21:25:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 494215ec-a2f1-42e3-b9e3-0be2acc17d2a X-Archives-Hash: 837e53c8dedf06dce8574b947edb26e2 commit: f4d30cbbcbb9357bfaa38bd5d9849ddb9854fe56 Author: Anthony G. Basile gentoo org> AuthorDate: Mon Jul 15 21:27:41 2013 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Jul 15 21:27:41 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=f4d30cbb tools-uclibc/run-armv7a.sh: switch to hardfp --- tools-uclibc/run-armv7a.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools-uclibc/run-armv7a.sh b/tools-uclibc/run-armv7a.sh index e5152a5..c51ea4b 100755 --- a/tools-uclibc/run-armv7a.sh +++ b/tools-uclibc/run-armv7a.sh @@ -14,8 +14,13 @@ prepare_confs() { local p=$(( s - 1 )) [[ $p == 0 ]] && p=3 local pstage=stage${p} - local tarch="${arch%32r2}" + local tarch="${arch%_hardfp}" local parch="arm/${tarch}" + local float + + [[ "${arch}" == "${tarch}" ]] \ + && float="softfp" \ + || float="hardfloat" cat stage-all.conf.template | \ sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \ @@ -24,10 +29,14 @@ prepare_confs() { -e "s:SARCH:${arch}:g" \ -e "s:PARCH:${parch}:g" \ -e "s:TARCH:${tarch}:g" \ - -e "s:gentoo-linux-uclibc:softfp-linux-uclibceabi:" \ + -e "s:gentoo-linux-uclibc:${float}-linux-uclibceabi:" \ -e "s:FLAVOR:${flavor}:g" \ -e "s:MYCATALYST:$(pwd):g" \ > stage${s}-${arch}-uclibc-${flavor}.conf + + sed -i "/^portage_confdir/s:_hardfp::" \ + stage${s}-${arch}-uclibc-${flavor}.conf + done sed -i "/^chost/d" stage3-${arch}-uclibc-${flavor}.conf @@ -85,7 +94,7 @@ do_stages() { # # approximate timings: # -# catalyst -s current 3 minutes +# catalyst -s current 3 minutes # catalyst -f stage1 130 minutes # @@ -94,13 +103,13 @@ main() { catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err - for arch in armv7a; do + for arch in armv7a_hardfp armv7a; do for flavor in hardened vanilla; do prepare_confs ${arch} ${flavor} done done - for arch in armv7a; do + for arch in armv7a_hardfp armv7a; do for flavor in hardened vanilla; do do_stages ${arch} ${flavor} ret=$?