diff --git a/lib/functions/artifacts/artifact-rootfs.sh b/lib/functions/artifacts/artifact-rootfs.sh index 46828e6305..7ef38d848f 100644 --- a/lib/functions/artifacts/artifact-rootfs.sh +++ b/lib/functions/artifacts/artifact-rootfs.sh @@ -121,11 +121,11 @@ function artifact_rootfs_cli_adapter_config_prep() { # If BOARD is set, use it to convert to an ARCH. if [[ -n ${BOARD} ]]; then - display_alert "BOARD is set, converting to ARCH for rootfs building" "'BOARD=${BOARD}'" "warn" + display_alert "BOARD is set, converting to ARCH for rootfs building" "'BOARD=${BOARD}'" "info" # Convert BOARD to ARCH; source the BOARD and FAMILY stuff LOG_SECTION="config_source_board_file" do_with_conditional_logging config_source_board_file LOG_SECTION="source_family_config_and_arch" do_with_conditional_logging source_family_config_and_arch - display_alert "Done sourcing board file" "'${BOARD}' - arch: '${ARCH}'" "warn" + display_alert "Done sourcing board file" "'${BOARD}' - arch: '${ARCH}'" "info" fi declare -a vars_need_to_be_set=("RELEASE" "ARCH") diff --git a/lib/functions/host/host-utils.sh b/lib/functions/host/host-utils.sh index 60b0888eae..16590324dd 100644 --- a/lib/functions/host/host-utils.sh +++ b/lib/functions/host/host-utils.sh @@ -170,10 +170,10 @@ function local_apt_deb_cache_prepare() { declare sdcard_var_cache_apt_dir="${SDCARD}/var/cache/apt" if [[ -d "${sdcard_var_cache_apt_dir}" ]]; then if ! mountpoint -q "${sdcard_var_cache_apt_dir}"; then - declare -i sdcard_var_cache_apt_size_mb - sdcard_var_cache_apt_size_mb=$(du -sm "${sdcard_var_cache_apt_dir}" | cut -f1) - if [[ "${sdcard_var_cache_apt_size_mb}" -gt 0 ]]; then - display_alert "WARNING: SDCARD /var/cache/apt dir is not empty" "${when_used} :: ${sdcard_var_cache_apt_dir} (${sdcard_var_cache_apt_size_mb} MB)" "wrn" + declare -i sdcard_var_cache_apt_files_count + sdcard_var_cache_apt_files_count=$(find "${sdcard_var_cache_apt_dir}" -type f | wc -l) + if [[ "${sdcard_var_cache_apt_files_count}" -gt 0 ]]; then + display_alert "WARNING: SDCARD /var/cache/apt dir is not empty" "${when_used} :: ${sdcard_var_cache_apt_dir} (${sdcard_var_cache_apt_files_count} files)" "wrn" run_host_command_logged ls -lahtR "${sdcard_var_cache_apt_dir}" # list the contents so we can try and identify what is polluting it fi fi @@ -183,10 +183,10 @@ function local_apt_deb_cache_prepare() { declare sdcard_var_lib_apt_lists_dir="${SDCARD}/var/lib/apt/lists" if [[ -d "${sdcard_var_lib_apt_lists_dir}" ]]; then if ! mountpoint -q "${sdcard_var_lib_apt_lists_dir}"; then - declare -i sdcard_var_lib_apt_lists_size_mb - sdcard_var_lib_apt_lists_size_mb=$(du -sm "${sdcard_var_lib_apt_lists_dir}" | cut -f1) - if [[ "${sdcard_var_lib_apt_lists_size_mb}" -gt 0 ]]; then - display_alert "WARNING: SDCARD /var/lib/apt/lists dir is not empty" "${when_used} :: ${sdcard_var_lib_apt_lists_dir} (${sdcard_var_lib_apt_lists_size_mb} MB)" "wrn" + declare -i sdcard_var_lib_apt_lists_files_count + sdcard_var_lib_apt_lists_files_count=$(find "${sdcard_var_lib_apt_lists_dir}" -type f | wc -l) + if [[ "${sdcard_var_lib_apt_lists_files_count}" -gt 0 ]]; then + display_alert "WARNING: SDCARD /var/lib/apt/lists dir is not empty" "${when_used} :: ${sdcard_var_lib_apt_lists_dir} (${sdcard_var_lib_apt_lists_files_count} files)" "wrn" run_host_command_logged ls -lahtR "${sdcard_var_lib_apt_lists_dir}" # list the contents so we can try and identify what is polluting it fi fi