bootable: cleanup logging; use bat/tree helpers

Signed-off-by: Ricardo Pardini <[email protected]>

Author: rpardini

bash/bootable-media.sh

@@ -13,13 +13,13 @@ function build_bootable_media() {
 	get_bootable_info_dict "${bootable_id}"
 
 	# Dump the bootable_info dict
-	log info "bootable_info: $(declare -p bootable_info)"
+	log debug "bootable_info: $(declare -p bootable_info)"
 
 	# Get the kernel info from the bootable_info INVENTORY_ID
 	declare -g -A kernel_info=()
 	declare -g inventory_id="${bootable_info['INVENTORY_ID']}"
 	get_kernel_info_dict "${inventory_id}"
-	log info "kernel_info: $(declare -p kernel_info)"
+	log debug "kernel_info: $(declare -p kernel_info)"
 	set_kernel_vars_from_info_dict
 	kernel_obtain_output_id # sets OUTPUT_ID
 
@@ -82,11 +82,16 @@ function output_bootable_media() {
 		return 0
 	fi
 
+	declare human_size_input_file=""
+	human_size_input_file="$(du -h "${input_file}" | awk '{print $1}')"
+
 	# Use pixz to compress the image; use all CPU cores, default compression level
-	log info "Compressing image file ${input_file} to ${full_output_fn} -- wait..."
+	log info "Compressing image file ${input_file} (${human_size_input_file}) to ${full_output_fn} -- wait..."
 	pixz -i "${input_file}" -o "${full_output_fn}"
-	ls -lah "${full_output_fn}"
-	log info "Compressed image file ${input_file} to ${full_output_fn}"
+
+	declare human_size_output_file=""
+	human_size_output_file="$(du -h "${full_output_fn}" | awk '{print $1}')"
+	log info "Compressed image file to ${full_output_fn} (${human_size_output_file})"
 
 	return 0
 }

bash/bootable/armbian-u-boot.sh

@@ -122,8 +122,8 @@ function build_bootable_armbian_uboot() {
 	mkdir -p "${fat32_root_dir}"
 
 	# Kernel and initrd go directly in the root of the FAT32 partition
-	cp -vp "out/hook/vmlinuz-${hook_id}" "${fat32_root_dir}/vmlinuz"
-	cp -vp "out/hook/initramfs-${hook_id}" "${fat32_root_dir}/initramfs"
+	cp -p "${debug_dash_v[@]}" "out/hook/vmlinuz-${hook_id}" "${fat32_root_dir}/vmlinuz"
+	cp -p "${debug_dash_v[@]}" "out/hook/initramfs-${hook_id}" "${fat32_root_dir}/initramfs"
 
 	declare -i initramfs_size_bytes
 	initramfs_size_bytes=$(stat --format="%s" "${fat32_root_dir}/initramfs")
@@ -139,34 +139,25 @@ function build_bootable_armbian_uboot() {
 	# it also might require the metadata files from the uboot tarball, as those have details eg the exact DTB to use, console information, etc.
 	write_uboot_script_or_extlinux "${fat32_root_dir}"
 
-	# Show the state
-	du -h -d 1 "${bootable_base_dir}"
-
 	# Use a Dockerfile to assemble a GPT image, with a single FAT32 partition, containing the files in the fat32-root directory
 	# This is common across all GPT-based bootable media; the only difference is the ESP flag, which is set for UEFI bootable media but not for Rockchip/RaspberryPi
 	# The u-boot binaries are written _later_ in the process, after the image is created, using Armbian's helper scripts.
 	create_image_fat32_root_from_dir "${bootable_base_dir}" "bootable-media-${BOARD}-${BRANCH}.img" "${bootable_dir}/fat32-root"
 
-	log info "Show info about produced image..."
-	ls -lah "${bootable_base_dir}/bootable-media-${BOARD}-${BRANCH}.img"
-
 	# Deploy u-boot binaries to the image; use the function defined in the platform_install.sh script
 	# They should only use 'dd' or such; we've special handling for dd, to add 'conv=trunc'
 
 	# shellcheck disable=SC2317 # used by write_uboot_platform
 	function dd() {
 		# We're going to use dd to write the u-boot binaries to the image; log the command and then run it
-		log info "dd: ${1} + conv=notrunc"
+		log debug "dd: ${1} + conv=notrunc"
 		log debug "dd: ${*@Q}"
 		command dd "$@" "conv=notrunc"
 	}
 
 	log info "Writing u-boot binaries to the image..."
 	write_uboot_platform "${uboot_extract_dir}" "${bootable_base_dir}/bootable-media-${BOARD}-${BRANCH}.img"
 
-	log info "Show info about produced image (with written u-boot)..."
-	ls -lah "${bootable_base_dir}/bootable-media-${BOARD}-${BRANCH}.img"
-
 	log info "Done building Armbian u-boot for hook ${hook_id} with type ${uboot_type}"
 	output_bootable_media "${bootable_base_dir}/bootable-media-${BOARD}-${BRANCH}.img" "hook-bootable-${BOARD}-${BRANCH}.img"
 
@@ -221,7 +212,7 @@ function write_uboot_script() {
 		booti \${kernel_addr_r} \${ramdisk_addr_r} \${fdt_addr_r}
 	BOOT_CMD
 
-	command -v bat &> /dev/null && bat --file-name "boot.scr" "${boot_cmd_file}"
+	log_file_bat "${boot_cmd_file}" "info" "Produced Armbian u-boot boot.cmd/boot.scr"
 
 	return 0
 }
@@ -249,7 +240,7 @@ function write_uboot_extlinux() {
 	EXTLINUX_CONF
 	# @TODO: fdtdir when UBOOT_KERNEL_DTB is unset
 
-	command -v bat && bat --file-name "extlinux.conf" "${extlinux_conf}"
+	log_file_bat "${extlinux_conf}" "info" "Produced Armbian u-boot extlinux.conf"
 
 	return 0
 }

bash/bootable/grub.sh

@@ -49,8 +49,8 @@ function build_bootable_grub() {
 	mkdir -p "${fat32_root_dir}"
 
 	# Kernel and initrd go directly in the root of the FAT32 partition
-	cp -vp "out/hook/${hook_files['kernel']}" "${fat32_root_dir}/vmlinuz"
-	cp -vp "out/hook/${hook_files['initrd']}" "${fat32_root_dir}/initrd.img"
+	cp -p "${debug_dash_v[@]}" "out/hook/${hook_files['kernel']}" "${fat32_root_dir}/vmlinuz"
+	cp -p "${debug_dash_v[@]}" "out/hook/${hook_files['initrd']}" "${fat32_root_dir}/initrd.img"
 
 	# Handle DTBs
 	if [[ "${has_dtbs}" == "yes" ]]; then
@@ -78,19 +78,16 @@ function build_bootable_grub() {
 		  initrd /initrd.img
 		}
 	GRUB_CFG
+	bat_language="Plain text" log_file_bat "${fat32_efi_dir}/grub.cfg" "info" "Produced GRUB grub.cfg"
 
 	# Show the state
-	du -h -d 1 "${bootable_base_dir}"
 	log_tree "${bootable_base_dir}" "debug" "State of the bootable directory"
 
 	# Use a Dockerfile to assemble a GPT image, with a single FAT32 partition, containing the files in the fat32-root directory
 	# This is common across all GPT-based bootable media; the only difference is the ESP flag, which is set for UEFI bootable media.
 	esp_partitition="yes" \
 		create_image_fat32_root_from_dir "${bootable_base_dir}" "${bootable_img}" "${bootable_dir}/fat32-root"
 
-	log info "Show info about produced image..."
-	ls -lah "${bootable_base_dir}/${bootable_img}"
-
 	log info "Done building grub bootable for hook ${hook_id}"
 	output_bootable_media "${bootable_base_dir}/${bootable_img}" "hook-bootable-grub-${OUTPUT_ID}.img"
 

bash/bootable/rpi.sh

@@ -35,17 +35,17 @@ function build_bootable_rpi_firmware() {
 	mkdir -p "${fat32_root_dir}"
 
 	# Kernel and initrd go directly in the root of the FAT32 partition
-	cp -vp "out/hook/vmlinuz-${hook_id}" "${fat32_root_dir}/vmlinuz"
-	cp -vp "out/hook/initramfs-${hook_id}" "${fat32_root_dir}/initrd.img"
+	cp -p "${debug_dash_v[@]}" "out/hook/vmlinuz-${hook_id}" "${fat32_root_dir}/vmlinuz"
+	cp -p "${debug_dash_v[@]}" "out/hook/initramfs-${hook_id}" "${fat32_root_dir}/initrd.img"
 
 	# Handle DTBs for rpi
 	mkdir -p "${fat32_root_dir}/dtb"
 	tar -C "${fat32_root_dir}/dtb" --strip-components=1 -xzf "out/hook/dtbs-${hook_id}.tar.gz"
 	log_tree "${fat32_root_dir}" "debug" "State of the FAT32 directory pre-moving DTBs"
 
 	# RPi: put DTBs directly in the fat32-root directory; overlays go into a subdirectory
-	mv -v "${fat32_root_dir}/dtb/overlays" "${fat32_root_dir}/overlays"
-	mv -v "${fat32_root_dir}/dtb/broadcom"/*.dtb "${fat32_root_dir}/"
+	mv "${debug_dash_v[@]}" "${fat32_root_dir}/dtb/overlays" "${fat32_root_dir}/overlays"
+	mv "${debug_dash_v[@]}" "${fat32_root_dir}/dtb/broadcom"/*.dtb "${fat32_root_dir}/"
 	rm -rf "${fat32_root_dir}/dtb"
 	log_tree "${fat32_root_dir}" "debug" "State of the FAT32 directory post-moving DTBs"
 
@@ -54,18 +54,11 @@ function build_bootable_rpi_firmware() {
 	rpi_write_config_txt "${fat32_root_dir}"
 	rpi_write_cmdline_txt "${fat32_root_dir}"
 
-	# Show the state
-	du -h -d 1 "${bootable_base_dir}"
-	tree "${bootable_base_dir}"
-
 	# Use a Dockerfile to assemble a GPT image, with a single FAT32 partition, containing the files in the fat32-root directory
 	# This is common across all GPT-based bootable media; the only difference is the ESP flag, which is set for UEFI bootable media but not for Rockchip/RaspberryPi
 	# The u-boot binaries are written _later_ in the process, after the image is created, using Armbian's helper scripts.
 	create_image_fat32_root_from_dir "${bootable_base_dir}" "bootable-media-rpi.img" "${bootable_dir}/fat32-root"
 
-	log info "Show info about produced image..."
-	ls -lah "${bootable_base_dir}/bootable-media-rpi.img"
-
 	log info "Done building rpi bootable for hook ${hook_id}"
 	output_bootable_media "${bootable_base_dir}/bootable-media-rpi.img" "hook-bootable-rpi.img"
 
@@ -129,6 +122,8 @@ function rpi_write_config_txt() {
 		initramfs initrd.img followkernel
 		arm_64bit=1
 	RPI_CONFIG_TXT
+
+	bat_language="ini" log_file_bat "${fat32_root_dir}/config.txt" "info" "Produced rpi config.txt"
 }
 
 function rpi_write_cmdline_txt() {
@@ -140,4 +135,6 @@ function rpi_write_cmdline_txt() {
 	cat <<- RPI_CMDLINE_TXT > "${fat32_root_dir}/cmdline.txt"
 		console=tty1 console=ttyAMA0,115200 loglevel=7 cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory ${tinkerbell_args}
 	RPI_CMDLINE_TXT
+
+	log_file_bat "${fat32_root_dir}/cmdline.txt" "info" "Produced rpi cmdline.txt"
 }