e2fea1
build.sh, subr/{build,pre_*}.subr: general cleanup.
|
@@ -5,9 +5,7 @@
|
|
|
5
5
|
#
|
|
6
6
|
#
|
|
7
7
|
#
|
|
8
|
-
for __ in subr/*.subr; do
|
|
8
|
+
for __ in subr/*.subr; do . ${__}; done;
|
|
9
|
-
. ./${__};
|
|
10
|
-
done;
|
|
11
9
|
while [ ${#} -gt 0 ]; do
|
|
12
10
|
case ${1} in
|
|
13
11
|
-c) ARG_CLEAN=1; ;;
|
|
@@ -33,37 +31,8 @@ host_toolchain|native_toolchain|runtime|lib_packages|leaf_packages|devroot|world
|
|
|
33
31
|
BUILD_TARGETS_META="${BUILD_TARGETS_META:+${BUILD_TARGETS_META} }${1}"; ;;
|
|
34
32
|
*=*) set_var_unsafe "${1%%=*}" "${1#*=}"; ;;
|
|
35
33
|
*) exec cat etc/build.usage; ;;
|
|
36
|
-
esac; shift;
|
|
37
|
-
|
|
34
|
+
esac; shift; done;
|
|
35
|
+
pre_setup_env; pre_prereqs; pre_subdirs; pre_build_files;
|
|
38
|
-
|
|
39
|
-
#
|
|
40
|
-
#
|
|
41
|
-
#
|
|
42
|
-
if [ -z "${BUILD_CPUS}" ]\
|
|
43
|
-
&& [ -e /proc/cpuinfo ]; then
|
|
44
|
-
BUILD_CPUS=$(awk '/^processor/{cpus++} END{print cpus}' /proc/cpuinfo);
|
|
45
|
-
fi;
|
|
46
|
-
for __ in ${HOME}/midipix_build.vars ../midipix_build.vars ./vars/build.vars; do
|
|
47
|
-
[ -e ${__} ] && . ${__};
|
|
48
|
-
done;
|
|
49
|
-
for __ in $(export | sed -e 's/^export //' -e 's/=.*$//'); do
|
|
50
|
-
if ! match_list "${CLEAR_ENV_VARS_EXCEPT}" " " "${__}"; then
|
|
51
|
-
unset "${__}";
|
|
52
|
-
fi;
|
|
53
|
-
done;
|
|
54
|
-
|
|
55
|
-
#
|
|
56
|
-
#
|
|
57
|
-
#
|
|
58
|
-
pre_prereqs;
|
|
59
|
-
pre_subdirs;
|
|
60
|
-
if [ -e ${BUILD_LOG_FNAME} ]; then
|
|
61
|
-
mv -- ${BUILD_LOG_FNAME} ${BUILD_LOG_LAST_FNAME};
|
|
62
|
-
fi;
|
|
63
|
-
touch ${BUILD_STATUS_IN_PROGRESS_FNAME};
|
|
64
|
-
BUILD_DATE_START="$(date %Y-%m-%d-%H-%M-%S)";
|
|
65
|
-
BUILD_NFINI=${BUILD_NSKIP:=${BUILD_NFAIL:=${BUILD_NBUILT:=0}}};
|
|
66
|
-
BUILD_TIMES_SECS=$(command date +%s);
|
|
67
36
|
|
|
68
37
|
#
|
|
69
38
|
#
|
|
@@ -142,16 +111,9 @@ for BUILD_TARGET_LC in $(subst_tgts invariants ${BUILD_TARGETS_META:-world}); do
|
|
|
142
111
|
break;
|
|
143
112
|
fi;
|
|
144
113
|
done;
|
|
145
|
-
post_copy_etc; post_strip; post_tarballs;
|
|
114
|
+
post_copy_etc; post_strip; post_tarballs; post_build_files;
|
|
146
|
-
: $((BUILD_TIMES_SECS=$(command date +%s)-${BUILD_TIMES_SECS}));
|
|
147
|
-
: $((BUILD_TIMES_HOURS=${BUILD_TIMES_SECS}/3600));
|
|
148
|
-
: $((BUILD_TIMES_MINUTES=(${BUILD_TIMES_SECS}%3600)/60));
|
|
149
|
-
: $((BUILD_TIMES_SECS=(${BUILD_TIMES_SECS}%3600)%60));
|
|
150
115
|
log_msg info "${BUILD_NFINI} finished, ${BUILD_NSKIP} skipped, and ${BUILD_NFAIL} failed builds in ${BUILD_NBUILT} build script(s).";
|
|
151
116
|
log_msg info "Build time: ${BUILD_TIMES_HOURS} hour(s), ${BUILD_TIMES_MINUTES} minute(s), and ${BUILD_TIMES_SECS} second(s).";
|
|
152
|
-
if [ -f "${BUILD_STATUS_IN_PROGRESS_FNAME}" ]; then
|
|
153
|
-
build_fileop rm ${BUILD_STATUS_IN_PROGRESS_FNAME};
|
|
154
|
-
fi;
|
|
155
117
|
exit ${BUILD_SCRIPT_RC})} 2>&1 | tee ${BUILD_LOG_FNAME} &
|
|
156
118
|
|
|
157
119
|
#
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
|
|
2
|
+
. ./build.vars and set -o errexit -o noglob are assumed.
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
post_build_files() {
|
|
6
|
+
: $((BUILD_TIMES_SECS=$(command date +%s)-${BUILD_TIMES_SECS}));
|
|
7
|
+
: $((BUILD_TIMES_HOURS=${BUILD_TIMES_SECS}/3600));
|
|
8
|
+
: $((BUILD_TIMES_MINUTES=(${BUILD_TIMES_SECS}%3600)/60));
|
|
9
|
+
: $((BUILD_TIMES_SECS=(${BUILD_TIMES_SECS}%3600)%60));
|
|
10
|
+
if [ -f "${BUILD_STATUS_IN_PROGRESS_FNAME}" ]; then
|
|
11
|
+
build_fileop rm ${BUILD_STATUS_IN_PROGRESS_FNAME};
|
|
12
|
+
fi;
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
vim:filetype=sh
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
|
|
2
|
+
. ./build.vars and set -o errexit -o noglob are assumed.
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
pre_build_files() {
|
|
6
|
+
if [ -e ${BUILD_LOG_FNAME} ]; then
|
|
7
|
+
mv -- ${BUILD_LOG_FNAME} ${BUILD_LOG_LAST_FNAME};
|
|
8
|
+
fi;
|
|
9
|
+
touch ${BUILD_STATUS_IN_PROGRESS_FNAME};
|
|
10
|
+
BUILD_DATE_START="$(date %Y-%m-%d-%H-%M-%S)";
|
|
11
|
+
BUILD_NFINI=${BUILD_NSKIP:=${BUILD_NFAIL:=${BUILD_NBUILT:=0}}};
|
|
12
|
+
BUILD_TIMES_SECS=$(command date +%s);
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
vim:filetype=sh
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
|
|
2
|
+
. ./build.vars and set -o errexit -o noglob are assumed.
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
pre_setup_env() {
|
|
6
|
+
if [ -z "${BUILD_CPUS}" ]\
|
|
7
|
+
&& [ -e /proc/cpuinfo ]; then
|
|
8
|
+
BUILD_CPUS=$(awk '/^processor/{cpus++} END{print cpus}' /proc/cpuinfo);
|
|
9
|
+
fi;
|
|
10
|
+
for __ in ${HOME}/midipix_build.vars ../midipix_build.vars ./vars/build.vars; do
|
|
11
|
+
[ -e ${__} ] && . ${__};
|
|
12
|
+
done;
|
|
13
|
+
for __ in $(export | sed -e 's/^export //' -e 's/=.*$//'); do
|
|
14
|
+
if ! match_list "${CLEAR_ENV_VARS_EXCEPT}" " " "${__}"; then
|
|
15
|
+
unset "${__}";
|
|
16
|
+
fi;
|
|
17
|
+
done;
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
vim:filetype=sh
|