diff options
author | 2019-07-16 02:04:44 +0200 | |
---|---|---|
committer | 2019-07-16 02:04:44 +0200 | |
commit | f27b8c12bde5028a050fe7ae313bdee7dd1bbdc7 (patch) | |
tree | a4dbc431bd0772fee7f3e1c4a86436388104938f | |
parent | gen_configkernel.sh: config_kernel(): No need to re-check required kernel opt... (diff) | |
download | genkernel-f27b8c12bde5028a050fe7ae313bdee7dd1bbdc7.tar.gz genkernel-f27b8c12bde5028a050fe7ae313bdee7dd1bbdc7.tar.bz2 genkernel-f27b8c12bde5028a050fe7ae313bdee7dd1bbdc7.zip |
Adjust LOGLEVEL
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rwxr-xr-x | gen_compile.sh | 12 | ||||
-rwxr-xr-x | gen_initramfs.sh | 20 | ||||
-rwxr-xr-x | gen_package.sh | 6 | ||||
-rwxr-xr-x | gen_worker.sh | 2 |
4 files changed, 20 insertions, 20 deletions
diff --git a/gen_compile.sh b/gen_compile.sh index cc7b1aad..a2c70a82 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -37,7 +37,7 @@ compile_external_modules() { fi print_info 1 "$(get_indent 1)>> Compiling out-of-tree module(s) ..." - print_info 2 "COMMAND: ${command}" 1 0 1 + print_info 3 "COMMAND: ${command}" 1 0 1 if [ "${LOGLEVEL}" -gt 3 ] then @@ -199,18 +199,18 @@ compile_generic() { if [ "${argstype}" == 'kernelruntask' ] then # Silent operation, forced -j1 - print_info 2 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} -j1 ${ARGS} ${target} $*" 1 0 1 + print_info 3 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} -j1 ${ARGS} ${target} $*" 1 0 1 eval ${NICEOPTS}${MAKE} -s ${MAKEOPTS} -j1 ${ARGS} ${target} $* RET=$? elif [ "${LOGLEVEL}" -gt 3 ] then # Output to stdout and logfile - print_info 2 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $*" 1 0 1 + print_info 3 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $*" 1 0 1 eval ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $* 2>&1 | tee -a "${LOGFILE}" RET=${PIPESTATUS[0]} else # Output to logfile only - print_info 2 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $*" 1 0 1 + print_info 3 "COMMAND: ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $*" 1 0 1 eval ${NICEOPTS}${MAKE} ${MAKEOPTS} ${ARGS} ${target} $* >> "${LOGFILE}" 2>&1 RET=$? fi @@ -340,7 +340,7 @@ compile_kernel() { } determine_busybox_config_file() { - print_info 2 "$(get_indent 3)busybox: >> Checking for suitable busybox configuration ..." + print_info 2 "$(get_indent 2)busybox: >> Checking for suitable busybox configuration ..." if [ -n "${CMD_BUSYBOX_CONFIG}" ] then @@ -378,7 +378,7 @@ determine_busybox_config_file() { BUSYBOX_CONFIG="$f" break else - print_info 3 "$(get_indent 1)- '${f}' not found; Skipping ..." + print_info 3 "$(get_indent 3)- '${f}' not found; Skipping ..." fi done diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 9c701f57..f5162bb1 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -171,10 +171,10 @@ copy_system_binaries() { } log_future_cpio_content() { - print_info 2 "=================================================================" 1 0 1 - print_info 2 "About to add these files from '${PWD}' to cpio archive:" 1 0 1 - print_info 2 "$(find . | xargs ls -ald)" 1 0 1 - print_info 2 "=================================================================" 1 0 1 + print_info 3 "=================================================================" 1 0 1 + print_info 3 "About to add these files from '${PWD}' to cpio archive:" 1 0 1 + print_info 3 "$(find . | xargs ls -ald)" 1 0 1 + print_info 3 "=================================================================" 1 0 1 } append_devices() { @@ -199,10 +199,10 @@ append_devices() { nod /dev/ttyS0 600 0 0 c 4 64 EOF - print_info 2 "=================================================================" 1 0 1 - print_info 2 "Adding the following devices to cpio:" 1 0 1 - print_info 2 "$(cat "${TFILE}")" 1 0 1 - print_info 2 "=================================================================" 1 0 1 + print_info 3 "=================================================================" 1 0 1 + print_info 3 "Adding the following devices to cpio:" 1 0 1 + print_info 3 "$(cat "${TFILE}")" 1 0 1 + print_info 3 "=================================================================" 1 0 1 "${KERNEL_OUTPUTDIR}"/usr/gen_init_cpio "${TFILE}" >"${CPIO}" \ || gen_die "Failed to append devices to cpio!" @@ -1264,7 +1264,7 @@ append_modules() { mymod=$(find "${_MODULES_DIR}" -name "${i}${MOD_EXT}" 2>/dev/null | head -n 1) if [ -z "${mymod}" ] then - print_warning 2 "$(get_indent 3) - ${i}${MOD_EXT} not found; Skipping ..." + print_warning 3 "$(get_indent 3) - ${i}${MOD_EXT} not found; Skipping ..." continue; fi @@ -1674,7 +1674,7 @@ create_initramfs() { if [ -n "${compression}" ] then print_info 1 "$(get_indent 1)>> Compressing cpio data (${compress_ext}) ..." - print_info 2 "COMMAND: ${compress_cmd} $CPIO" 1 0 1 + print_info 3 "COMMAND: ${compress_cmd} $CPIO" 1 0 1 ${compress_cmd} "${CPIO}" || gen_die "Compression (${compress_cmd}) failed" mv -f "${CPIO}${compress_ext}" "${CPIO}" || gen_die "Rename failed" else diff --git a/gen_package.sh b/gen_package.sh index e869705a..bee99895 100755 --- a/gen_package.sh +++ b/gen_package.sh @@ -79,7 +79,7 @@ gen_minkernpackage() { local -a tar_cmd=( "$(get_tar_cmd "${MINKERNPACKAGE}")" ) tar_cmd+=( '*' ) - print_info 2 "COMMAND: ${tar_cmd[*]}" 1 0 1 + print_info 3 "COMMAND: ${tar_cmd[*]}" 1 0 1 eval "${tar_cmd[@]}" || gen_die "Failed to create compressed min kernel package '${MINKERNPACKAGE}'!" } @@ -99,7 +99,7 @@ gen_modulespackage() { local -a tar_cmd=( "$(get_tar_cmd "${MODULESPACKAGE}")" ) tar_cmd+=( '*' ) - print_info 2 "COMMAND: ${tar_cmd[*]}" 1 0 1 + print_info 3 "COMMAND: ${tar_cmd[*]}" 1 0 1 eval "${tar_cmd[@]}" || gen_die "Failed to create compressed modules package '${MODULESPACKAGE}'!" else print_info 1 "'${INSTALL_MOD_PATH}/lib/modules/${KV}' was not found; Skipping creation of modules package in '${MODULESPACKAGE}' ..." @@ -171,7 +171,7 @@ gen_kerncache() { local -a tar_cmd=( "$(get_tar_cmd "${KERNCACHE}")" ) tar_cmd+=( '*' ) - print_info 2 "COMMAND: ${tar_cmd[*]}" 1 0 1 + print_info 3 "COMMAND: ${tar_cmd[*]}" 1 0 1 eval "${tar_cmd[@]}" || gen_die "Failed to create compressed kernel package '${KERNCACHE}'!" } diff --git a/gen_worker.sh b/gen_worker.sh index 8b59f1a9..caf407a8 100755 --- a/gen_worker.sh +++ b/gen_worker.sh @@ -62,7 +62,7 @@ gkexec() { local -a command=( "${1}" ) local pipes=${2:-0} - print_info 2 "COMMAND: ${command[@]}" 1 0 1 + print_info 3 "COMMAND: ${command[@]}" 1 0 1 command+=( "$(catch_output_and_failures "Command '${command[@]}' failed!" ${pipes})" ) eval "${command[@]}" |