diff --git a/lib.sh b/lib.sh index 0750104..d76495e 100755 --- a/lib.sh +++ b/lib.sh @@ -323,8 +323,6 @@ rk33xx_flash_uboot() { --repository=https://repo-default.voidlinux.org/current/musl \ --repository=https://repo-default.voidlinux.org/current/aarch64}" - - # This library is the authoritative source of the platform map, # because of this we may need to get this information from the command # line. This select allows us to get that information out. This diff --git a/mklive.sh b/mklive.sh index 518b725..fc109ea 100755 --- a/mklive.sh +++ b/mklive.sh @@ -37,18 +37,14 @@ PLATFORMS=() readonly PROGNAME="$(basename "$0")" declare -a INCLUDE_DIRS=() -info_msg() { - printf "\033[1m$@\n\033[m" -} - die() { - info_msg "ERROR: $@" + info_msg "ERROR: $*" error_out 1 $LINENO } print_step() { CURRENT_STEP=$((CURRENT_STEP+1)) - info_msg "[${CURRENT_STEP}/${STEP_COUNT}] $@" + info_msg "[${CURRENT_STEP}/${STEP_COUNT}] $*" } mount_pseudofs() { @@ -532,6 +528,8 @@ HOST_ARCH=$(xbps-uhelper arch) : ${BOOT_TITLE:="Void Linux"} : ${LINUX_VERSION:=linux} +XBPS_TARGET_ARCH="$TARGET_ARCH" register_binfmt + case "$TARGET_ARCH" in x86_64*|i686*) BOOTLOADERS=(syslinux grub)