diff --git a/config/sources/families/include/crust_firmware.inc b/config/sources/families/include/crust_firmware.inc index 5740ce49602c..00da8a3bd544 100644 --- a/config/sources/families/include/crust_firmware.inc +++ b/config/sources/families/include/crust_firmware.inc @@ -9,15 +9,15 @@ declare -g CRUST_TARGET_MAP="scp;;build/scp/scp.bin" if [[ -n "${CRUSTCONFIG}" ]]; then - [[ -z $CRUSTSOURCE ]] && CRUSTSOURCE='https://github.com/crust-firmware/crust' - [[ -z $CRUSTDIR ]] && CRUSTDIR='crust-sunxi-mainline' - [[ -z $CRUSTBRANCH ]] && CRUSTBRANCH='tag:v0.6' - [[ -z $CRUST_USE_GCC ]] && CRUST_USE_GCC='> 9.1.0' - [[ -z $CRUST_COMPILER ]] && CRUST_COMPILER='or1k-elf-' + [[ -z $CRUSTSOURCE ]] && CRUSTSOURCE='https://github.com/crust-firmware/crust' + [[ -z $CRUSTDIR ]] && CRUSTDIR='crust-sunxi-mainline' + [[ -z $CRUSTBRANCH ]] && CRUSTBRANCH='tag:v0.6' + [[ -z $CRUST_USE_GCC ]] && CRUST_USE_GCC='> 9.1.0' + [[ -z $CRUST_COMPILER ]] && CRUST_COMPILER='or1k-elf-' - # Apply crust patches if crust is enabled - BOOTPATCHDIR="${BOOTPATCHDIR} u-boot-sunxi-crust" + # Apply crust patches if crust is enabled + BOOTPATCHDIR="${BOOTPATCHDIR} u-boot-sunxi-crust" - # Use a different BOOTDIR so that we don't leave scp.bin behind for non crust builds - BOOTDIR="u-boot-crust" -fi \ No newline at end of file + # Use a different BOOTDIR so that we don't leave scp.bin behind for non crust builds + BOOTDIR="u-boot-crust" +fi diff --git a/config/sources/families/meson-s4t7.conf b/config/sources/families/meson-s4t7.conf index 76bee691d375..ccc1bbc3f9b7 100644 --- a/config/sources/families/meson-s4t7.conf +++ b/config/sources/families/meson-s4t7.conf @@ -106,7 +106,7 @@ function pre_update_initramfs__change_initrd_compression() { function image_specific_armbian_env_ready__force_16x9_display() { if [[ ${BRANCH} == "legacy" ]]; then display_alert "Forcing 16x9 display" - run_host_command_logged echo "force_16x9_display=true" >>${SDCARD}/boot/armbianEnv.txt + run_host_command_logged echo "force_16x9_display=true" >> ${SDCARD}/boot/armbianEnv.txt fi } diff --git a/extensions/initramfs-usb-gadget-ums/initramfs-usb-gadget-ums.sh b/extensions/initramfs-usb-gadget-ums/initramfs-usb-gadget-ums.sh index dcc0da502140..9e2783872b8e 100644 --- a/extensions/initramfs-usb-gadget-ums/initramfs-usb-gadget-ums.sh +++ b/extensions/initramfs-usb-gadget-ums/initramfs-usb-gadget-ums.sh @@ -18,7 +18,6 @@ function extension_prepare_config__check_sanity_usb_gadget_ums() { fi } - # @TODO: maybe include this in the bsp-cli, so it can be updated later function pre_customize_image__inject_initramfs_usb_gadget_ums() { display_alert "Enabling" "usb-gadget-ums into initramfs" "info" @@ -28,4 +27,3 @@ function pre_customize_image__inject_initramfs_usb_gadget_ums() { run_host_command_logged chmod -v +x "${script_file_dst}" return 0 } - diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index 4ad0ac712233..e73a92eb2d85 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -53,10 +53,10 @@ function do_main_configuration() { [[ -z $VENDORBUGS ]] && VENDORBUGS="https://armbian.atlassian.net/" [[ -z $VENDORDOCS ]] && VENDORDOCS="https://docs.armbian.com/" [[ -z $VENDORLOGO ]] && VENDORLOGO="armbian-logo" - [[ -z $ROOTPWD ]] && ROOTPWD="1234" # Must be changed @first login - [[ -z $MAINTAINER ]] && MAINTAINER="John Doe" # deb signature - [[ -z $MAINTAINERMAIL ]] && MAINTAINERMAIL="john.doe@somewhere.on.planet" # deb signature - DEST_LANG="${DEST_LANG:-"en_US.UTF-8"}" # en_US.UTF-8 is default locale for target + [[ -z $ROOTPWD ]] && ROOTPWD="1234" # Must be changed @first login + [[ -z $MAINTAINER ]] && MAINTAINER="John Doe" # deb signature + [[ -z $MAINTAINERMAIL ]] && MAINTAINERMAIL="john.doe@somewhere.on.planet" # deb signature + DEST_LANG="${DEST_LANG:-"en_US.UTF-8"}" # en_US.UTF-8 is default locale for target display_alert "DEST_LANG..." "DEST_LANG: ${DEST_LANG}" "debug" declare -g SKIP_EXTERNAL_TOOLCHAINS="${SKIP_EXTERNAL_TOOLCHAINS:-yes}" # don't use any external toolchains, by default.