JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

config/lib/exts: run shellfmt

Browse Source 
- `bash lib/tools/shellfmt.sh`
- mostly spacing changes that accumulated over time
This commit is contained in:
Ricardo Pardini
2023-08-22 13:32:09 +02:00
parent 1d6a779ed1
commit 11df81403d
17 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/sources/families/k3.conf
View File

@@ -46,8 +46,8 @@ function add_host_dependencies__k3_python3_dep() {
function compile_k3_bootgen() {
# Source code checkout
( fetch_from_repo "https://git.ti.com/cgit/processor-firmware/ti-linux-firmware" "ti-linux-firmware" "branch:ti-linux-firmware" )
( fetch_from_repo "https://git.ti.com/cgit/ti-u-boot/ti-u-boot" "ti-u-boot" "branch:ti-u-boot-2023.04" )
(fetch_from_repo "https://git.ti.com/cgit/processor-firmware/ti-linux-firmware" "ti-linux-firmware" "branch:ti-linux-firmware")
(fetch_from_repo "https://git.ti.com/cgit/ti-u-boot/ti-u-boot" "ti-u-boot" "branch:ti-u-boot-2023.04")
pushd ${SRC}/cache/sources/ti-u-boot || exit

8
config/sources/families/meson-s4t7.conf
View File

@@ -80,7 +80,7 @@ function post_uboot_custom_postprocess__build_fip() {
return 0
}
function pre_package_kernel_image__copy_meson_s4t7_overlays(){
function pre_package_kernel_image__copy_meson_s4t7_overlays() {
display_alert "Copy meson s4t7 overlays"
declare dtbo_destination="${tmp_kernel_install_dirs[INSTALL_DTBS_PATH]}"/amlogic
@@ -90,12 +90,12 @@ function pre_package_kernel_image__copy_meson_s4t7_overlays(){
run_host_command_logged ln -sf amlogic/overlay "${tmp_kernel_install_dirs[INSTALL_DTBS_PATH]}"/overlay
}
function post_family_tweaks_bsp__disable_uinitrd_generation(){
if [[ -f "${destination}"/etc/initramfs/post-update.d/99-uboot ]] ; then
function post_family_tweaks_bsp__disable_uinitrd_generation() {
if [[ -f "${destination}"/etc/initramfs/post-update.d/99-uboot ]]; then
run_host_command_logged rm "${destination}"/etc/initramfs/post-update.d/99-uboot
fi
}
function pre_update_initramfs__change_initrd_compression(){
function pre_update_initramfs__change_initrd_compression() {
run_host_command_logged sed -i 's/COMPRESS=.*/COMPRESS=xz/g' $MOUNT/etc/initramfs-tools/initramfs.conf
}

2
config/sources/families/rk35xx.conf
View File

@@ -27,7 +27,7 @@ case $BRANCH in
;;
current|edge)
current | edge)
SKIP_BOOTSPLASH="yes"
;;

2
extensions/fs-cryptroot-support.sh
View File

@@ -22,7 +22,7 @@ function pre_install_kernel_debs__adjust_dropbear_configuration() {
declare dropbear_dir="${SDCARD}/etc/dropbear-initramfs"
declare dropbear_config="config"
if [[ -d "${SDCARD}/etc/dropbear/initramfs" ]] ; then
if [[ -d "${SDCARD}/etc/dropbear/initramfs" ]]; then
dropbear_dir="${SDCARD}/etc/dropbear/initramfs"
dropbear_config="dropbear.conf"
fi

1
extensions/fs-nilfs2-support.sh
View File

@@ -15,4 +15,3 @@ function pre_update_initramfs__add_module_into_initramfs_config() {
echo "nilfs2" >> "$MOUNT"/etc/initramfs-tools/modules
return 0
}

2
lib/functions/cli/entrypoint.sh
View File

@@ -94,7 +94,7 @@ function cli_entrypoint() {
if [[ "${ARMBIAN_BUILD_UUID}" != "" ]]; then
display_alert "Using passed-in ARMBIAN_BUILD_UUID" "${ARMBIAN_BUILD_UUID}" "debug"
else
if command -v uuidgen 1>/dev/null; then
if command -v uuidgen 1> /dev/null; then
ARMBIAN_BUILD_UUID="$(uuidgen)"
else
display_alert "uuidgen not found" "uuidgen not installed yet" "info"

1
lib/functions/compilation/kernel.sh
View File

@@ -168,4 +168,3 @@ function kernel_package() {
prepare_kernel_packaging_debs "${kernel_work_dir}" "${kernel_dest_install_dir}" "${version}" kernel_install_dirs
display_alert "Kernel packaged in" "$((SECONDS - ts)) seconds - ${version}-${LINUXFAMILY}" "info"
}

32
lib/functions/compilation/patch/drivers_network.sh
View File

@@ -11,7 +11,7 @@ function driver_generic_bring_back_ipx() {
#
# Returning headers needed for some wireless drivers
#
if linux-version compare "${version}" ge 5.4 ; then
if linux-version compare "${version}" ge 5.4; then
display_alert "Reverting upstream-removed" "IPX stuff needed for Wireless Drivers" "info"
process_patch_file "${SRC}/patch/misc/wireless-bring-back-headers.patch" "applying"
fi
@@ -27,7 +27,7 @@ driver_mt7921u_add_pids() {
driver_rtl8152_rtl8153() {
# Updated USB network drivers for RTL8152/RTL8153 based dongles that also support 2.5Gbs variants
if linux-version compare "${version}" ge 5.4 && linux-version compare "${version}" le 5.12 && [ "$LINUXFAMILY" != mvebu64 ] && [ "$LINUXFAMILY" != rk322x ] && [ "$LINUXFAMILY" != odroidxu4 ] ; then
if linux-version compare "${version}" ge 5.4 && linux-version compare "${version}" le 5.12 && [ "$LINUXFAMILY" != mvebu64 ] && [ "$LINUXFAMILY" != rk322x ] && [ "$LINUXFAMILY" != odroidxu4 ]; then
# attach to specifics tag or branch
local rtl8152ver="branch:master"
@@ -43,7 +43,7 @@ driver_rtl8152_rtl8153() {
driver_rtl8189ES() {
# Wireless drivers for Realtek 8189ES chipsets
if linux-version compare "${version}" ge 3.14 ; then
if linux-version compare "${version}" ge 3.14; then
# attach to specifics tag or branch
local rtl8189esver="branch:master"
@@ -90,7 +90,7 @@ driver_rtl8189FS() {
# Wireless drivers for Realtek 8189FS chipsets
if linux-version compare "${version}" ge 3.14 ; then
if linux-version compare "${version}" ge 3.14; then
# attach to specifics tag or branch
local rtl8189fsver="branch:rtl8189fs"
@@ -138,7 +138,7 @@ driver_rtl8192EU() {
# Wireless drivers for Realtek 8192EU chipsets
if linux-version compare "${version}" ge 3.14 ; then
if linux-version compare "${version}" ge 3.14; then
# attach to specifics tag or branch
local rtl8192euver="branch:realtek-4.4.x"
@@ -180,7 +180,7 @@ driver_rtl8811_rtl8812_rtl8814_rtl8821() {
# Wireless drivers for Realtek 8811, 8812, 8814 and 8821 chipsets
if linux-version compare "${version}" ge 3.14 ; then
if linux-version compare "${version}" ge 3.14; then
# attach to specifics tag or branch
local rtl8812auver="commit:450db78f7bd23f0c611553eb475fa5b5731d6497"
@@ -230,7 +230,7 @@ driver_xradio_xr819() {
# Wireless drivers for Xradio XR819 chipsets
if linux-version compare "${version}" ge 4.19 && linux-version compare "${version}" le 5.19 &&
[[ "$LINUXFAMILY" == sunxi* ]] ; then
[[ "$LINUXFAMILY" == sunxi* ]]; then
display_alert "Adding" "Wireless drivers for Xradio XR819 chipsets" "info"
@@ -271,7 +271,7 @@ driver_xradio_xr819() {
driver_rtl8811CU_rtl8821C() {
# Wireless drivers for Realtek RTL8811CU and RTL8821C chipsets
if linux-version compare "${version}" ge 3.14 ; then
if linux-version compare "${version}" ge 3.14; then
# attach to specifics tag or branch
local rtl8811cuver="commit:69c903b75bde36293c66b25c051916a74dbadf58"
@@ -324,7 +324,7 @@ driver_rtl8188EU_rtl8188ETV() {
# Wireless drivers for Realtek 8188EU 8188EUS and 8188ETV chipsets
if linux-version compare "${version}" ge 3.14 &&
linux-version compare "${version}" lt 5.15 ; then
linux-version compare "${version}" lt 5.15; then
# attach to specifics tag or branch
local rtl8188euver="branch:v5.7.6.1"
@@ -371,7 +371,7 @@ driver_rtl88x2bu() {
# Wireless drivers for Realtek 88x2bu chipsets
if linux-version compare "${version}" ge 5.0 ; then
if linux-version compare "${version}" ge 5.0; then
# attach to specifics tag or branch
local rtl88x2buver="commit:2590672d717e2516dd2e96ed66f1037a6815bced"
@@ -422,7 +422,7 @@ driver_rtw88() {
# Quite a few kernel families have KERNEL_DRIVERS_SKIP listing this driver. If so, this won't even be called.
# Upstream wireless RTW88 drivers (wireless-next-2023-06-22)
if [[ "$version" == "6.1" || "$version" == "6.2" || "$version" == "6.3" || "$version" == "6.4" ]] ; then
if [[ "$version" == "6.1" || "$version" == "6.2" || "$version" == "6.3" || "$version" == "6.4" ]]; then
display_alert "Adding" "Upstream wireless RTW88 drivers" "info"
process_patch_file "${SRC}/patch/misc/rtw88/${version}/001-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch" "applying"
process_patch_file "${SRC}/patch/misc/rtw88/${version}/002-drivers-net-wireless-realtek-rtw88-upstream-wireless.patch" "applying"
@@ -436,7 +436,7 @@ driver_rtl88x2cs() {
# Wireless drivers for Realtek 88x2cs chipsets
if linux-version compare "${version}" ge 5.9 && linux-version compare "${version}" lt 6.1 ; then
if linux-version compare "${version}" ge 5.9 && linux-version compare "${version}" lt 6.1; then
# attach to specifics tag or branch
local rtl88x2csver="branch:tune_for_jethub"
@@ -480,7 +480,7 @@ driver_rtl88x2cs() {
driver_rtl8822cs_bt() {
# Bluetooth support for Realtek 8822CS (hci_ver 0x8) chipsets
# both of these patches were upstreamed in 5.18
if linux-version compare "${version}" ge 5.11 && linux-version compare "${version}" lt 5.18 ; then
if linux-version compare "${version}" ge 5.11 && linux-version compare "${version}" lt 5.18; then
display_alert "Adding" "Bluetooth support for Realtek 8822CS (hci_ver 0x8) chipsets" "info"
@@ -493,7 +493,7 @@ driver_rtl8822cs_bt() {
driver_rtl8723DS() {
# Wireless drivers for Realtek 8723DS chipsets
if linux-version compare "${version}" ge 5.0 ; then
if linux-version compare "${version}" ge 5.0; then
# attach to specifics tag or branch
local rtl8723dsver="branch:master"
@@ -536,7 +536,7 @@ driver_rtl8723DU() {
# Wireless drivers for Realtek 8723DU chipsets
if linux-version compare "${version}" ge 5.0 ; then
if linux-version compare "${version}" ge 5.0; then
local rtl8723duver="branch:master"
@@ -578,7 +578,7 @@ driver_rtl8723DU() {
driver_rtl8822BS() {
# Wireless drivers for Realtek 8822BS chipsets
if linux-version compare "${version}" ge 4.4 && linux-version compare "${version}" le 5.16 ; then
if linux-version compare "${version}" ge 4.4 && linux-version compare "${version}" le 5.16; then
# attach to specifics tag or branch
display_alert "Adding" "Wireless drivers for Realtek 8822BS chipsets ${rtl8822bsver}" "info"

8
lib/functions/image/initrd.sh
View File

@@ -52,13 +52,13 @@ update_initramfs() {
mkdir -p "${SRC}/cache/initrd"
initrd_cache_current_manifest_filepath="${WORKDIR}/initrd.img-${initrd_kern_ver}.${ARMBIAN_BUILD_UUID}.manifest"
initrd_cache_last_manifest_filepath="${SRC}/cache/initrd/initrd.manifest-${initrd_kern_ver}.last.manifest"
initrd_files_to_hash=( "${chroot_target}/usr/bin/bash" "${chroot_target}/etc/initramfs" )
initrd_files_to_hash+=( "${chroot_target}/etc/initramfs-tools" "${chroot_target}/usr/share/initramfs-tools/" )
initrd_files_to_hash=("${chroot_target}/usr/bin/bash" "${chroot_target}/etc/initramfs")
initrd_files_to_hash+=("${chroot_target}/etc/initramfs-tools" "${chroot_target}/usr/share/initramfs-tools/")
if [[ $CRYPTROOT_ENABLE == yes ]]; then
if [[ $CRYPTROOT_SSH_UNLOCK == yes ]]; then
[[ -d "${chroot_target}/etc/dropbear-initramfs/" ]] && initrd_files_to_hash+=( "${chroot_target}/etc/dropbear-initramfs/" )
[[ -d "${chroot_target}/etc/dropbear/initramfs/" ]] && initrd_files_to_hash+=( "${chroot_target}/etc/dropbear/initramfs/" )
[[ -d "${chroot_target}/etc/dropbear-initramfs/" ]] && initrd_files_to_hash+=("${chroot_target}/etc/dropbear-initramfs/")
[[ -d "${chroot_target}/etc/dropbear/initramfs/" ]] && initrd_files_to_hash+=("${chroot_target}/etc/dropbear/initramfs/")
fi
fi