commit: 37339c78c776b74bb20762dae15ca18da7ff1189
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 00:20:57 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 00:26:40 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=37339c78
Adjust indentation of kernel compilation output
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
gen_compile.sh | 20 ++++++++++----------
gen_configkernel.sh | 14 +++++++-------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/gen_compile.sh b/gen_compile.sh
index 6e0d107..d08d1e5 100755
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -310,21 +310,21 @@ compile_generic() {
}
compile_modules() {
- print_info 1 "$(getIndent 3)>> Compiling ${KV} modules..."
+ print_info 1 "$(getIndent 1)>> Compiling ${KV} modules..."
cd ${KERNEL_DIR}
compile_generic modules kernel
export UNAME_MACHINE="${ARCH}"
[ "${INSTALL_MOD_PATH}" != '' ] && export INSTALL_MOD_PATH
if [ "${CMD_STRIP_TYPE}" == "all" -o "${CMD_STRIP_TYPE}" == "modules" ]
then
- print_info 1 "$(getIndent 3)>> Installing ${KV} modules (and
stripping)"
+ print_info 1 "$(getIndent 1)>> Installing ${KV} modules (and
stripping)"
INSTALL_MOD_STRIP=1
export INSTALL_MOD_STRIP
else
- print_info 1 "$(getIndent 3)>> Installing ${KV} modules"
+ print_info 1 "$(getIndent 1)>> Installing ${KV} modules"
fi
MAKEOPTS="${MAKEOPTS} -j1" compile_generic "modules_install" kernel
- print_info 1 "$(getIndent 3)>> Generating module dependency data..."
+ print_info 1 "$(getIndent 1)>> Generating module dependency data..."
if [ "${INSTALL_MOD_PATH}" != '' ]
then
depmod -a -e -F "${KERNEL_OUTPUTDIR}"/System.map -b
"${INSTALL_MOD_PATH}" ${KV}
@@ -343,30 +343,30 @@ compile_kernel() {
if [ "${KERNEL_MAKE_DIRECTIVE_OVERRIDE}" !=
"${DEFAULT_KERNEL_MAKE_DIRECTIVE_OVERRIDE}" ]; then
kernel_make_directive="${KERNEL_MAKE_DIRECTIVE_OVERRIDE}"
fi
- print_info 1 "$(getIndent 3)>> Compiling ${KV}
${kernel_make_directive/_install/ [ install ]/}..."
+ print_info 1 "$(getIndent 1)>> Compiling ${KV}
${kernel_make_directive/_install/ [ install ]/}..."
compile_generic "${kernel_make_directive}" kernel
if [ "${KERNEL_MAKE_DIRECTIVE_2}" != '' ]
then
- print_info 1 "$(getIndent 3)>> Starting supplimental compile of
${KV}: ${KERNEL_MAKE_DIRECTIVE_2}..."
+ print_info 1 "$(getIndent 1)>> Starting supplimental compile of
${KV}: ${KERNEL_MAKE_DIRECTIVE_2}..."
compile_generic "${KERNEL_MAKE_DIRECTIVE_2}" kernel
fi
if isTrue "${FIRMWARE_INSTALL}" && [ ! -e "${KERNEL_DIR}/ihex2fw.c" ] ;
then
# Kernel v4.14 removed firmware from the kernel sources,
including the
# ihex2fw.c tool source. Try and detect the tool to see if we
are in >=v4.14
- print_warning 1 "$(getIndent 3)>> Linux v4.14 removed in-kernel
firmware, you MUST install the sys-kernel/linux-firmware package!"
+ print_warning 1 "$(getIndent 1)>> Linux v4.14 removed in-kernel
firmware, you MUST install the sys-kernel/linux-firmware package!"
elif isTrue "${FIRMWARE_INSTALL}" ; then
local cfg_CONFIG_FIRMWARE_IN_KERNEL=$(kconfig_get_opt
"${KERNEL_OUTPUTDIR}/.config" CONFIG_FIRMWARE_IN_KERNEL)
if isTrue "$cfg_CONFIG_FIRMWARE_IN_KERNEL"; then
- print_info 1 "$(getIndent 3)>> Not installing firmware
as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..."
+ print_info 1 "$(getIndent 1)>> Not installing firmware
as it's included in the kernel already (CONFIG_FIRMWARE_IN_KERNEL=y)..."
else
- print_info 1 "$(getIndent 3)>> Installing firmware
('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y..."
+ print_info 1 "$(getIndent 1)>> Installing firmware
('make firmware_install') due to CONFIG_FIRMWARE_IN_KERNEL != y..."
[ "${INSTALL_MOD_PATH}" != '' ] && export
INSTALL_MOD_PATH
[ "${INSTALL_FW_PATH}" != '' ] && export INSTALL_FW_PATH
MAKEOPTS="${MAKEOPTS} -j1" compile_generic
"firmware_install" kernel
fi
else
- print_info 1 "$(getIndent 3)>> Not installing firmware as
requested by configuration FIRMWARE_INSTALL=no..."
+ print_info 1 "$(getIndent 1)>> Not installing firmware as
requested by configuration FIRMWARE_INSTALL=no..."
fi
local tmp_kernel_binary=$(find_kernel_binary
${KERNEL_BINARY_OVERRIDE:-${KERNEL_BINARY}})
diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 475526a..4242385 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -47,11 +47,11 @@ config_kernel() {
NOW=`date +--%Y-%m-%d--%H-%M-%S`
cp "${KERNEL_OUTPUTDIR}/.config"
"${KERNEL_OUTPUTDIR}/.config${NOW}.bak" \
|| gen_die "Could not backup kernel
config (${KERNEL_OUTPUTDIR}/.config)"
- print_info 1 " Previous config backed up
to .config${NOW}.bak"
+ print_info 1 "$(getIndent 1)Previous config
backed up to .config${NOW}.bak"
fi
fi
print_info 1 "kernel: Using config from ${KERNEL_CONFIG}"
- print_info 1 'kernel: >> Running mrproper...'
+ print_info 1 "$(getIndent 1)>> Running mrproper..."
compile_generic mrproper kernel
else
if [ -f "${KERNEL_OUTPUTDIR}/.config" ]
@@ -78,17 +78,17 @@ config_kernel() {
if isTrue "${OLDCONFIG}"
then
- print_info 1 ' >> Running oldconfig...'
+ print_info 1 "$(getIndent 1)>> Running oldconfig..."
yes '' 2>/dev/null | compile_generic oldconfig kernel
2>/dev/null
else
- print_info 1 "kernel: --oldconfig is disabled; not running
'make oldconfig'."
+ print_info 1 "$(getIndent 1)--oldconfig is disabled; not
running 'make oldconfig'."
fi
if isTrue "${CLEAN}"
then
- print_info 1 'kernel: >> Cleaning...'
+ print_info 1 "$(getIndent 1)>> Cleaning..."
compile_generic clean kernel
else
- print_info 1 "kernel: --clean is disabled; not running 'make
clean'."
+ print_info 1 "$(getIndent 1)--clean is disabled; not running
'make clean'."
fi
local add_config
@@ -108,7 +108,7 @@ config_kernel() {
if [ x"${add_config}" != x"" ]
then
- print_info 1 "kernel: >> Invoking ${add_config}..."
+ print_info 1 "$(getIndent 1)>> Invoking ${add_config}..."
compile_generic $add_config kernelruntask
[ "$?" ] || gen_die "Error: ${add_config} failed!"
fi
