[gentoo-commits] proj/releng:master commit in: tools-hardened/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Anthony G. Basile" <blueness@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/releng:master commit in: tools-hardened/
Date: Mon,  7 Jan 2013 03:14:55 +0000 (UTC)	[thread overview]
Message-ID: <1357528485.b4a540092e7a5d605f33f0e802e514c58b07ec2d.blueness@gentoo> (raw)

commit:     b4a540092e7a5d605f33f0e802e514c58b07ec2d
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  7 03:14:45 2013 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> 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

next             reply	other threads:[~2013-01-07  3:15 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-07  3:14 Anthony G. Basile [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-07-31 19:41 [gentoo-commits] proj/releng:master commit in: tools-hardened/ Matt Turner
2016-03-04  2:28 Anthony G. Basile
2016-03-02 20:41 Anthony G. Basile
2013-01-19 23:21 Anthony G. Basile
2013-01-07  2:25 Anthony G. Basile
2013-01-05 13:44 Anthony G. Basile

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:98bc241 dfblob:1385e58 dfblob:f169aec dfblob:b4a6f86
dfblob:c21db83 dfblob:671e10e dfblob:30110c1 dfblob:392bab7
dfblob:b52059b )
 OR (
bs:"[gentoo-commits] proj/releng:master commit in: tools-hardened/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1357528485.b4a540092e7a5d605f33f0e802e514c58b07ec2d.blueness@gentoo \
    --to=blueness@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox