From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A893F138334 for ; Tue, 16 Jul 2019 00:05:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BC201E0827; Tue, 16 Jul 2019 00:05:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8D8D5E0827 for ; Tue, 16 Jul 2019 00:05:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E058D346F43 for ; Tue, 16 Jul 2019 00:05:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 606666F1 for ; Tue, 16 Jul 2019 00:05:10 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1563235484.f27b8c12bde5028a050fe7ae313bdee7dd1bbdc7.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_compile.sh gen_initramfs.sh gen_package.sh gen_worker.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: f27b8c12bde5028a050fe7ae313bdee7dd1bbdc7 X-VCS-Branch: master Date: Tue, 16 Jul 2019 00:05:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 46f7c396-7c05-4123-8ecf-5f7be5c8f858 X-Archives-Hash: dce70def3ba125b5a6f0ec998434b279 commit: f27b8c12bde5028a050fe7ae313bdee7dd1bbdc7 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Jul 16 00:04:44 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Jul 16 00:04:44 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=f27b8c12 Adjust LOGLEVEL Signed-off-by: Thomas Deutschmann gentoo.org> gen_compile.sh | 12 ++++++------ gen_initramfs.sh | 20 ++++++++++---------- gen_package.sh | 6 +++--- gen_worker.sh | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gen_compile.sh b/gen_compile.sh index cc7b1aa..a2c70a8 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 9c701f5..f5162bb 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 e869705..bee9989 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 8b59f1a..caf407a 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[@]}"