commit: afcff59a6d9dce0c6dde4e3488b4c21fd1295802
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 27 16:27:54 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 27 16:28:53 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=afcff59a
tools-musl + tools-uclibc: begin refactoring to avoid repeated code
---
tools-musl/run-armv7a.sh | 9 +--------
tools-musl/run-mipsel3.sh | 13 +++----------
tools-musl/run.sh | 9 +--------
tools-musl/stage-all.conf.template | 6 +++---
tools-uclibc/run-armv7a.sh | 9 +--------
tools-uclibc/run-mips32r2.sh | 9 +--------
tools-uclibc/run-mipsel3.sh | 9 +--------
tools-uclibc/run.sh | 11 ++---------
tools-uclibc/stage-all.conf.template | 4 ++--
9 files changed, 15 insertions(+), 64 deletions(-)
diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh
index d5699e0..f170931 100755
--- a/tools-musl/run-armv7a.sh
+++ b/tools-musl/run-armv7a.sh
@@ -58,7 +58,7 @@ do_stages() {
local flavor=$2
for s in 1 2 3; do
- local tgpath="${storedir}/builds/${flavor}/${arch}"
+ local tgpath="${storedir}/builds/musl/${flavor}/${arch}"
local target="stage${s}-${arch}-musl-${flavor}-${mydate}.tar.bz2"
local tglink="stage${s}-${arch}-musl-${flavor}.tar.bz2"
@@ -91,13 +91,6 @@ do_stages() {
}
-#
-# approximate timings:
-#
-# catalyst -s current 3 minutes
-# catalyst -f stage1 130 minutes
-#
-
main() {
>zzz.log
diff --git a/tools-musl/run-mipsel3.sh b/tools-musl/run-mipsel3.sh
index 5a8b315..3da4f1c 100755
--- a/tools-musl/run-mipsel3.sh
+++ b/tools-musl/run-mipsel3.sh
@@ -26,8 +26,8 @@ prepare_confs() {
-e "s:TARCH:${tarch}:g" \
-e "s:FLAVOR:${flavor}:g" \
-e "s:MYCATALYST:$(pwd):g" \
- -e "s|^cflags:.*|cflags: -O2 -march=mips3 -mplt
-Wa,-mfix-loongson2f-nop -pipe|" \
- -e "s|^cxxflags:.*|cxxflags: -O2 -march=mips3 -mplt
-Wa,-mfix-loongson2f-nop -pipe|" \
+ -e "s|^cflags:.*|cflags: -O2 -march=mips3 -mplt
-Wa,-mfix-loongson2f-nop -pipe|" \
+ -e "s|^cxxflags:.*|cxxflags: -O2 -march=mips3 -mplt
-Wa,-mfix-loongson2f-nop -pipe|" \
> stage${s}-${arch}-musl-${flavor}.conf
done
@@ -50,7 +50,7 @@ do_stages() {
local flavor=$2
for s in 1 2 3; do
- local tgpath="${storedir}/builds/${flavor}/${arch}"
+ local tgpath="${storedir}/builds/musl/${flavor}/${arch}"
local target="stage${s}-${arch}-musl-${flavor}-${mydate}.tar.bz2"
local tglink="stage${s}-${arch}-musl-${flavor}.tar.bz2"
@@ -83,13 +83,6 @@ do_stages() {
}
-#
-# approximate timings:
-#
-# catalyst -s current 3 minutes
-# catalyst -f stage1 130 minutes
-#
-
main() {
>zzz.log
diff --git a/tools-musl/run.sh b/tools-musl/run.sh
index 188092b..03ac819 100755
--- a/tools-musl/run.sh
+++ b/tools-musl/run.sh
@@ -59,7 +59,7 @@ do_stages() {
local flavor=$2
for s in 1 2 3; do
- local tgpath="${storedir}/builds/${flavor}/${arch}"
+ local tgpath="${storedir}/builds/musl/${flavor}/${arch}"
local target="stage${s}-${arch}-musl-${flavor}-${mydate}.tar.bz2"
local tglink="stage${s}-${arch}-musl-${flavor}.tar.bz2"
@@ -92,13 +92,6 @@ do_stages() {
}
-#
-# approximate timings:
-#
-# catalyst -s current 3 minutes
-# catalyst -f stage1 130 minutes
-#
-
main() {
>zzz.log
diff --git a/tools-musl/stage-all.conf.template
b/tools-musl/stage-all.conf.template
index 6bc302b..d7dab4b 100644
--- a/tools-musl/stage-all.conf.template
+++ b/tools-musl/stage-all.conf.template
@@ -1,12 +1,12 @@
subarch: SARCH
target: CSTAGE
version_stamp: musl-FLAVOR
-rel_type: FLAVOR/SARCH
+rel_type: musl/FLAVOR/SARCH
profile: hardened/linux/musl/PARCH
snapshot: current
-source_subpath: FLAVOR/SARCH/PSTAGE-SARCH-musl-FLAVOR
+source_subpath: musl/FLAVOR/SARCH/PSTAGE-SARCH-musl-FLAVOR
chost: TARCH-gentoo-linux-musl
cflags: -O2 -pipe -fomit-frame-pointer
cxxflags: -O2 -pipe -fomit-frame-pointer
portage_confdir: MYCATALYST/portage.SARCH.FLAVOR
-portage_overlay: /var/lib/layman/hardened-development
+portage_overlay: /var/lib/layman/hardened-development-musl
diff --git a/tools-uclibc/run-armv7a.sh b/tools-uclibc/run-armv7a.sh
index c51ea4b..7a248f5 100755
--- a/tools-uclibc/run-armv7a.sh
+++ b/tools-uclibc/run-armv7a.sh
@@ -58,7 +58,7 @@ do_stages() {
local flavor=$2
for s in 1 2 3; do
- local tgpath="${storedir}/builds/${flavor}/${arch}"
+ local tgpath="${storedir}/builds/uclibc/${flavor}/${arch}"
local target="stage${s}-${arch}-uclibc-${flavor}-${mydate}.tar.bz2"
local tglink="stage${s}-${arch}-uclibc-${flavor}.tar.bz2"
@@ -91,13 +91,6 @@ do_stages() {
}
-#
-# approximate timings:
-#
-# catalyst -s current 3 minutes
-# catalyst -f stage1 130 minutes
-#
-
main() {
>zzz.log
diff --git a/tools-uclibc/run-mips32r2.sh b/tools-uclibc/run-mips32r2.sh
index 446772b..8829b3d 100755
--- a/tools-uclibc/run-mips32r2.sh
+++ b/tools-uclibc/run-mips32r2.sh
@@ -48,7 +48,7 @@ do_stages() {
local flavor=$2
for s in 1 2 3; do
- local tgpath="${storedir}/builds/${flavor}/${arch}"
+ local tgpath="${storedir}/builds/uclibc/${flavor}/${arch}"
local target="stage${s}-${arch}-uclibc-${flavor}-${mydate}.tar.bz2"
local tglink="stage${s}-${arch}-uclibc-${flavor}.tar.bz2"
@@ -81,13 +81,6 @@ do_stages() {
}
-#
-# approximate timings:
-#
-# catalyst -s current 3 minutes
-# catalyst -f stage1 130 minutes
-#
-
main() {
>zzz.log
diff --git a/tools-uclibc/run-mipsel3.sh b/tools-uclibc/run-mipsel3.sh
index 87fc1b7..510639c 100755
--- a/tools-uclibc/run-mipsel3.sh
+++ b/tools-uclibc/run-mipsel3.sh
@@ -48,7 +48,7 @@ do_stages() {
local flavor=$2
for s in 1 2 3; do
- local tgpath="${storedir}/builds/${flavor}/${arch}"
+ local tgpath="${storedir}/builds/uclibc/${flavor}/${arch}"
local target="stage${s}-${arch}-uclibc-${flavor}-${mydate}.tar.bz2"
local tglink="stage${s}-${arch}-uclibc-${flavor}.tar.bz2"
@@ -81,13 +81,6 @@ do_stages() {
}
-#
-# approximate timings:
-#
-# catalyst -s current 3 minutes
-# catalyst -f stage1 130 minutes
-#
-
main() {
>zzz.log
diff --git a/tools-uclibc/run.sh b/tools-uclibc/run.sh
index 45e0266..b1b8211 100755
--- a/tools-uclibc/run.sh
+++ b/tools-uclibc/run.sh
@@ -59,7 +59,7 @@ do_stages() {
local flavor=$2
for s in 1 2 3; do
- local tgpath="${storedir}/builds/${flavor}/${arch}"
+ local tgpath="${storedir}/builds/uclibc/${flavor}/${arch}"
local target="stage${s}-${arch}-uclibc-${flavor}-${mydate}.tar.bz2"
local tglink="stage${s}-${arch}-uclibc-${flavor}.tar.bz2"
@@ -92,13 +92,6 @@ do_stages() {
}
-#
-# approximate timings:
-#
-# catalyst -s current 3 minutes
-# catalyst -f stage1 130 minutes
-#
-
main() {
>zzz.log
@@ -117,7 +110,7 @@ main() {
do_stages ${arch} ${flavor}
ret=$?
if [[ $? == 1 ]]; then
- echo "FAILURE at ${arch} ${flavor}" | tee zzz.log
+ echo "FAILURE at ${arch} ${flavor} " | tee zzz.log
return 1
fi
done
diff --git a/tools-uclibc/stage-all.conf.template
b/tools-uclibc/stage-all.conf.template
index 28bb2d8..ad147a1 100644
--- a/tools-uclibc/stage-all.conf.template
+++ b/tools-uclibc/stage-all.conf.template
@@ -1,9 +1,9 @@
subarch: SARCH
target: CSTAGE
version_stamp: uclibc-FLAVOR
-rel_type: FLAVOR/SARCH
+rel_type: uclibc/FLAVOR/SARCH
profile: hardened/linux/uclibc/PARCH
snapshot: current
-source_subpath: FLAVOR/SARCH/PSTAGE-SARCH-uclibc-FLAVOR
+source_subpath: uclibc/FLAVOR/SARCH/PSTAGE-SARCH-uclibc-FLAVOR
chost: TARCH-gentoo-linux-uclibc
portage_confdir: MYCATALYST/portage.SARCH.FLAVOR
