diff options
| -rwxr-xr-x | jenkins_common_lib | 4 | ||||
| -rwxr-xr-x | jenkins_kernel_build_inst | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/jenkins_common_lib b/jenkins_common_lib index 005a75d..e141b74 100755 --- a/jenkins_common_lib +++ b/jenkins_common_lib @@ -102,7 +102,7 @@ build_instructions() START=$(date +%s) cpu_count=`getconf _NPROCESSORS_ONLN` j_count=`expr $cpu_count '*' 2` - if [ "${silent}" = "true" ]; then + if [ "${make_silent}" = "true" ]; then redirect_output=" &>${pkg_dir}/build.log" fi if [ -n "$conf_filenames" -o -n "$conf_git" ] ; then @@ -173,7 +173,7 @@ build_instructions() if [ "${make_install}" = "true" ]; then install -D -p -m0644 ${pkg_dir}/.config out/kernel.config install -D -p -m0644 ${pkg_dir}/arch/${ARCH}/boot/${kernel_img_cmd} out/${kernel_img_cmd} - [ "${silent}" = "true" ] && cp -a ${pkg_dir}/build.log out/ + [ "${make_silent}" = "true" ] && cp -a ${pkg_dir}/build.log out/ for dtb in `find ${pkg_dir}/arch/${ARCH}/boot/dts/ -type f -name '*.dtb'`; do install -D -p -m0644 ${dtb} out/dtbs/`basename ${dtb}` done diff --git a/jenkins_kernel_build_inst b/jenkins_kernel_build_inst index 46a0888..6bd1b3e 100755 --- a/jenkins_kernel_build_inst +++ b/jenkins_kernel_build_inst @@ -87,8 +87,8 @@ if test -z "$make_install"; then make_install=false fi -if test -z "$silent"; then - silent=false +if test -z "$make_silent"; then + make_silent=false fi install_custom_toolchain @@ -102,7 +102,7 @@ else export CROSS_COMPILE="${compiler_prefix}" fi -export silent +export make_silent export make_deb export make_bootwrapper export make_install |