* [gentoo-commits] proj/releng:master commit in: tools-hardened/
@ 2016-03-02 20:41 Anthony G. Basile
0 siblings, 0 replies; 7+ messages in thread
From: Anthony G. Basile @ 2016-03-02 20:41 UTC (permalink / raw
To: gentoo-commits
commit: e9208fa931e35d9cb9ef21ebca08149b9c165e4e
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 2 20:51:20 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Mar 2 20:51:20 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e9208fa9
tools-hardened: add test scripts for systemd stages
tools-hardened/common.sh | 61 ++++++++++++++++++++++++++++++++++
tools-hardened/run-systemd.sh | 49 +++++++++++++++++++++++++++
tools-hardened/stage-all.conf.template | 7 ++++
3 files changed, 117 insertions(+)
diff --git a/tools-hardened/common.sh b/tools-hardened/common.sh
new file mode 100644
index 0000000..9a0a03a
--- /dev/null
+++ b/tools-hardened/common.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+source /etc/catalyst/catalyst.conf
+
+mydate=`date +%Y%m%d`
+
+
+undo_grsec() {
+ [[ -d /proc/sys/kernel/grsecurity ]] || return
+ for i in /proc/sys/kernel/grsecurity/chroot_* ; do
+ echo 0 > $i
+ done
+}
+
+
+banner() {
+cat << EOF | tee -a zzz.log > stage$1-$2-systemd.log
+
+************************************************************************
+* stage$1-$2-systemd
+************************************************************************"
+
+EOF
+}
+
+
+do_stages() {
+ local arch=$1
+
+ for s in 1 2 3; do
+ local tgpath="${storedir}/builds/systemd/${arch}"
+ local target="stage${s}-${arch}-systemd-${mydate}.tar.bz2"
+ local tglink="stage${s}-${arch}-systemd.tar.bz2"
+
+ if [[ ! -f "${tgpath}/${tglink}" ]]; then
+ touch stage${s}-${arch}-systemd.log
+ echo "!!! ${tglink} at ${tgpath} doesn't exist" \
+ | tee -a zzz.log \
+ > stage${s}-${arch}-systemd.err
+ return 1
+ fi
+
+ banner ${s} ${arch}
+ catalyst -f stage${s}-${arch}-systemd.conf \
+ | tee -a zzz.log \
+ > stage${s}-${arch}-systemd.log \
+ 2> stage${s}-${arch}-systemd.err
+
+ if [[ -f "${tgpath}/${target}" ]]; then
+ rm -f "${tgpath}/${tglink}"
+ ln -s ${target} "${tgpath}/${tglink}"
+ else
+ echo "!!! ${target} was not generated" \
+ | tee -a zzz.log \
+ >stage${s}-${arch}-systemd.err
+ return 1
+ fi
+ done
+
+ return 0
+}
diff --git a/tools-hardened/run-systemd.sh b/tools-hardened/run-systemd.sh
new file mode 100644
index 0000000..94c57d1
--- /dev/null
+++ b/tools-hardened/run-systemd.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+source common.sh
+
+prepare_confs() {
+ local arch=$1
+
+ for s in 1 2 3; do
+
+ local cstage=stage${s}
+ local p=$(( s - 1 ))
+ [[ $p == 0 ]] && p=3
+ local pstage=stage${p}
+
+ local parch="${arch}"
+ [[ "${arch}" == "i686" ]] && parch="x86"
+
+ cat stage-all.conf.template | \
+ sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
+ -e "s:STAGE:${cstage}:g" \
+ -e "s:SARCH:${arch}:g" \
+ -e "s:PARCH:${parch}:g" \
+ > stage${s}-${arch}-systemd.conf
+ done
+}
+
+
+main() {
+ >zzz.log
+
+ undo_grsec
+
+ catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
+
+# for arch in amd64 i686; do
+ for arch in amd64; do
+ prepare_confs ${arch}
+ done
+
+ # The parallelization `( do_stages ... ) &` doesn't work here
+ # if catalyst is using snapcache, bug #519656
+# for arch in amd64 i686; do
+ for arch in amd64; do
+ do_stages ${arch}
+ [[ $? == 1 ]] && echo "FAILURE at ${arch}" | tee zzz.log
+ done
+}
+
+main $1 &
diff --git a/tools-hardened/stage-all.conf.template b/tools-hardened/stage-all.conf.template
new file mode 100644
index 0000000..942ddc7
--- /dev/null
+++ b/tools-hardened/stage-all.conf.template
@@ -0,0 +1,7 @@
+subarch: SARCH
+target: STAGE
+version_stamp: systemd
+rel_type: systemd/SARCH
+profile: default/linux/PARCH/13.0/systemd
+snapshot: current
+source_subpath: systemd/SARCH/STAGE-SARCH-systemd
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools-hardened/
@ 2021-07-31 19:41 Matt Turner
0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2021-07-31 19:41 UTC (permalink / raw
To: gentoo-commits
commit: 13ab05785a432bf6f14873e64f293ed87c95c077
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 01:24:26 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 19:41:14 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=13ab0578
tools-hardened: Remove
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools-hardened/clean.sh | 6 --
tools-hardened/common.sh | 61 --------------
tools-hardened/run-armv7a.sh | 96 ----------------------
.../stage1-armv7a_hardfp-hardened.conf.template | 7 --
.../stage2-armv7a_hardfp-hardened.conf.template | 7 --
.../stage3-armv7a_hardfp-hardened.conf.template | 7 --
6 files changed, 184 deletions(-)
diff --git a/tools-hardened/clean.sh b/tools-hardened/clean.sh
deleted file mode 100755
index 916c4eb4..00000000
--- a/tools-hardened/clean.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# This just removes the temporary conf err and log
-# files generated during a run
-
-rm -f *conf *err *log
diff --git a/tools-hardened/common.sh b/tools-hardened/common.sh
deleted file mode 100644
index 9a0a03af..00000000
--- a/tools-hardened/common.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-source /etc/catalyst/catalyst.conf
-
-mydate=`date +%Y%m%d`
-
-
-undo_grsec() {
- [[ -d /proc/sys/kernel/grsecurity ]] || return
- for i in /proc/sys/kernel/grsecurity/chroot_* ; do
- echo 0 > $i
- done
-}
-
-
-banner() {
-cat << EOF | tee -a zzz.log > stage$1-$2-systemd.log
-
-************************************************************************
-* stage$1-$2-systemd
-************************************************************************"
-
-EOF
-}
-
-
-do_stages() {
- local arch=$1
-
- for s in 1 2 3; do
- local tgpath="${storedir}/builds/systemd/${arch}"
- local target="stage${s}-${arch}-systemd-${mydate}.tar.bz2"
- local tglink="stage${s}-${arch}-systemd.tar.bz2"
-
- if [[ ! -f "${tgpath}/${tglink}" ]]; then
- touch stage${s}-${arch}-systemd.log
- echo "!!! ${tglink} at ${tgpath} doesn't exist" \
- | tee -a zzz.log \
- > stage${s}-${arch}-systemd.err
- return 1
- fi
-
- banner ${s} ${arch}
- catalyst -f stage${s}-${arch}-systemd.conf \
- | tee -a zzz.log \
- > stage${s}-${arch}-systemd.log \
- 2> stage${s}-${arch}-systemd.err
-
- if [[ -f "${tgpath}/${target}" ]]; then
- rm -f "${tgpath}/${tglink}"
- ln -s ${target} "${tgpath}/${tglink}"
- else
- echo "!!! ${target} was not generated" \
- | tee -a zzz.log \
- >stage${s}-${arch}-systemd.err
- return 1
- fi
- done
-
- return 0
-}
diff --git a/tools-hardened/run-armv7a.sh b/tools-hardened/run-armv7a.sh
deleted file mode 100755
index 8daccdf8..00000000
--- a/tools-hardened/run-armv7a.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-source /etc/catalyst/catalyst.conf
-
-mydate=`date +%Y%m%d`
-
-prepare_confs() {
- local arch=$1
- local flavor=$2
-
- for s in 1 2 3; do
- 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_hardfp-$3.log
-
-************************************************************************
-* stage$1-$2_hardfp-$3
-************************************************************************"
-
-EOF
-}
-
-
-do_stages() {
- local arch=$1
- local flavor=$2
-
- for s in 1 2 3; do
- local tgpath="${storedir}/builds/${flavor}/${arch}"
- 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}_hardfp-${flavor}.log
- echo "!!! ${target} at ${tgpath} doesn't exit" \
- | tee -a zzz.log \
- > stage${s}-${arch}_hardfp-${flavor}.err
- return 1
- fi
-
- banner ${s} ${arch} ${flavor}
- catalyst -f stage${s}-${arch}_hardfp-${flavor}.conf \
- | tee -a zzz.log \
- > stage${s}-${arch}_hardfp-${flavor}.log \
- 2> stage${s}-${arch}_hardfp-${flavor}.err
-
- if [[ -f "${tgpath}/${target}" ]]; then
- rm -f "${tgpath}/${tglink}"
- ln -s ${target} "${tgpath}/${tglink}"
- else
- echo "!!! ${target} was not generated" \
- | tee -a zzz.log \
- >stage${s}-${arch}_hardfp-${flavor}.err
- return 1
- fi
- done
-
- return 0
-}
-
-
-#
-# approximate timings:
-#
-# catalyst -s current 3 minutes
-# catalyst -f stage1 130 minutes
-#
-
-main() {
- >zzz.log
-
- catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
-
- for arch in armv7a; do
- for flavor in hardened; do
- prepare_confs ${arch} ${flavor}
- done
- done
-
- for arch in armv7a; do
- for flavor in hardened; do
- do_stages ${arch} ${flavor}
- ret=$?
- if [[ $? == 1 ]]; then
- echo "FAILURE at ${arch} ${flavor}" | tee zzz.log
- return 1
- fi
- done
- done
-}
-
-main $1 &
diff --git a/tools-hardened/stage1-armv7a_hardfp-hardened.conf.template b/tools-hardened/stage1-armv7a_hardfp-hardened.conf.template
deleted file mode 100644
index c21db83d..00000000
--- a/tools-hardened/stage1-armv7a_hardfp-hardened.conf.template
+++ /dev/null
@@ -1,7 +0,0 @@
-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_hardfp-hardened.conf.template b/tools-hardened/stage2-armv7a_hardfp-hardened.conf.template
deleted file mode 100644
index 30110c1a..00000000
--- a/tools-hardened/stage2-armv7a_hardfp-hardened.conf.template
+++ /dev/null
@@ -1,7 +0,0 @@
-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_hardfp-hardened.conf.template b/tools-hardened/stage3-armv7a_hardfp-hardened.conf.template
deleted file mode 100644
index b52059b8..00000000
--- a/tools-hardened/stage3-armv7a_hardfp-hardened.conf.template
+++ /dev/null
@@ -1,7 +0,0 @@
-subarch: armv7a_hardfp
-target: stage3
-version_stamp: hardened
-rel_type: hardened/armv7a
-profile: hardened/linux/arm/armv7a
-snapshot: current
-source_subpath: hardened/armv7a/stage2-armv7a_hardfp-hardened
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools-hardened/
@ 2016-03-04 2:28 Anthony G. Basile
0 siblings, 0 replies; 7+ messages in thread
From: Anthony G. Basile @ 2016-03-04 2:28 UTC (permalink / raw
To: gentoo-commits
commit: ed422ec6fbe0d9dc8b4af8463541d0a18c820ec9
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 4 02:38:42 2016 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Mar 4 02:38:42 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ed422ec6
tools-hardened: fix stage names in template
tools-hardened/run-systemd.sh | 5 +++--
tools-hardened/stage-all.conf.template | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools-hardened/run-systemd.sh b/tools-hardened/run-systemd.sh
old mode 100644
new mode 100755
index 94c57d1..1160d42
--- a/tools-hardened/run-systemd.sh
+++ b/tools-hardened/run-systemd.sh
@@ -13,11 +13,12 @@ prepare_confs() {
local pstage=stage${p}
local parch="${arch}"
- [[ "${arch}" == "i686" ]] && parch="x86"
+ [[ "${arch}" == "i686" ]] && parch="x86"
cat stage-all.conf.template | \
sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \
- -e "s:STAGE:${cstage}:g" \
+ -e "s:CSTAGE:${cstage}:g" \
+ -e "s:PSTAGE:${pstage}:g" \
-e "s:SARCH:${arch}:g" \
-e "s:PARCH:${parch}:g" \
> stage${s}-${arch}-systemd.conf
diff --git a/tools-hardened/stage-all.conf.template b/tools-hardened/stage-all.conf.template
index 942ddc7..5e4cb39 100644
--- a/tools-hardened/stage-all.conf.template
+++ b/tools-hardened/stage-all.conf.template
@@ -1,7 +1,7 @@
subarch: SARCH
-target: STAGE
+target: CSTAGE
version_stamp: systemd
rel_type: systemd/SARCH
profile: default/linux/PARCH/13.0/systemd
snapshot: current
-source_subpath: systemd/SARCH/STAGE-SARCH-systemd
+source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools-hardened/
@ 2013-01-19 23:21 Anthony G. Basile
0 siblings, 0 replies; 7+ messages in thread
From: Anthony G. Basile @ 2013-01-19 23:21 UTC (permalink / raw
To: gentoo-commits
commit: f63413dea1d40bba0e89722b082ca5825fcb4f77
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 19 23:21:31 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 19 23:21:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=f63413de
tools-hardened: clean up run script
---
tools-hardened/run-armv7a.sh | 48 +++++++-----------------------------------
1 files changed, 8 insertions(+), 40 deletions(-)
diff --git a/tools-hardened/run-armv7a.sh b/tools-hardened/run-armv7a.sh
index f169aec..8daccdf 100755
--- a/tools-hardened/run-armv7a.sh
+++ b/tools-hardened/run-armv7a.sh
@@ -1,12 +1,5 @@
#!/bin/bash
-#
-# Usage: ./run-armv7a.sh <mode>
-# where
-# <mode> = "", it will actually do the runs
-# <mode> = "test", it will just pretend
-#
-
source /etc/catalyst/catalyst.conf
mydate=`date +%Y%m%d`
@@ -35,7 +28,6 @@ EOF
do_stages() {
local arch=$1
local flavor=$2
- local pretend=$3
for s in 1 2 3; do
local tgpath="${storedir}/builds/${flavor}/${arch}"
@@ -50,20 +42,11 @@ do_stages() {
return 1
fi
- if [[ "x${pretend}" != "xtest" ]]; then
- banner ${s} ${arch} ${flavor}
- catalyst -f stage${s}-${arch}_hardfp-${flavor}.conf \
- | tee -a zzz.log \
- > stage${s}-${arch}_hardfp-${flavor}.log \
- 2> stage${s}-${arch}_hardfp-${flavor}.err
- else
- touch stage${s}-${arch}_hardfp-${flavor}.log
- touch stage${s}-${arch}_hardfp-${flavor}.err
- touch "${tgpath}/${target}"
- 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
+ banner ${s} ${arch} ${flavor}
+ catalyst -f stage${s}-${arch}_hardfp-${flavor}.conf \
+ | tee -a zzz.log \
+ > stage${s}-${arch}_hardfp-${flavor}.log \
+ 2> stage${s}-${arch}_hardfp-${flavor}.err
if [[ -f "${tgpath}/${target}" ]]; then
rm -f "${tgpath}/${tglink}"
@@ -88,17 +71,9 @@ do_stages() {
#
main() {
- local pretend=$1
-
>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
+ catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
for arch in armv7a; do
for flavor in hardened; do
@@ -108,21 +83,14 @@ main() {
for arch in armv7a; do
for flavor in hardened; do
- do_stages ${arch} ${flavor} ${pretend}
+ do_stages ${arch} ${flavor}
ret=$?
if [[ $? == 1 ]]; then
- echo "FAILURE at ${arch} ${flavor} ${pretend} " | tee zzz.log
+ echo "FAILURE at ${arch} ${flavor}" | tee zzz.log
return 1
fi
done
done
-
- if [[ "x${pretend}" == "xtest" ]]; then
- tree /var/tmp/catalyst/builds
- echo
- echo "!!! Run fixup.sh to clean up!"
- echo
- fi
}
main $1 &
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools-hardened/
@ 2013-01-07 3:14 Anthony G. Basile
0 siblings, 0 replies; 7+ messages in thread
From: Anthony G. Basile @ 2013-01-07 3:14 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools-hardened/
@ 2013-01-07 2:25 Anthony G. Basile
0 siblings, 0 replies; 7+ messages in thread
From: Anthony G. Basile @ 2013-01-07 2:25 UTC (permalink / raw
To: gentoo-commits
commit: cc7c1aa7b91aedbdd7a1ff19f15d2bcd12ce06ea
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 7 02:25:05 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan 7 02:25:05 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=cc7c1aa7
tools-hardened: fix arm to provide armv7a_hardfp
---
.../stage1-armv7a-hardfloat-hardened.conf.template | 2 +-
.../stage2-armv7a-hardfloat-hardened.conf.template | 2 +-
.../stage3-armv7a-hardfloat-hardened.conf.template | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools-hardened/stage1-armv7a-hardfloat-hardened.conf.template b/tools-hardened/stage1-armv7a-hardfloat-hardened.conf.template
index 79f1216..b4a6f86 100644
--- a/tools-hardened/stage1-armv7a-hardfloat-hardened.conf.template
+++ b/tools-hardened/stage1-armv7a-hardfloat-hardened.conf.template
@@ -1,4 +1,4 @@
-subarch: armv7a
+subarch: armv7a_hardfp
target: stage1
version_stamp: hardfloat-hardened
rel_type: hardened/armv7a
diff --git a/tools-hardened/stage2-armv7a-hardfloat-hardened.conf.template b/tools-hardened/stage2-armv7a-hardfloat-hardened.conf.template
index 16fd105..671e10e 100644
--- a/tools-hardened/stage2-armv7a-hardfloat-hardened.conf.template
+++ b/tools-hardened/stage2-armv7a-hardfloat-hardened.conf.template
@@ -1,4 +1,4 @@
-subarch: armv7a
+subarch: armv7a_hardfp
target: stage2
version_stamp: hardfloat-hardened
rel_type: hardened/armv7a
diff --git a/tools-hardened/stage3-armv7a-hardfloat-hardened.conf.template b/tools-hardened/stage3-armv7a-hardfloat-hardened.conf.template
index 9c61711..392bab7 100644
--- a/tools-hardened/stage3-armv7a-hardfloat-hardened.conf.template
+++ b/tools-hardened/stage3-armv7a-hardfloat-hardened.conf.template
@@ -1,4 +1,4 @@
-subarch: armv7a
+subarch: armv7a_hardfp
target: stage3
version_stamp: hardfloat-hardened
rel_type: hardened/armv7a
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools-hardened/
@ 2013-01-05 13:44 Anthony G. Basile
0 siblings, 0 replies; 7+ messages in thread
From: Anthony G. Basile @ 2013-01-05 13:44 UTC (permalink / raw
To: gentoo-commits
commit: 5f31f81c16863460f387437d3300b5d67dddfee4
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 5 13:44:17 2013 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 5 13:44:17 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=5f31f81c
tools-hardened: tools and templates for hardened stages
---
tools-hardened/clean.sh | 6 +
tools-hardened/fixup.sh | 29 +++++
tools-hardened/run-armv7a.sh | 128 ++++++++++++++++++++
.../stage1-armv7a-hardfloat-hardened.conf.template | 8 ++
.../stage2-armv7a-hardfloat-hardened.conf.template | 8 ++
.../stage3-armv7a-hardfloat-hardened.conf.template | 7 +
6 files changed, 186 insertions(+), 0 deletions(-)
diff --git a/tools-hardened/clean.sh b/tools-hardened/clean.sh
new file mode 100755
index 0000000..916c4eb
--- /dev/null
+++ b/tools-hardened/clean.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# This just removes the temporary conf err and log
+# files generated during a run
+
+rm -f *conf *err *log
diff --git a/tools-hardened/fixup.sh b/tools-hardened/fixup.sh
new file mode 100755
index 0000000..98bc241
--- /dev/null
+++ b/tools-hardened/fixup.sh
@@ -0,0 +1,29 @@
+#!/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
new file mode 100755
index 0000000..1385e58
--- /dev/null
+++ b/tools-hardened/run-armv7a.sh
@@ -0,0 +1,128 @@
+#!/bin/bash
+
+#
+# Usage: ./run-armv7a.sh <mode>
+# where
+# <mode> = "", it will actually do the runs
+# <mode> = "test", it will just pretend
+#
+
+source /etc/catalyst/catalyst.conf
+
+mydate=`date +%Y%m%d`
+
+prepare_confs() {
+ local arch=$1
+ 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
+ done
+}
+
+banner() {
+cat << EOF | tee -a zzz.log > stage$1-$2-uclibc-$3.log
+
+************************************************************************
+* stage$1-$2-uclibc-$3
+************************************************************************"
+
+EOF
+}
+
+
+do_stages() {
+ local arch=$1
+ local flavor=$2
+ local pretend=$3
+
+ 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"
+
+ if [[ ! -f "${tgpath}/${tglink}" ]]; then
+ touch stage${s}-${arch}-hardfloat-${flavor}.log
+ echo "!!! ${target} at ${tgpath} doesn't exit" \
+ | tee -a zzz.log \
+ > stage${s}-${arch}-hardfloat-${flavor}.err
+ return 1
+ fi
+
+ if [[ "x${pretend}" != "xtest" ]]; then
+ banner ${s} ${arch} ${flavor}
+ catalyst -f stage${s}-${arch}-hardfloat-${flavor}.conf \
+ | tee -a zzz.log \
+ > stage${s}-${arch}-hardfloat-${flavor}.log \
+ 2> stage${s}-${arch}-hardfloat-${flavor}.err
+ else
+ touch stage${s}-${arch}-hardfloat-${flavor}.log
+ touch stage${s}-${arch}-hardfloat-${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"
+ fi
+
+ if [[ -f "${tgpath}/${target}" ]]; then
+ rm -f "${tgpath}/${tglink}"
+ ln -s ${target} "${tgpath}/${tglink}"
+ else
+ echo "!!! ${target} was not generated" \
+ | tee -a zzz.log \
+ >stage${s}-${arch}-hardfloat-${flavor}.err
+ return 1
+ fi
+ done
+
+ return 0
+}
+
+
+#
+# approximate timings:
+#
+# catalyst -s current 3 minutes
+# catalyst -f stage1 130 minutes
+#
+
+main() {
+ local pretend=$1
+
+ >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
+
+ for arch in armv7a; do
+ for flavor in hardened; do
+ prepare_confs ${arch} ${flavor}
+ done
+ done
+
+ for arch in armv7a; do
+ for flavor in hardened; do
+ do_stages ${arch} ${flavor} ${pretend}
+ ret=$?
+ if [[ $? == 1 ]]; then
+ echo "FAILURE at ${arch} ${flavor} ${pretend} " | tee zzz.log
+ return 1
+ fi
+ done
+ done
+
+ if [[ "x${pretend}" == "xtest" ]]; then
+ tree /var/tmp/catalyst/builds
+ echo
+ echo "!!! Run fixup.sh to clean up!"
+ echo
+ fi
+}
+
+main $1 &
diff --git a/tools-hardened/stage1-armv7a-hardfloat-hardened.conf.template b/tools-hardened/stage1-armv7a-hardfloat-hardened.conf.template
new file mode 100644
index 0000000..79f1216
--- /dev/null
+++ b/tools-hardened/stage1-armv7a-hardfloat-hardened.conf.template
@@ -0,0 +1,8 @@
+subarch: armv7a
+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/stage2-armv7a-hardfloat-hardened.conf.template b/tools-hardened/stage2-armv7a-hardfloat-hardened.conf.template
new file mode 100644
index 0000000..16fd105
--- /dev/null
+++ b/tools-hardened/stage2-armv7a-hardfloat-hardened.conf.template
@@ -0,0 +1,8 @@
+subarch: armv7a
+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/stage3-armv7a-hardfloat-hardened.conf.template b/tools-hardened/stage3-armv7a-hardfloat-hardened.conf.template
new file mode 100644
index 0000000..9c61711
--- /dev/null
+++ b/tools-hardened/stage3-armv7a-hardfloat-hardened.conf.template
@@ -0,0 +1,7 @@
+subarch: armv7a
+target: stage3
+version_stamp: hardfloat-hardened
+rel_type: hardened/armv7a
+profile: hardened/linux/arm/armv7a
+snapshot: current
+source_subpath: hardened/armv7a/stage2-armv7a-hardfloat-hardened
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-07-31 19:41 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-02 20:41 [gentoo-commits] proj/releng:master commit in: tools-hardened/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2021-07-31 19:41 Matt Turner
2016-03-04 2:28 Anthony G. Basile
2013-01-19 23:21 Anthony G. Basile
2013-01-07 3:14 Anthony G. Basile
2013-01-07 2:25 Anthony G. Basile
2013-01-05 13:44 Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox