Run shellfmt to complete code

This commit is contained in:
Igor Pecovnik
2024-06-22 17:54:22 +02:00
committed by Igor
parent 1341c19ef4
commit 75ce67f329
32 changed files with 87 additions and 103 deletions

View File

@@ -30,8 +30,7 @@ case $BOARD in
esac esac
# bootloader releated # bootloader releated
pre_config_uboot_target() pre_config_uboot_target() {
{
# get the firmware # get the firmware
rm -rf ${IMX_FIRMWARE}* rm -rf ${IMX_FIRMWARE}*
wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/${IMX_FIRMWARE}.bin -O ${IMX_FIRMWARE}.bin wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/${IMX_FIRMWARE}.bin -O ${IMX_FIRMWARE}.bin
@@ -46,8 +45,7 @@ pre_config_uboot_target()
export ATF_LOAD_ADDR=${ATF_ADDR} export ATF_LOAD_ADDR=${ATF_ADDR}
} }
write_uboot_platform() write_uboot_platform() {
{
echo ${OFFSET} echo ${OFFSET}
dd if=$1/flash.bin of=$2 bs=1K seek=${OFFSET} status=noxfer conv=fsync > /dev/null 2>&1 dd if=$1/flash.bin of=$2 bs=1K seek=${OFFSET} status=noxfer conv=fsync > /dev/null 2>&1
} }

View File

