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 CD5A2138325 for ; Mon, 7 Jan 2013 03:15:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7A1221C002; Mon, 7 Jan 2013 03:14:59 +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 DBBC421C002 for ; Mon, 7 Jan 2013 03:14:58 +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 8E79733DA2E for ; Mon, 7 Jan 2013 03:14:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AC0C7E5439 for ; Mon, 7 Jan 2013 03:14:55 +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: <1357528485.b4a540092e7a5d605f33f0e802e514c58b07ec2d.blueness@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools-hardened/ X-VCS-Repository: proj/releng X-VCS-Files: tools-hardened/fixup.sh tools-hardened/run-armv7a.sh tools-hardened/stage1-armv7a-hardfloat-hardened.conf.template tools-hardened/stage1-armv7a_hardfp-hardened.conf.template tools-hardened/stage2-armv7a-hardfloat-hardened.conf.template tools-hardened/stage2-armv7a_hardfp-hardened.conf.template tools-hardened/stage3-armv7a-hardfloat-hardened.conf.template tools-hardened/stage3-armv7a_hardfp-hardened.conf.template X-VCS-Directories: tools-hardened/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: b4a540092e7a5d605f33f0e802e514c58b07ec2d X-VCS-Branch: master Date: Mon, 7 Jan 2013 03:14:55 +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: cd4badb1-31a3-4197-86a9-bcc24c1d9642 X-Archives-Hash: 1b37183136a4333b5f24d191b09548d1 commit: b4a540092e7a5d605f33f0e802e514c58b07ec2d Author: Anthony G. Basile gentoo org> AuthorDate: Mon Jan 7 03:14:45 2013 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Jan 7 03:14:45 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=b4a54009 tools-hardened: rename hardfloat to hardfp --- tools-hardened/fixup.sh | 29 ------------ tools-hardened/run-armv7a.sh | 48 ++++++++++---------- .../stage1-armv7a-hardfloat-hardened.conf.template | 8 --- .../stage1-armv7a_hardfp-hardened.conf.template | 7 +++ .../stage2-armv7a-hardfloat-hardened.conf.template | 8 --- .../stage2-armv7a_hardfp-hardened.conf.template | 7 +++ ...=> stage3-armv7a_hardfp-hardened.conf.template} | 4 +- 7 files changed, 40 insertions(+), 71 deletions(-) diff --git a/tools-hardened/fixup.sh b/tools-hardened/fixup.sh deleted file mode 100755 index 98bc241..0000000 --- a/tools-hardened/fixup.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# This just fixes up the symbolic links -# to the latest stage{1,2,3} tarballs - -mydate=$1 -mypwd=/var/tmp/catalyst/builds - -find ${mypwd} -type f -size 0 -exec rm {} + -find -L ${mypwd} -type l -exec rm {} + - -for arch in amd64 i686; do - for flavor in hardened vanilla; do - for s in 1 2 3; do - file=stage${s}-${arch}-uclibc-${flavor}-${mydate}.tar.bz2 - link=stage${s}-${arch}-uclibc-${flavor}.tar.bz2 - cd "${mypwd}/${flavor}/${arch}" - if [[ -f ${file} ]]; then - ln -sf ${file} ${link} - else - echo "!!! ${file} doesn't exist!" - echo "!!! make sure \${mydate} is right!" - exit 1 - fi - done - done -done - -tree ${mypwd} diff --git a/tools-hardened/run-armv7a.sh b/tools-hardened/run-armv7a.sh index 1385e58..f169aec 100755 --- a/tools-hardened/run-armv7a.sh +++ b/tools-hardened/run-armv7a.sh @@ -16,16 +16,16 @@ prepare_confs() { local flavor=$2 for s in 1 2 3; do - cat stage${s}-${arch}-hardfloat-${flavor}.conf.template | \ - sed -e "s/\(^version_stamp.*$\)/\1-${mydate}/" > stage${s}-${arch}-hardfloat-${flavor}.conf + cat stage${s}-${arch}_hardfp-${flavor}.conf.template | \ + sed -e "s/\(^version_stamp.*$\)/\1-${mydate}/" > stage${s}-${arch}_hardfp-${flavor}.conf done } banner() { -cat << EOF | tee -a zzz.log > stage$1-$2-uclibc-$3.log +cat << EOF | tee -a zzz.log > stage$1-$2_hardfp-$3.log ************************************************************************ -* stage$1-$2-uclibc-$3 +* stage$1-$2_hardfp-$3 ************************************************************************" EOF @@ -39,30 +39,30 @@ do_stages() { for s in 1 2 3; do local tgpath="${storedir}/builds/${flavor}/${arch}" - local target="stage${s}-${arch}-hardfloat-${flavor}-${mydate}.tar.bz2" - local tglink="stage${s}-${arch}-hardfloat-${flavor}.tar.bz2" + local target="stage${s}-${arch}_hardfp-${flavor}-${mydate}.tar.bz2" + local tglink="stage${s}-${arch}_hardfp-${flavor}.tar.bz2" if [[ ! -f "${tgpath}/${tglink}" ]]; then - touch stage${s}-${arch}-hardfloat-${flavor}.log + touch stage${s}-${arch}_hardfp-${flavor}.log echo "!!! ${target} at ${tgpath} doesn't exit" \ | tee -a zzz.log \ - > stage${s}-${arch}-hardfloat-${flavor}.err + > stage${s}-${arch}_hardfp-${flavor}.err return 1 fi if [[ "x${pretend}" != "xtest" ]]; then banner ${s} ${arch} ${flavor} - catalyst -f stage${s}-${arch}-hardfloat-${flavor}.conf \ + catalyst -f stage${s}-${arch}_hardfp-${flavor}.conf \ | tee -a zzz.log \ - > stage${s}-${arch}-hardfloat-${flavor}.log \ - 2> stage${s}-${arch}-hardfloat-${flavor}.err + > stage${s}-${arch}_hardfp-${flavor}.log \ + 2> stage${s}-${arch}_hardfp-${flavor}.err else - touch stage${s}-${arch}-hardfloat-${flavor}.log - touch stage${s}-${arch}-hardfloat-${flavor}.err + touch stage${s}-${arch}_hardfp-${flavor}.log + touch stage${s}-${arch}_hardfp-${flavor}.err touch "${tgpath}/${target}" - echo "PRETEND: catalyst -f stage${s}-${arch}-hardfloat-${flavor}.conf \ " - echo "PRETEND: > stage${s}-${arch}-hardfloat-${flavor}.log \ " - echo "PRETEND: 2> stage${s}-${arch}-hardfloat-${flavor}.err" + echo "PRETEND: catalyst -f stage${s}-${arch}_hardfp-${flavor}.conf \ " + echo "PRETEND: > stage${s}-${arch}_hardfp-${flavor}.log \ " + echo "PRETEND: 2> stage${s}-${arch}_hardfp-${flavor}.err" fi if [[ -f "${tgpath}/${target}" ]]; then @@ -71,7 +71,7 @@ do_stages() { else echo "!!! ${target} was not generated" \ | tee -a zzz.log \ - >stage${s}-${arch}-hardfloat-${flavor}.err + >stage${s}-${arch}_hardfp-${flavor}.err return 1 fi done @@ -92,13 +92,13 @@ main() { >zzz.log - if [[ "x${pretend}" != "xtest" ]]; then - catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err - else - >snapshot.log - >snapshot.err - echo "PRETEND: catalyst -s current > snapshot.log 2> snapshot.err" - fi +# if [[ "x${pretend}" != "xtest" ]]; then +# catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err +# else +# >snapshot.log +# >snapshot.err +# echo "PRETEND: catalyst -s current > snapshot.log 2> snapshot.err" +# fi for arch in armv7a; do for flavor in hardened; do diff --git a/tools-hardened/stage1-armv7a-hardfloat-hardened.conf.template b/tools-hardened/stage1-armv7a-hardfloat-hardened.conf.template deleted file mode 100644 index b4a6f86..0000000 --- a/tools-hardened/stage1-armv7a-hardfloat-hardened.conf.template +++ /dev/null @@ -1,8 +0,0 @@ -subarch: armv7a_hardfp -target: stage1 -version_stamp: hardfloat-hardened -rel_type: hardened/armv7a -profile: hardened/linux/arm/armv7a -snapshot: current -source_subpath: hardened/armv7a/stage3-armv7a-hardfloat-hardened -chost: armv7a-hardfloat-linux-gnueabi diff --git a/tools-hardened/stage1-armv7a_hardfp-hardened.conf.template b/tools-hardened/stage1-armv7a_hardfp-hardened.conf.template new file mode 100644 index 0000000..c21db83 --- /dev/null +++ b/tools-hardened/stage1-armv7a_hardfp-hardened.conf.template @@ -0,0 +1,7 @@ +subarch: armv7a_hardfp +target: stage1 +version_stamp: hardened +rel_type: hardened/armv7a +profile: hardened/linux/arm/armv7a +snapshot: current +source_subpath: hardened/armv7a/stage3-armv7a_hardfp-hardened diff --git a/tools-hardened/stage2-armv7a-hardfloat-hardened.conf.template b/tools-hardened/stage2-armv7a-hardfloat-hardened.conf.template deleted file mode 100644 index 671e10e..0000000 --- a/tools-hardened/stage2-armv7a-hardfloat-hardened.conf.template +++ /dev/null @@ -1,8 +0,0 @@ -subarch: armv7a_hardfp -target: stage2 -version_stamp: hardfloat-hardened -rel_type: hardened/armv7a -profile: hardened/linux/arm/armv7a -snapshot: current -source_subpath: hardened/armv7a/stage1-armv7a-hardfloat-hardened -chost: armv7a-hardfloat-linux-gnueabi diff --git a/tools-hardened/stage2-armv7a_hardfp-hardened.conf.template b/tools-hardened/stage2-armv7a_hardfp-hardened.conf.template new file mode 100644 index 0000000..30110c1 --- /dev/null +++ b/tools-hardened/stage2-armv7a_hardfp-hardened.conf.template @@ -0,0 +1,7 @@ +subarch: armv7a_hardfp +target: stage2 +version_stamp: hardened +rel_type: hardened/armv7a +profile: hardened/linux/arm/armv7a +snapshot: current +source_subpath: hardened/armv7a/stage1-armv7a_hardfp-hardened diff --git a/tools-hardened/stage3-armv7a-hardfloat-hardened.conf.template b/tools-hardened/stage3-armv7a_hardfp-hardened.conf.template similarity index 54% rename from tools-hardened/stage3-armv7a-hardfloat-hardened.conf.template rename to tools-hardened/stage3-armv7a_hardfp-hardened.conf.template index 392bab7..b52059b 100644 --- a/tools-hardened/stage3-armv7a-hardfloat-hardened.conf.template +++ b/tools-hardened/stage3-armv7a_hardfp-hardened.conf.template @@ -1,7 +1,7 @@ subarch: armv7a_hardfp target: stage3 -version_stamp: hardfloat-hardened +version_stamp: hardened rel_type: hardened/armv7a profile: hardened/linux/arm/armv7a snapshot: current -source_subpath: hardened/armv7a/stage2-armv7a-hardfloat-hardened +source_subpath: hardened/armv7a/stage2-armv7a_hardfp-hardened