chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools-musl + tools-uclibc: begin refactoring to avoid repeated code

Browse source
This commit is contained in:
Anthony G. Basile 2014-06-27 12:27:54 -04:00
parent 2546599186
commit afcff59a6d
9 changed files with 15 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools-musl/run-armv7a.sh
View file

@ -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

13
tools-musl/run-mipsel3.sh
View file

@ -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

9
tools-musl/run.sh
View file

@ -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

6
tools-musl/stage-all.conf.template
View file

@ -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

9
tools-uclibc/run-armv7a.sh
View file

@ -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

9
tools-uclibc/run-mips32r2.sh
View file

@ -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

9
tools-uclibc/run-mipsel3.sh
View file

@ -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

11
tools-uclibc/run.sh
View file

@ -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

4
tools-uclibc/stage-all.conf.template
View file

@ -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