diff --git a/lib/functions/compilation/kernel-git.sh b/lib/functions/compilation/kernel-git.sh index 2ea8d5e94d..46379a5023 100644 --- a/lib/functions/compilation/kernel-git.sh +++ b/lib/functions/compilation/kernel-git.sh @@ -177,5 +177,6 @@ function kernel_prepare_git() { GIT_PRE_FETCH_HOOK=kernel_prepare_git_pre_fetch_tags \ GIT_BARE_REPO_FOR_WORKTREE="${kernel_git_bare_tree}" \ GIT_BARE_REPO_INITIAL_BRANCH="master" \ - fetch_from_repo "$KERNELSOURCE" "unused:set via GIT_FIXED_WORKDIR" "$KERNELBRANCH" "yes" + fetch_from_repo "$KERNELSOURCE" "kernel:${KERNEL_MAJOR_MINOR}" "$KERNELBRANCH" "yes" + # second parameter, "dir", is ignored, since we've passed GIT_FIXED_WORKDIR } diff --git a/lib/functions/compilation/patch/drivers-harness.sh b/lib/functions/compilation/patch/drivers-harness.sh index c1d8674655..bf4a246827 100644 --- a/lib/functions/compilation/patch/drivers-harness.sh +++ b/lib/functions/compilation/patch/drivers-harness.sh @@ -12,7 +12,6 @@ function calculate_hash_for_files() { function kernel_drivers_create_patches() { declare kernel_work_dir="${1}" declare kernel_git_revision="${2}" - display_alert "Creating patches for kernel drivers" "version: '${KERNEL_MAJOR_MINOR}' kernel_work_dir:'${kernel_work_dir}'" "info" declare hash_files # any changes in these two files will trigger a cache miss. calculate_hash_for_files "${SRC}/lib/functions/compilation/patch/drivers_network.sh" "${SRC}/lib/functions/compilation/patch/drivers-harness.sh" @@ -36,6 +35,8 @@ function kernel_drivers_create_patches() { display_alert "Using cached drivers patch file for ${LINUXFAMILY}-${KERNEL_MAJOR_MINOR}" "${cache_key}" "cachehit" return fi + + display_alert "Creating patches for kernel drivers" "version: '${KERNEL_MAJOR_MINOR}' family: '${LINUXFAMILY}'" "info" # if it does _not_ exist, fist clear the base, so no old patches are left over run_host_command_logged rm -fv "${cache_dir_base}/${cache_key_base}*" @@ -48,7 +49,7 @@ function kernel_drivers_create_patches() { kernel_driver_commit_date=$(git -C "$kernel_work_dir" show -s --format=%ci "$kernel_git_revision") display_alert "Kernel driver commit date" "$kernel_driver_commit_date" "debug" - display_alert "Preparing patch for drivers" "version: ${KERNEL_MAJOR_MINOR} kernel_work_dir: ${kernel_work_dir}" "info" + display_alert "Preparing patch for drivers" "version: ${KERNEL_MAJOR_MINOR} kernel_work_dir: ${kernel_work_dir}" "debug" kernel_drivers_prepare_harness "${kernel_work_dir}" "${kernel_git_revision}" } diff --git a/lib/functions/configuration/interactive.sh b/lib/functions/configuration/interactive.sh index 19aaad31a3..6413952976 100644 --- a/lib/functions/configuration/interactive.sh +++ b/lib/functions/configuration/interactive.sh @@ -162,7 +162,7 @@ function interactive_config_ask_board_list() { function interactive_config_ask_branch() { # if BRANCH not set, display selection menu if [[ -n $BRANCH ]]; then - display_alert "Already set BRANCH, skipping interactive" "${BRANCH}" "info" + display_alert "Already set BRANCH, skipping interactive" "${BRANCH}" "debug" return 0 fi declare -a options=() diff --git a/lib/functions/general/git.sh b/lib/functions/general/git.sh index d27f35c8a5..3dc1c6e1bf 100644 --- a/lib/functions/general/git.sh +++ b/lib/functions/general/git.sh @@ -200,7 +200,7 @@ fetch_from_repo() { checked_out_revision_mtime="$(date +%Y%m%d%H%M%S -d "@${checked_out_revision_ts}")" # convert timestamp to local date/time display_alert "checked_out_revision_mtime set!" "${checked_out_revision_mtime} - ${checked_out_revision_ts}" "git" - display_alert "git checking out revision SHA" "${checked_out_revision}" + display_alert "git checking out revision SHA" "${checked_out_revision}" "debug" regular_git checkout -f -q "${checked_out_revision}" # Return the files that are tracked by git to the initial state. display_alert "git cleaning" "${checked_out_revision}" "git" diff --git a/lib/functions/host/host-utils.sh b/lib/functions/host/host-utils.sh index 838f11e402..9f5c774849 100644 --- a/lib/functions/host/host-utils.sh +++ b/lib/functions/host/host-utils.sh @@ -233,8 +233,8 @@ function check_dir_for_mount_options() { } function trap_handler_reset_output_owner() { - display_alert "Resetting output directory owner" "${SRC}/output" "info" + display_alert "Resetting output directory owner" "${SRC}/output" "debug" reset_uid_owner "${SRC}/output" - display_alert "Resetting tmp directory owner" "${SRC}/.tmp" "info" + display_alert "Resetting tmp directory owner" "${SRC}/.tmp" "debug" reset_uid_owner "${SRC}/.tmp" }