Skip to content

Commit

Permalink
bash: run shellfmt, no changes
Browse files Browse the repository at this point in the history
  • Loading branch information
rpardini authored and igorpecovnik committed Nov 25, 2023
1 parent 99d4abf commit 4e37b27
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 17 deletions.
20 changes: 10 additions & 10 deletions config/sources/families/include/crust_firmware.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
# Use a different BOOTDIR so that we don't leave scp.bin behind for non crust builds
BOOTDIR="u-boot-crust"
fi
2 changes: 1 addition & 1 deletion config/sources/families/meson-s4t7.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
}

8 changes: 4 additions & 4 deletions lib/functions/configuration/main-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]" # 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="[email protected]" # 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.
Expand Down

0 comments on commit 4e37b27

Please sign in to comment.