@@ -35,7 +35,6 @@ elif [[ "$BOARD" == "jethubj200" ]]; then
BOOTPATCHDIR="v2024.01" BOOTPATCHDIR="v2024.01"
fi fi
######## ########
# @TODO: Put this in the board configs of the respective boards # @TODO: Put this in the board configs of the respective boards
######## ########
@@ -49,19 +48,16 @@ if [[ "$BOARD" == "jethubj80" ]] || [[ "$BOARD" == "jethubj100" ]] ; then
} }
fi fi
# JetHub builds userspace tooling with c++ (gpp) toolchain in buildjethomecmds() below. # JetHub builds userspace tooling with c++ (gpp) toolchain in buildjethomecmds() below.
# The C++ compiler is no longer included by default in the Armbian build system. # The C++ compiler is no longer included by default in the Armbian build system.
# Enable the extension that brings includes it. It could've been an inline extension (eg: the function right here), # Enable the extension that brings includes it. It could've been an inline extension (eg: the function right here),
# but having a core extension allows it to be pre-included in the Dockerfile generation and thus in the Docker images. # but having a core extension allows it to be pre-included in the Dockerfile generation and thus in the Docker images.
enable_extension "c-plus-plus-compiler" enable_extension "c-plus-plus-compiler"
function fetch_sources_tools__jethub_amlogic_fip() { function fetch_sources_tools__jethub_amlogic_fip() {
fetch_from_repo "https://github.com/adeepn/amlogic-boot-fip" "amlogic-boot-fip-jethub" "branch:add_jethub_j200" fetch_from_repo "https://github.com/adeepn/amlogic-boot-fip" "amlogic-boot-fip-jethub" "branch:add_jethub_j200"
} }
uboot_custom_postprocess() { uboot_custom_postprocess() {
if [[ "$BOARD" == "jethubj80" ]]; then if [[ "$BOARD" == "jethubj80" ]]; then
uboot_gxl_postprocess_ng "$SRC/cache/sources/amlogic-boot-fip/jethub-j80" uboot_gxl_postprocess_ng "$SRC/cache/sources/amlogic-boot-fip/jethub-j80"

View File

@@ -33,7 +33,6 @@ GOVERNOR="ondemand"
function pre_install_kernel_debs__network_manager_ignore_devices() { function pre_install_kernel_debs__network_manager_ignore_devices() {
display_alert "Board: ${BOARD}: Disabling Network-Manager for all devices" "interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*" "info" display_alert "Board: ${BOARD}: Disabling Network-Manager for all devices" "interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*" "info"
mkdir -p "${SDCARD}"/etc/NetworkManager/conf.d/ mkdir -p "${SDCARD}"/etc/NetworkManager/conf.d/
cat <<- EOF > "${SDCARD}"/etc/NetworkManager/conf.d/99-ignore-interfaces.conf cat <<- EOF > "${SDCARD}"/etc/NetworkManager/conf.d/99-ignore-interfaces.conf
[keyfile] [keyfile]

View File

@@ -75,7 +75,6 @@ GOVERNOR=ondemand
function pre_install_kernel_debs__network_manager_ignore_devices() { function pre_install_kernel_debs__network_manager_ignore_devices() {
display_alert "Board: ${BOARD}: Disabling Network-Manager for all devices" "interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*" "info" display_alert "Board: ${BOARD}: Disabling Network-Manager for all devices" "interface-name:eth*,interface-name:wan*,interface-name:lan*,interface-name:br*" "info"
mkdir -p "${SDCARD}"/etc/NetworkManager/conf.d/ mkdir -p "${SDCARD}"/etc/NetworkManager/conf.d/
cat <<- EOF > "${SDCARD}"/etc/NetworkManager/conf.d/99-ignore-interfaces.conf cat <<- EOF > "${SDCARD}"/etc/NetworkManager/conf.d/99-ignore-interfaces.conf
[keyfile] [keyfile]

View File

@@ -15,4 +15,3 @@ fi
[[ -z $CPUMIN ]] && CPUMIN=480000 [[ -z $CPUMIN ]] && CPUMIN=480000
[[ -z $CPUMAX ]] && CPUMAX=1400000 [[ -z $CPUMAX ]] && CPUMAX=1400000

View File

@@ -53,7 +53,6 @@ function pre_customize_image__inject_cloud_init_config() {
return 0 return 0
} }
# @TODO: would be better to have "armbian first run" as an extension that can be disabled # @TODO: would be better to have "armbian first run" as an extension that can be disabled
function pre_customize_image__disable_armbian_first_run() { function pre_customize_image__disable_armbian_first_run() {
display_alert "Disabling" "armbian first run" "info" display_alert "Disabling" "armbian first run" "info"

View File

@@ -13,7 +13,6 @@
# Additional log infomration will be created on lvm.log # Additional log infomration will be created on lvm.log
# We will need to create several LVM objects: PV VG VOL on the image from the host # We will need to create several LVM objects: PV VG VOL on the image from the host
function add_host_dependencies__lvm_host_deps() { function add_host_dependencies__lvm_host_deps() {
declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} lvm2" declare -g EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} lvm2"

View File

@@ -6,8 +6,7 @@ function add_host_dependencies__install_systemd_networkd() {
add_packages_to_image netplan.io add_packages_to_image netplan.io
} }
function pre_install_kernel_debs__configure_systemd_networkd() function pre_install_kernel_debs__configure_systemd_networkd() {
{
display_alert "Extension: ${EXTENSION}: Enabling systemd-networkd" "" "info" display_alert "Extension: ${EXTENSION}: Enabling systemd-networkd" "" "info"
# Enable networkd and resolved # Enable networkd and resolved

View File

@@ -6,8 +6,7 @@ function add_host_dependencies__install_systemd-timesyncd() {
add_packages_to_image systemd-timesyncd add_packages_to_image systemd-timesyncd
} }
function pre_install_kernel_debs__configure_systemd-timesyncd() function pre_install_kernel_debs__configure_systemd-timesyncd() {
{
# Enable timesyncd # Enable timesyncd
display_alert "Extension: ${EXTENSION}: Enabling systemd-timesyncd" "" "info" display_alert "Extension: ${EXTENSION}: Enabling systemd-timesyncd" "" "info"
chroot_sdcard systemctl enable systemd-timesyncd.service chroot_sdcard systemctl enable systemd-timesyncd.service

View File

@@ -31,4 +31,3 @@ function post_family_tweaks_bsp__install_lima_serverflags() {
return 0 return 0
} }

View File

@@ -643,7 +643,6 @@ driver_mt7921u_add_pids() {
fi fi
} }
### ###
### ###
### NOTICE: <=5.x BELOW ONLY ### NOTICE: <=5.x BELOW ONLY
@@ -654,7 +653,6 @@ driver_mt7921u_add_pids() {
### ###
### v v v v v v v v v v v v v v v v v v v v v v v ### v v v v v v v v v v v v v v v v v v v v v v v
#_bt for blueteeth #_bt for blueteeth
driver_rtl8822cs_bt() { driver_rtl8822cs_bt() {