mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
armbian-next: rootfs: new CLI command for rootfs cache building; further refactorings
- _told ya it would all make sense eventually..._ - introduce new, real, non-alias `rootfs` command in `cli-rootfs` -- this _only_ builds rootfs, nothing else - no more `main_default_build_single()`; instead `full_build_packages_rootfs_and_image()` - introduce `do_with_default_build()` wrapper, for things that need host prepared + aggregation to run - CLI-specific parts of `main_default_build_single()` moved to cli-build - put prepare/cleanup pair of `prepare_rootfs_build_params_and_trap()` and `trap_handler_cleanup_rootfs_and_image()` into new `trap-rootfs.sh` (this needs further splitting for the image part) - refactor `get_or_create_rootfs_cache_chroot_sdcard()` into `build_rootfs_only()`, `calculate_rootfs_cache_id()` - update library with new files
This commit is contained in:
Ricardo Pardini
@@ -2,52 +2,16 @@
|
||||
|
||||
function build_rootfs_and_image() {
|
||||
display_alert "Checking for rootfs cache" "$(echo "${BRANCH} ${BOARD} ${RELEASE} ${DESKTOP_APPGROUPS_SELECTED} ${DESKTOP_ENVIRONMENT} ${BUILD_MINIMAL}" | tr -s " ")" "info"
|
||||
|
||||
[[ $ROOTFS_TYPE != ext4 ]] && display_alert "Assuming ${BOARD} ${BRANCH} kernel supports ${ROOTFS_TYPE}" "" "wrn"
|
||||
|
||||
# add handler to cleanup when done or if something fails or is interrupted.
|
||||
add_cleanup_handler trap_handler_cleanup_rootfs_and_image
|
||||
declare -i tmpfs_estimated_size # in MiB; set by prepare_rootfs_build_params_and_trap()
|
||||
prepare_rootfs_build_params_and_trap
|
||||
|
||||
# stage: clean and create directories
|
||||
rm -rf "${SDCARD}" "${MOUNT}"
|
||||
mkdir -p "${SDCARD}" "${MOUNT}" "${DEST}/images" "${SRC}/cache/rootfs"
|
||||
# get a basic rootfs, either from cache or from scratch
|
||||
build_rootfs_only
|
||||
|
||||
# bind mount rootfs if defined
|
||||
if [[ -d "${ARMBIAN_CACHE_ROOTFS_PATH}" ]]; then
|
||||
mountpoint -q "${SRC}"/cache/rootfs && umount "${SRC}"/cache/toolchain
|
||||
mount --bind "${ARMBIAN_CACHE_ROOTFS_PATH}" "${SRC}/cache/rootfs"
|
||||
fi
|
||||
|
||||
# stage: verify tmpfs configuration and mount
|
||||
# CLI needs ~2GiB, desktop ~5GiB
|
||||
# vs 60% of "available" RAM (free + buffers + magic)
|
||||
declare -i available_physical_memory_mib
|
||||
available_physical_memory_mib=$(($(awk '/MemAvailable/ {print $2}' /proc/meminfo) * 6 / 1024 / 10)) # MiB
|
||||
|
||||
# @TODO: well those are very... arbitrary numbers. At least when using cached rootfs, we can be more precise.
|
||||
# predicting the size of tmpfs is hard/impossible, so would be nice to show the used size at the end so we can tune.
|
||||
declare -i tmpfs_estimated_size=2000 # MiB
|
||||
[[ $BUILD_DESKTOP == yes ]] && tmpfs_estimated_size=5000 # MiB
|
||||
|
||||
declare use_tmpfs=no # by default
|
||||
if [[ ${FORCE_USE_RAMDISK} == no ]]; then # do not use, even if it fits
|
||||
display_alert "Not using tmpfs for rootfs" "due to FORCE_USE_RAMDISK=no" "info"
|
||||
elif [[ ${FORCE_USE_RAMDISK} == yes || ${available_physical_memory_mib} -gt ${tmpfs_estimated_size} ]]; then # use, either force or fits
|
||||
use_tmpfs=yes
|
||||
display_alert "Using tmpfs for rootfs build" "RAM available: ${available_physical_memory_mib}MiB > ${tmpfs_estimated_size}MiB estimated" "info"
|
||||
else
|
||||
display_alert "Not using tmpfs for rootfs" "RAM available: ${available_physical_memory_mib}MiB < ${tmpfs_estimated_size}MiB estimated" "info"
|
||||
fi
|
||||
|
||||
if [[ $use_tmpfs == yes ]]; then
|
||||
declare -g -r ROOTFS_IS_UNDER_TMPFS=yes
|
||||
mount -t tmpfs tmpfs "${SDCARD}" # do not specify size; we've calculated above that it should fit, and Linux will try its best if it doesn't.
|
||||
fi
|
||||
|
||||
# stage: prepare basic rootfs: unpack cache or create from scratch
|
||||
LOG_SECTION="get_or_create_rootfs_cache_chroot_sdcard" do_with_logging get_or_create_rootfs_cache_chroot_sdcard
|
||||
|
||||
mount_chroot "${SDCARD}" # this used to be inside get_or_create_rootfs_cache_chroot_sdcard().
|
||||
# stage: with a basic rootfs available, we mount the chroot and work on it
|
||||
mount_chroot "${SDCARD}"
|
||||
|
||||
call_extension_method "pre_install_distribution_specific" "config_pre_install_distribution_specific" <<- 'PRE_INSTALL_DISTRIBUTION_SPECIFIC'
|
||||
*give config a chance to act before install_distribution_specific*
|
||||
@@ -90,7 +54,7 @@ function build_rootfs_and_image() {
|
||||
|
||||
# warn if rootfs_size_mib is higher than the tmpfs_estimated_size
|
||||
if [[ ${rootfs_size_mib} -gt ${tmpfs_estimated_size} ]]; then
|
||||
display_alert "Rootfs actual size is larger than estimated tmpfs size" "${rootfs_size_mib}MiB > ${tmpfs_estimated_size}MiB" "wrn"
|
||||
display_alert "Rootfs post-tweaks size is larger than estimated tmpfs size" "${rootfs_size_mib}MiB > ${tmpfs_estimated_size}MiB" "wrn"
|
||||
fi
|
||||
|
||||
# ------------------------------------ UP HERE IT's 'rootfs' stuff -------------------------------
|
||||
@@ -106,13 +70,13 @@ function build_rootfs_and_image() {
|
||||
LOG_SECTION="create_image_from_sdcard_rootfs" do_with_logging create_image_from_sdcard_rootfs
|
||||
fi
|
||||
|
||||
# Completely and recursively unmount the directory. This will remove the tmpfs mount too
|
||||
# Completely and recursively unmount the directory. --> This will remove the tmpfs mount too <--
|
||||
umount_chroot_recursive "${SDCARD}" "SDCARD rootfs finished"
|
||||
|
||||
# Remove the dir
|
||||
[[ -d "${SDCARD}" ]] && rm -rf --one-file-system "${SDCARD}"
|
||||
|
||||
# Run the cleanup handler. @TODO: this already does the above, so can be simpler.
|
||||
# Run the cleanup handler. @TODO: this already does the above, so can be simpler. @TODO: don't forget to split MOUNT/SDCARD trap
|
||||
execute_and_remove_cleanup_handler trap_handler_cleanup_rootfs_and_image
|
||||
|
||||
return 0
|
||||
@@ -123,38 +87,3 @@ function list_installed_packages() {
|
||||
LOG_ASSET="installed_packages.txt" do_with_log_asset chroot_sdcard dpkg --get-selections "| grep -v deinstall | awk '{print \$1}' | cut -f1 -d':'"
|
||||
}
|
||||
|
||||
function trap_handler_cleanup_rootfs_and_image() {
|
||||
display_alert "Cleanup for rootfs and image" "trap_handler_cleanup_rootfs_and_image" "cleanup"
|
||||
|
||||
debug_tmpfs_show_usage "before cleanup of rootfs"
|
||||
|
||||
cd "${SRC}" || echo "Failed to cwd to ${SRC}" # Move pwd away, so unmounts work
|
||||
# those will loop until they're unmounted.
|
||||
umount_chroot_recursive "${SDCARD}" "SDCARD" || true
|
||||
umount_chroot_recursive "${MOUNT}" "MOUNT" || true
|
||||
|
||||
# unmount tmpfs mounted on SDCARD if it exists. #@TODO: move to new tmpfs-utils scheme
|
||||
mountpoint -q "${SDCARD}" && umount "${SDCARD}"
|
||||
|
||||
# @TODO: rpardini: igor: why lazy umounts?
|
||||
mountpoint -q "${SRC}"/cache/toolchain && umount -l "${SRC}"/cache/toolchain >&2
|
||||
mountpoint -q "${SRC}"/cache/rootfs && umount -l "${SRC}"/cache/rootfs >&2
|
||||
[[ $CRYPTROOT_ENABLE == yes ]] && cryptsetup luksClose "${ROOT_MAPPER}" >&2
|
||||
|
||||
if [[ "${PRESERVE_SDCARD_MOUNT}" == "yes" ]]; then
|
||||
display_alert "Preserving SD card mount" "trap_handler_cleanup_rootfs_and_image" "warn"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# shellcheck disable=SC2153 # global var.
|
||||
if [[ -b "${LOOP}" ]]; then
|
||||
display_alert "Freeing loop" "trap_handler_cleanup_rootfs_and_image ${LOOP}" "wrn"
|
||||
free_loop_device_insistent "${LOOP}" || true
|
||||
fi
|
||||
|
||||
[[ -d "${SDCARD}" ]] && rm -rf --one-file-system "${SDCARD}"
|
||||
[[ -d "${MOUNT}" ]] && rm -rf --one-file-system "${MOUNT}"
|
||||
[[ -f "${SDCARD}".raw ]] && rm -f "${SDCARD}".raw
|
||||
|
||||
return 0 # short-circuit above, so exit clean here
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user