diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-29 12:04:12 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-29 13:30:34 +0200 |
| commit | 30b9267e35eea1c2edb4da0231a428bfa25b6766 (patch) | |
| tree | 2c146578247fd2f0454cdd9205612cbbd88e41e9 /scripts | |
| parent | 8ee3c980c36e5425feeb76d459274fbcc2cdfa8a (diff) | |
| download | ptxdist-30b9267e35eea1c2edb4da0231a428bfa25b6766.tar.gz ptxdist-30b9267e35eea1c2edb4da0231a428bfa25b6766.tar.xz | |
redirect command stderr to stdout
Redirect stderr to stdout for the actual autogen.sh, prepare, compile,
install and opkg-build command.
This preserves the chronological order of stdout vs. stderr when building
packages in parallel with output sync enabled.
As a side-effect, the stderr output of these commands won't show up on the
console for quiet builds. But most of that is not really useful by itself
anyways. And the resulting logfile is more readable now for the rest.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_make_opkg_finish.sh | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_world_compile.sh | 4 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_world_install.sh | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_world_patchin.sh | 2 | ||||
| -rw-r--r-- | scripts/lib/ptxd_make_world_prepare.sh | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/scripts/lib/ptxd_make_opkg_finish.sh b/scripts/lib/ptxd_make_opkg_finish.sh index 2505f2bcf..d12c84457 100644 --- a/scripts/lib/ptxd_make_opkg_finish.sh +++ b/scripts/lib/ptxd_make_opkg_finish.sh @@ -16,7 +16,7 @@ ptxd_make_opkg_finish_impl() { chown -R 0:0 "${pkg_xpkg_tmp}" && ptxd_make_xpkg_pkg "${pkg_opkg_tmp}" "${pkg_xpkg_cmds}" "${pkg_xpkg_perms}" && - opkg-build ${ptx_xpkg_extra_args} "${pkg_opkg_tmp}" "${ptx_pkg_dir}" + opkg-build ${ptx_xpkg_extra_args} "${pkg_opkg_tmp}" "${ptx_pkg_dir}" 2>&1 } export -f ptxd_make_opkg_finish_impl diff --git a/scripts/lib/ptxd_make_world_compile.sh b/scripts/lib/ptxd_make_world_compile.sh index 5e115bdbc..c6eebc2c8 100644 --- a/scripts/lib/ptxd_make_world_compile.sh +++ b/scripts/lib/ptxd_make_world_compile.sh @@ -28,7 +28,7 @@ ptxd_make_world_compile() { "${ptx_build_python}" \ setup.py \ "${pkg_make_opt}" - ) + ) 2>&1 ;; *) ptxd_eval \ @@ -37,7 +37,7 @@ ptxd_make_world_compile() { "${pkg_make_env}" \ "${MAKE}" -C "${pkg_build_dir}" \ "${pkg_make_opt}" \ - "${pkg_make_par}" + "${pkg_make_par}" 2>&1 ;; esac } diff --git a/scripts/lib/ptxd_make_world_install.sh b/scripts/lib/ptxd_make_world_install.sh index 6ce68480d..b7d69a644 100644 --- a/scripts/lib/ptxd_make_world_install.sh +++ b/scripts/lib/ptxd_make_world_install.sh @@ -102,7 +102,7 @@ ptxd_make_world_install() { "${echo:-echo}" \ "${cmd[@]}" \ - | "${fakeroot:-fakeroot}" "${fakeargs[@]}" -- + | "${fakeroot:-fakeroot}" "${fakeargs[@]}" -- 2>&1 check_pipe_status } export -f ptxd_make_world_install diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh index c93ba62b9..00d5bd7e7 100644 --- a/scripts/lib/ptxd_make_world_patchin.sh +++ b/scripts/lib/ptxd_make_world_patchin.sh @@ -411,7 +411,7 @@ ptxd_make_world_autogen() { # run autogen.sh if available if [ -n "${pkg_patch_autogen}" ]; then - "${pkg_patch_autogen}" || return + "${pkg_patch_autogen}" 2>&1 || return echo -e "patchin: autogen: done\n" fi } diff --git a/scripts/lib/ptxd_make_world_prepare.sh b/scripts/lib/ptxd_make_world_prepare.sh index 4914c5e49..ecc896205 100644 --- a/scripts/lib/ptxd_make_world_prepare.sh +++ b/scripts/lib/ptxd_make_world_prepare.sh @@ -140,7 +140,7 @@ ptxd_make_world_prepare() { case "${pkg_conf_tool}" in autoconf|cmake|qmake|kconfig|perl) cd -- "${pkg_build_dir}" && - ptxd_make_world_prepare_"${pkg_conf_tool}" ;; + ptxd_make_world_prepare_"${pkg_conf_tool}" 2>&1 ;; python|python3) : ;; # nothing to do "NO") echo "prepare stage disabled." ;; |