From 2237555141ec8b269bb89fe51268eb56af15f44d Mon Sep 17 00:00:00 2001
From: CvH <1355173+CvH@users.noreply.github.com>
Date: Thu, 1 Aug 2024 11:51:09 +0200
Subject: [PATCH] cleanup packages: various

---
 packages/audio/alsa-utils/package.mk          |   4 +-
 packages/audio/espeak-ng/package.mk           |  10 +-
 packages/audio/libfreeaptx/package.mk         |   2 +-
 packages/audio/openal-soft/package.mk         |   1 -
 packages/audio/wireplumber/package.mk         |   6 +-
 packages/compress/zstd/package.mk             |   4 +-
 packages/databases/sqlite/package.mk          |  44 +++---
 packages/devel/arm-mem/package.mk             |   4 +-
 packages/devel/autoconf-archive/package.mk    |   4 +-
 packages/devel/bison/package.mk               |   8 +-
 packages/devel/boost/package.mk               |   8 +-
 packages/devel/ccache/package.mk              |  10 +-
 packages/devel/flex/package.mk                |   2 +-
 packages/devel/glibc/package.mk               |  12 +-
 packages/devel/hwdata/package.mk              |   2 +-
 packages/devel/libfmt/package.mk              |   4 +-
 packages/devel/popt/package.mk                |   8 +-
 packages/devel/slang/package.mk               |  14 +-
 packages/graphics/kmsxx/package.mk            |   1 -
 packages/graphics/libdrm/package.mk           |   5 +-
 packages/graphics/libglvnd/package.mk         |   2 +-
 packages/graphics/nvidia/package.mk           |   4 +-
 packages/lang/gcc-aarch64/package.mk          |   2 +-
 packages/lang/gcc-arm-none-eabi/package.mk    |   2 +-
 packages/lang/gcc-or1k/package.mk             |   2 +-
 packages/lang/gcc/package.mk                  |  16 +-
 .../brcmfmac_sdio-firmware/package.mk         |   2 +-
 .../linux-firmware/kernel-firmware/package.mk |   6 +-
 packages/linux/package.mk                     |  16 +-
 .../screensaver.shadertoy/package.mk          |   4 +-
 .../visualization.shadertoy/package.mk        |   4 +-
 packages/mediacenter/kodi/package.mk          | 142 +++++++++---------
 packages/multimedia/ffmpeg/package.mk         |   7 +-
 .../gstreamer/gst-plugins-bad/package.mk      |   9 +-
 .../multimedia/intel-vaapi-driver/package.mk  |   1 -
 .../multimedia/nv-codec-headers/package.mk    |   2 +-
 packages/multimedia/rtmpdump/package.mk       |   6 +-
 packages/network/avahi/package.mk             |  10 +-
 packages/network/bluez/package.mk             |   6 +-
 packages/network/iwd/package.mk               |   1 -
 packages/network/libssh/package.mk            |   2 +-
 packages/network/samba/package.mk             |   8 +-
 packages/network/sshpass/package.mk           |   2 +-
 packages/print/freetype/package.mk            |   9 +-
 packages/rust/rust/package.mk                 |  11 +-
 packages/security/libgpg-error/package.mk     |   2 +-
 packages/security/nss/package.mk              |  40 ++---
 packages/sysutils/busybox/package.mk          |   4 +-
 packages/sysutils/dbus/package.mk             |   4 +-
 packages/sysutils/eventlircd/package.mk       |   2 +-
 packages/sysutils/evrepeat/package.mk         |   1 -
 packages/sysutils/kmod/package.mk             |   4 +-
 packages/sysutils/open-iscsi/package.mk       |   2 +-
 packages/sysutils/systemd/package.mk          |   4 +-
 packages/sysutils/udevil/package.mk           |   4 +-
 packages/sysutils/util-linux/package.mk       |   6 +-
 packages/sysutils/v4l-utils/package.mk        |   6 +-
 packages/sysutils/wait-time-sync/package.mk   |   1 -
 packages/tools/bcm2835-bootloader/package.mk  |   3 +-
 packages/tools/crust/package.mk               |  10 +-
 packages/tools/nano/package.mk                |  16 +-
 packages/tools/newt/package.mk                |  12 +-
 packages/tools/procps-ng/package.mk           |   2 +-
 packages/tools/syslinux/package.mk            |   2 +-
 packages/tools/u-boot/package.mk              |   2 +-
 packages/virtual/mediacenter/package.mk       |  12 +-
 packages/virtual/network/package.mk           |   1 -
 packages/wayland/util/bemenu/package.mk       |   4 +-
 packages/wayland/util/foot/package.mk         |   2 +-
 packages/x11/other/fontconfig/package.mk      |   2 +-
 70 files changed, 286 insertions(+), 291 deletions(-)

diff --git a/packages/audio/alsa-utils/package.mk b/packages/audio/alsa-utils/package.mk
index a6e0a07423..ae1a0cfece 100644
--- a/packages/audio/alsa-utils/package.mk
+++ b/packages/audio/alsa-utils/package.mk
@@ -31,8 +31,8 @@ post_makeinstall_target() {
   rm -rf ${INSTALL}/usr/share/sounds
   rm -rf ${INSTALL}/usr/lib/systemd/system
 
-# remove default udev rule to restore mixer configs, we install our own.
-# so we avoid resetting our soundconfig
+  # remove default udev rule to restore mixer configs, we install our own.
+  # so we avoid resetting our soundconfig
   rm -rf ${INSTALL}/usr/lib/udev/rules.d/90-alsa-restore.rules
 
   mkdir -p ${INSTALL}/.noinstall
diff --git a/packages/audio/espeak-ng/package.mk b/packages/audio/espeak-ng/package.mk
index 7c1970fe31..86651da84c 100644
--- a/packages/audio/espeak-ng/package.mk
+++ b/packages/audio/espeak-ng/package.mk
@@ -14,8 +14,14 @@ PKG_TOOLCHAIN="autotools"
 
 make_host() {
   mkdir phsource dictsource
-  (cd dictsource; ln -s ../../dictsource/* .)
-  (cd phsource; ln -s ../../phsource/* .)
+  (
+    cd dictsource
+    ln -s ../../dictsource/* .
+  )
+  (
+    cd phsource
+    ln -s ../../phsource/* .
+  )
   cp -aP ../espeak-ng-data .
   make DESTDIR=$(pwd) -j1
 }
diff --git a/packages/audio/libfreeaptx/package.mk b/packages/audio/libfreeaptx/package.mk
index 02e1150a96..e62e5bcac4 100644
--- a/packages/audio/libfreeaptx/package.mk
+++ b/packages/audio/libfreeaptx/package.mk
@@ -25,7 +25,7 @@ makeinstall_target() {
     cp -a ${PKG_NAME##*lib}.h ${SYSROOT_PREFIX}/usr/include/
 
   mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig
-    cat > ${SYSROOT_PREFIX}/usr/lib/pkgconfig/${PKG_NAME}.pc << EOF
+    cat >${SYSROOT_PREFIX}/usr/lib/pkgconfig/${PKG_NAME}.pc <<EOF
 prefix=/usr
 exec_prefix=\${prefix}
 libdir=\${exec_prefix}/lib
diff --git a/packages/audio/openal-soft/package.mk b/packages/audio/openal-soft/package.mk
index 439def3084..d2756c8f7a 100644
--- a/packages/audio/openal-soft/package.mk
+++ b/packages/audio/openal-soft/package.mk
@@ -15,4 +15,3 @@ PKG_CMAKE_OPTS_TARGET="-DALSOFT_BACKEND_OSS=off \
                        -DALSOFT_BACKEND_WAVE=off \
                        -DALSOFT_EXAMPLES=off \
                        -DALSOFT_UTILS=off"
-
diff --git a/packages/audio/wireplumber/package.mk b/packages/audio/wireplumber/package.mk
index 78078fdcb6..9503075051 100644
--- a/packages/audio/wireplumber/package.mk
+++ b/packages/audio/wireplumber/package.mk
@@ -27,7 +27,7 @@ post_makeinstall_target() {
   # ref https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/0da29f38181e391160fa8702623050b8544ec775
   # ref https://github.com/PipeWire/wireplumber/blob/master/docs/rst/daemon/configuration/migration.rst
   # ref https://github.com/PipeWire/wireplumber/blob/master/docs/rst/daemon/configuration/features.rst
-  cat > ${INSTALL}/usr/share/wireplumber/wireplumber.conf.d/89-disable-session-dbus-dependent-features.conf << EOF
+  cat >${INSTALL}/usr/share/wireplumber/wireplumber.conf.d/89-disable-session-dbus-dependent-features.conf <<EOF
 wireplumber.profiles = {
   main = {
     monitor.alsa.reserve-device = disabled
@@ -37,7 +37,7 @@ wireplumber.profiles = {
 }
 EOF
 
-  cat > ${INSTALL}/usr/share/wireplumber/wireplumber.conf.d/89-disable-v4l2.conf << EOF
+  cat >${INSTALL}/usr/share/wireplumber/wireplumber.conf.d/89-disable-v4l2.conf <<EOF
 wireplumber.profiles = {
   main = {
     monitor.v4l2 = disabled
@@ -45,7 +45,7 @@ wireplumber.profiles = {
 }
 EOF
 
-  cat > ${INSTALL}/usr/share/wireplumber/wireplumber.conf.d/89-disable-bluez-hfphsp-backend.conf << EOF
+  cat >${INSTALL}/usr/share/wireplumber/wireplumber.conf.d/89-disable-bluez-hfphsp-backend.conf <<EOF
 monitor.bluez.properties = {
   bluez5.hfphsp-backend = "none"
 }
diff --git a/packages/compress/zstd/package.mk b/packages/compress/zstd/package.mk
index 092dc7340c..9b591b5493 100644
--- a/packages/compress/zstd/package.mk
+++ b/packages/compress/zstd/package.mk
@@ -23,8 +23,8 @@ configure_host() {
   # custom cmake build to override the LOCAL_CC/CXX
   cp ${CMAKE_CONF} cmake-zstd.conf
 
-  echo "SET(CMAKE_C_COMPILER   ${CC})"  >> cmake-zstd.conf
-  echo "SET(CMAKE_CXX_COMPILER ${CXX})" >> cmake-zstd.conf
+  echo "SET(CMAKE_C_COMPILER   ${CC})"  >>cmake-zstd.conf
+  echo "SET(CMAKE_CXX_COMPILER ${CXX})" >>cmake-zstd.conf
 
   cmake -DCMAKE_TOOLCHAIN_FILE=cmake-zstd.conf \
         -DCMAKE_INSTALL_PREFIX=${TOOLCHAIN} \
diff --git a/packages/databases/sqlite/package.mk b/packages/databases/sqlite/package.mk
index c168a501e6..ea7e233d4b 100644
--- a/packages/databases/sqlite/package.mk
+++ b/packages/databases/sqlite/package.mk
@@ -23,34 +23,34 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-static \
                            --with-gnu-ld"
 
 pre_configure_target() {
-# sqlite fails to compile with fast-math link time optimization.
+  # sqlite fails to compile with fast-math link time optimization.
   CFLAGS=$(echo ${CFLAGS} | sed -e "s|-Ofast|-O3|g")
   CFLAGS=$(echo ${CFLAGS} | sed -e "s|-ffast-math||g")
 
-# This option adds additional logic to the ANALYZE command and to the query planner
-# that can help SQLite to chose a better query plan under certain situations. The
-# ANALYZE command is enhanced to collect histogram data from each index and store
-# that data in the sqlite_stat4 table. The query planner will then use the histogram
-# data to help it make better index choices.
+  # This option adds additional logic to the ANALYZE command and to the query planner
+  # that can help SQLite to chose a better query plan under certain situations. The
+  # ANALYZE command is enhanced to collect histogram data from each index and store
+  # that data in the sqlite_stat4 table. The query planner will then use the histogram
+  # data to help it make better index choices.
   CFLAGS+=" -DSQLITE_ENABLE_STAT4"
 
-# When this C-preprocessor macro is defined, SQLite includes some additional APIs
-# that provide convenient access to meta-data about tables and queries. The APIs that
-# are enabled by this option are:
-#  - sqlite3_column_database_name()
-#  - sqlite3_column_database_name16()
-#  - sqlite3_column_table_name()
-#  - sqlite3_column_table_name16()
-#  - sqlite3_column_origin_name()
-#  - sqlite3_column_origin_name16()
-#  - sqlite3_table_column_metadata()
+  # When this C-preprocessor macro is defined, SQLite includes some additional APIs
+  # that provide convenient access to meta-data about tables and queries. The APIs that
+  # are enabled by this option are:
+  #  - sqlite3_column_database_name()
+  #  - sqlite3_column_database_name16()
+  #  - sqlite3_column_table_name()
+  #  - sqlite3_column_table_name16()
+  #  - sqlite3_column_origin_name()
+  #  - sqlite3_column_origin_name16()
+  #  - sqlite3_table_column_metadata()
   CFLAGS+=" -DSQLITE_ENABLE_COLUMN_METADATA=1"
 
-# This macro sets the default limit on the amount of memory that will be used for
-# memory-mapped I/O for each open database file. If the N is zero, then memory
-# mapped I/O is disabled by default. This compile-time limit and the
-# SQLITE_MAX_MMAP_SIZE can be modified at start-time using the
-# sqlite3_config(SQLITE_CONFIG_MMAP_SIZE) call, or at run-time using the
-# mmap_size pragma.
+  # This macro sets the default limit on the amount of memory that will be used for
+  # memory-mapped I/O for each open database file. If the N is zero, then memory
+  # mapped I/O is disabled by default. This compile-time limit and the
+  # SQLITE_MAX_MMAP_SIZE can be modified at start-time using the
+  # sqlite3_config(SQLITE_CONFIG_MMAP_SIZE) call, or at run-time using the
+  # mmap_size pragma.
   CFLAGS+=" -DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_MMAP_SIZE=268435456"
 }
diff --git a/packages/devel/arm-mem/package.mk b/packages/devel/arm-mem/package.mk
index f23e636718..ea40c76871 100644
--- a/packages/devel/arm-mem/package.mk
+++ b/packages/devel/arm-mem/package.mk
@@ -35,7 +35,7 @@ makeinstall_target() {
     cp -P ${PKG_LIB_ARM_MEM} ${INSTALL}/usr/lib
 
   mkdir -p ${INSTALL}/etc
-    echo "/usr/lib/${PKG_LIB_ARM_MEM}" >> ${INSTALL}/etc/ld.so.preload
+    echo "/usr/lib/${PKG_LIB_ARM_MEM}" >>${INSTALL}/etc/ld.so.preload
 }
 
 makeinstall_init() {
@@ -43,5 +43,5 @@ makeinstall_init() {
     cp -P ${PKG_LIB_ARM_MEM} ${INSTALL}/usr/lib
 
   mkdir -p ${INSTALL}/etc
-    echo "/usr/lib/${PKG_LIB_ARM_MEM}" >> ${INSTALL}/etc/ld.so.preload
+    echo "/usr/lib/${PKG_LIB_ARM_MEM}" >>${INSTALL}/etc/ld.so.preload
 }
diff --git a/packages/devel/autoconf-archive/package.mk b/packages/devel/autoconf-archive/package.mk
index 02212115c5..8c77e6819a 100644
--- a/packages/devel/autoconf-archive/package.mk
+++ b/packages/devel/autoconf-archive/package.mk
@@ -14,9 +14,9 @@ PKG_LONGDESC="autoconf-archive is an package of m4 macros"
 PKG_CONFIGURE_OPTS_HOST="--target=${TARGET_NAME} --prefix=${TOOLCHAIN}"
 
 makeinstall_host() {
-# make install
+  # make install
   make prefix=${SYSROOT_PREFIX}/usr install
 
-# remove problematic m4 file
+  # remove problematic m4 file
   rm -rf ${SYSROOT_PREFIX}/usr/share/aclocal/ax_prog_cc_for_build.m4
 }
diff --git a/packages/devel/bison/package.mk b/packages/devel/bison/package.mk
index 00bce3137c..1eba27df2b 100644
--- a/packages/devel/bison/package.mk
+++ b/packages/devel/bison/package.mk
@@ -15,8 +15,8 @@ PKG_BUILD_FLAGS="-parallel"
 PKG_CONFIGURE_OPTS_HOST="--disable-rpath --with-gnu-ld"
 
 post_configure_host() {
-# The configure system causes Bison to be built without support for
-# internationalization of error messages if a bison program is not already in
-# ${PATH}. The following addition will correct this:
-  echo '#define YYENABLE_NLS 1' >> lib/config.h
+  # The configure system causes Bison to be built without support for
+  # internationalization of error messages if a bison program is not already in
+  # ${PATH}. The following addition will correct this:
+  echo '#define YYENABLE_NLS 1' >>lib/config.h
 }
diff --git a/packages/devel/boost/package.mk b/packages/devel/boost/package.mk
index 7d912cbf55..b7a4a7ce89 100644
--- a/packages/devel/boost/package.mk
+++ b/packages/devel/boost/package.mk
@@ -35,10 +35,10 @@ configure_target() {
                   --with-python=${TOOLCHAIN}/bin/python \
                   --with-python-root=${SYSROOT_PREFIX}/usr
 
-  echo "using gcc : $(${CC} -v 2>&1  | tail -n 1 |awk '{print $3}') : ${CC}  : <compileflags>\"${CFLAGS}\" <linkflags>\"${LDFLAGS}\" ;" \
-    > tools/build/src/user-config.jam
-  echo "using python : ${PKG_PYTHON_VERSION/#python} : ${TOOLCHAIN} : ${SYSROOT_PREFIX}/usr/include : ${SYSROOT_PREFIX}/usr/lib ;" \
-    >> tools/build/src/user-config.jam
+  echo "using gcc : $(${CC} -v 2>&1  | tail -n 1 | awk '{print $3}') : ${CC}  : <compileflags>\"${CFLAGS}\" <linkflags>\"${LDFLAGS}\" ;" \
+    >tools/build/src/user-config.jam
+  echo "using python : ${PKG_PYTHON_VERSION#python} : ${TOOLCHAIN} : ${SYSROOT_PREFIX}/usr/include : ${SYSROOT_PREFIX}/usr/lib ;" \
+    >>tools/build/src/user-config.jam
 }
 
 makeinstall_target() {
diff --git a/packages/devel/ccache/package.mk b/packages/devel/ccache/package.mk
index a5933e2c86..fd304b5b08 100644
--- a/packages/devel/ccache/package.mk
+++ b/packages/devel/ccache/package.mk
@@ -18,8 +18,8 @@ configure_host() {
   # custom cmake build to override the LOCAL_CC/CXX
   cp ${CMAKE_CONF} cmake-ccache.conf
 
-  echo "SET(CMAKE_C_COMPILER   ${CC})"  >> cmake-ccache.conf
-  echo "SET(CMAKE_CXX_COMPILER ${CXX})" >> cmake-ccache.conf
+  echo "SET(CMAKE_C_COMPILER   ${CC})"  >>cmake-ccache.conf
+  echo "SET(CMAKE_CXX_COMPILER ${CXX})" >>cmake-ccache.conf
 
   cmake -DCMAKE_TOOLCHAIN_FILE=cmake-ccache.conf \
         -DCMAKE_INSTALL_PREFIX=${TOOLCHAIN} \
@@ -31,20 +31,20 @@ configure_host() {
 }
 
 post_makeinstall_host() {
-# setup ccache
+  # setup ccache
   if [ -z "${CCACHE_DISABLE}" ]; then
     CCACHE_DIR="${BUILD_CCACHE_DIR}" ${TOOLCHAIN}/bin/ccache --max-size=${CCACHE_CACHE_SIZE}
     CCACHE_DIR="${BUILD_CCACHE_DIR}" ${TOOLCHAIN}/bin/ccache --set-config compression_level=${CCACHE_COMPRESSLEVEL}
   fi
 
-  cat > ${TOOLCHAIN}/bin/host-gcc <<EOF
+  cat >${TOOLCHAIN}/bin/host-gcc <<EOF
 #!/bin/sh
 ${TOOLCHAIN}/bin/ccache ${LOCAL_CC} "\$@"
 EOF
 
   chmod +x ${TOOLCHAIN}/bin/host-gcc
 
-  cat > ${TOOLCHAIN}/bin/host-g++ <<EOF
+  cat >${TOOLCHAIN}/bin/host-g++ <<EOF
 #!/bin/sh
 ${TOOLCHAIN}/bin/ccache ${LOCAL_CXX} "\$@"
 EOF
diff --git a/packages/devel/flex/package.mk b/packages/devel/flex/package.mk
index 7a35ff90e1..1473535c41 100644
--- a/packages/devel/flex/package.mk
+++ b/packages/devel/flex/package.mk
@@ -19,7 +19,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_realloc_0_nonnull=yes \
                            ac_cv_func_malloc_0_nonnull=yes"
 
 post_makeinstall_host() {
-  cat > ${TOOLCHAIN}/bin/lex << "EOF"
+  cat >${TOOLCHAIN}/bin/lex  <<"EOF"
 #!/bin/sh
 exec flex "$@"
 EOF
diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk
index 1f386d6957..7d5fcd61cc 100644
--- a/packages/devel/glibc/package.mk
+++ b/packages/devel/glibc/package.mk
@@ -49,7 +49,7 @@ post_unpack() {
 }
 
 pre_configure_target() {
-# Filter out some problematic *FLAGS
+  # Filter out some problematic *FLAGS
   export CFLAGS=$(echo ${CFLAGS} | sed -e "s|-ffast-math||g")
   export CFLAGS=$(echo ${CFLAGS} | sed -e "s|-Ofast|-O2|g")
   export CFLAGS=$(echo ${CFLAGS} | sed -e "s|-O.|-O2|g")
@@ -101,8 +101,8 @@ post_makeinstall_target() {
     cp -a ${INSTALL}/usr/share/i18n/locales ${INSTALL}/.noinstall
     mv ${INSTALL}/usr/share/i18n/charmaps ${INSTALL}/.noinstall
 
-# cleanup
-# remove any programs we don't want/need, keeping only those we want
+  # cleanup
+  # remove any programs we don't want/need, keeping only those we want
   for f in $(find ${INSTALL}/usr/bin -type f); do
     listcontains "${GLIBC_INCLUDE_BIN}" "$(basename "${f}")" || safe_remove "${f}"
   done
@@ -112,7 +112,7 @@ post_makeinstall_target() {
   safe_remove ${INSTALL}/usr/lib/*.o
   safe_remove ${INSTALL}/var
 
-# add UTF-8 charmap
+  # add UTF-8 charmap
   mkdir -p ${INSTALL}/usr/share/i18n/charmaps
     cp -PR ${INSTALL}/.noinstall/charmaps/UTF-8.gz ${INSTALL}/usr/share/i18n/charmaps
 
@@ -123,7 +123,7 @@ post_makeinstall_target() {
       cp -PR ${PKG_BUILD}/localedata/locales/POSIX ${INSTALL}/usr/share/i18n/locales
   fi
 
-# create default configs
+  # create default configs
   mkdir -p ${INSTALL}/etc
     cp ${PKG_DIR}/config/nsswitch-target.conf ${INSTALL}/etc/nsswitch.conf
     cp ${PKG_DIR}/config/host.conf ${INSTALL}/etc
@@ -151,7 +151,7 @@ makeinstall_init() {
 }
 
 post_makeinstall_init() {
-# create default configs
+  # create default configs
   mkdir -p ${INSTALL}/etc
     cp ${PKG_DIR}/config/nsswitch-init.conf ${INSTALL}/etc/nsswitch.conf
 }
diff --git a/packages/devel/hwdata/package.mk b/packages/devel/hwdata/package.mk
index ada81dc80a..3376074f4c 100644
--- a/packages/devel/hwdata/package.mk
+++ b/packages/devel/hwdata/package.mk
@@ -11,7 +11,7 @@ PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="hwdata contains various hardware identification and configuration data, such as the pci.ids and usb.ids databases"
 
 pre_configure_target() {
-# hwdata fails to build in subdirs
+  # hwdata fails to build in subdirs
   cd ${PKG_BUILD}
     rm -rf .${TARGET_NAME}
 
diff --git a/packages/devel/libfmt/package.mk b/packages/devel/libfmt/package.mk
index 3a4f9878eb..7c682f9524 100644
--- a/packages/devel/libfmt/package.mk
+++ b/packages/devel/libfmt/package.mk
@@ -26,8 +26,8 @@ configure_host() {
   # custom cmake build to override the LOCAL_CC/CXX
   cp ${CMAKE_CONF} cmake-ccache.conf
 
-  echo "SET(CMAKE_C_COMPILER   ${CC})"  >> cmake-ccache.conf
-  echo "SET(CMAKE_CXX_COMPILER ${CXX})" >> cmake-ccache.conf
+  echo "SET(CMAKE_C_COMPILER   ${CC})"  >>cmake-ccache.conf
+  echo "SET(CMAKE_CXX_COMPILER ${CXX})" >>cmake-ccache.conf
   cmake -DCMAKE_TOOLCHAIN_FILE=cmake-ccache.conf \
         -DCMAKE_INSTALL_PREFIX=${TOOLCHAIN} \
         ${PKG_CMAKE_OPTS_COMMON} \
diff --git a/packages/devel/popt/package.mk b/packages/devel/popt/package.mk
index a05a71a86e..96870fcf77 100644
--- a/packages/devel/popt/package.mk
+++ b/packages/devel/popt/package.mk
@@ -12,11 +12,11 @@ PKG_DEPENDS_TARGET="cmake:host gcc:host"
 PKG_LONGDESC="The popt library exists essentially for parsing command-line options."
 
 pre_configure_target() {
- cd ${PKG_BUILD}
- rm -rf .${TARGET_NAME}
+  cd ${PKG_BUILD}
+  rm -rf .${TARGET_NAME}
 }
 
 pre_configure_host() {
- cd ${PKG_BUILD}
- rm -rf .${HOST_NAME}
+  cd ${PKG_BUILD}
+  rm -rf .${HOST_NAME}
 }
diff --git a/packages/devel/slang/package.mk b/packages/devel/slang/package.mk
index 8651f3b732..b91d98051e 100644
--- a/packages/devel/slang/package.mk
+++ b/packages/devel/slang/package.mk
@@ -16,14 +16,14 @@ PKG_CONFIGURE_OPTS_TARGET="--without-pcre \
                            --without-onig"
 
 pre_configure_target() {
- # slang fails to build in subdirs
- cd ${PKG_BUILD}
- sed -i 's|RPATH=".*"|RPATH=""|' configure
- rm -rf .${TARGET_NAME}
+  # slang fails to build in subdirs
+  cd ${PKG_BUILD}
+  sed -i 's|RPATH=".*"|RPATH=""|' configure
+  rm -rf .${TARGET_NAME}
 }
 
 pre_configure_host() {
- # slang fails to build in subdirs
- cd ${PKG_BUILD}
- rm -rf .${HOST_NAME}
+  # slang fails to build in subdirs
+  cd ${PKG_BUILD}
+  rm -rf .${HOST_NAME}
 }
diff --git a/packages/graphics/kmsxx/package.mk b/packages/graphics/kmsxx/package.mk
index ccfb090e45..b7c60269e7 100644
--- a/packages/graphics/kmsxx/package.mk
+++ b/packages/graphics/kmsxx/package.mk
@@ -15,4 +15,3 @@ PKG_MESON_OPTS_TARGET="-Ddefault_library=shared \
                        -Dkmscube=false \
                        -Domap=disabled \
                        -Dpykms=disabled"
-
diff --git a/packages/graphics/libdrm/package.mk b/packages/graphics/libdrm/package.mk
index 920d2fe5ee..5b37d84f16 100644
--- a/packages/graphics/libdrm/package.mk
+++ b/packages/graphics/libdrm/package.mk
@@ -62,9 +62,8 @@ listcontains "${GRAPHIC_DRIVERS}" "etnaviv" &&
 
 post_makeinstall_target() {
   # Remove all test programs installed by install-test-programs=true except modetest
-  for PKG_LIBDRM_TEST in \
-    drmdevice modeprint proptest vbltest
-  do
+  PKG_LIBDRM_LIST="drmdevice modeprint proptest vbltest"
+  for PKG_LIBDRM_TEST in ${PKG_LIBDRM_LIST}; do
     safe_remove ${INSTALL}/usr/bin/${PKG_LIBDRM_TEST}
   done
 
diff --git a/packages/graphics/libglvnd/package.mk b/packages/graphics/libglvnd/package.mk
index 25e8503217..14b9c5e472 100644
--- a/packages/graphics/libglvnd/package.mk
+++ b/packages/graphics/libglvnd/package.mk
@@ -16,7 +16,7 @@ configure_package() {
   fi
 }
 
-pre_configure_target(){
+pre_configure_target() {
   PKG_MESON_OPTS_TARGET="-Dgles1=false"
 
   if [ "${OPENGLES_SUPPORT}" = "no" ]; then
diff --git a/packages/graphics/nvidia/package.mk b/packages/graphics/nvidia/package.mk
index 25fc46a842..838b4ddf11 100644
--- a/packages/graphics/nvidia/package.mk
+++ b/packages/graphics/nvidia/package.mk
@@ -96,9 +96,9 @@ makeinstall_target() {
       ln -sf libnvidia-vulkan-producer.so.1              ${INSTALL}/usr/lib/libnvidia-vulkan-producer.so
 
     mkdir -p ${INSTALL}/usr/share/vulkan/implicit_layer.d
-      sed "s#libGLX_nvidia.so.0#libEGL_nvidia.so.0#" nvidia_layers.json > ${INSTALL}/usr/share/vulkan/implicit_layer.d/nvidia_layers.json
+      sed "s#libGLX_nvidia.so.0#libEGL_nvidia.so.0#" nvidia_layers.json >${INSTALL}/usr/share/vulkan/implicit_layer.d/nvidia_layers.json
     mkdir -p ${INSTALL}/usr/share/vulkan/icd.d
-      sed "s#libGLX_nvidia.so.0#libEGL_nvidia.so.0#" nvidia_icd.json > ${INSTALL}/usr/share/vulkan/icd.d/nvidia_icd.json
+      sed "s#libGLX_nvidia.so.0#libEGL_nvidia.so.0#" nvidia_icd.json >${INSTALL}/usr/share/vulkan/icd.d/nvidia_icd.json
   fi
 
   # CUDA
diff --git a/packages/lang/gcc-aarch64/package.mk b/packages/lang/gcc-aarch64/package.mk
index c5e27e878d..f439aad402 100644
--- a/packages/lang/gcc-aarch64/package.mk
+++ b/packages/lang/gcc-aarch64/package.mk
@@ -65,7 +65,7 @@ post_makeinstall_host() {
 
   rm -f ${PKG_GCC_PREFIX}gcc
 
-cat > ${PKG_GCC_PREFIX}gcc <<EOF
+  cat >${PKG_GCC_PREFIX}gcc <<EOF
 #!/bin/sh
 ${TOOLCHAIN}/bin/ccache ${CROSS_CC} "\$@"
 EOF
diff --git a/packages/lang/gcc-arm-none-eabi/package.mk b/packages/lang/gcc-arm-none-eabi/package.mk
index 6344e6201c..5fb2868cc5 100644
--- a/packages/lang/gcc-arm-none-eabi/package.mk
+++ b/packages/lang/gcc-arm-none-eabi/package.mk
@@ -64,7 +64,7 @@ post_makeinstall_host() {
 
   rm -f ${PKG_GCC_PREFIX}gcc
 
-cat > ${PKG_GCC_PREFIX}gcc <<EOF
+  cat >${PKG_GCC_PREFIX}gcc <<EOF
 #!/bin/sh
 ${TOOLCHAIN}/bin/ccache ${CROSS_CC} "\$@"
 EOF
diff --git a/packages/lang/gcc-or1k/package.mk b/packages/lang/gcc-or1k/package.mk
index a6bba6eb39..0730a4c8bb 100644
--- a/packages/lang/gcc-or1k/package.mk
+++ b/packages/lang/gcc-or1k/package.mk
@@ -65,7 +65,7 @@ post_makeinstall_host() {
 
   rm -f ${PKG_GCC_PREFIX}gcc
 
-cat > ${PKG_GCC_PREFIX}gcc <<EOF
+  cat >${PKG_GCC_PREFIX}gcc <<EOF
 #!/bin/sh
 ${TOOLCHAIN}/bin/ccache ${CROSS_CC} "\$@"
 EOF
diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
index 1b85015468..7e6bae4896 100644
--- a/packages/lang/gcc/package.mk
+++ b/packages/lang/gcc/package.mk
@@ -19,7 +19,7 @@ if [ "${MOLD_SUPPORT}" = "yes" ]; then
 fi
 
 case ${TARGET_ARCH} in
-  arm|riscv64)
+  arm | riscv64)
     OPTS_LIBATOMIC="--enable-libatomic"
     ;;
   *)
@@ -89,7 +89,7 @@ post_makeinstall_bootstrap() {
 
   rm -f ${TARGET_PREFIX}gcc
 
-cat > ${TARGET_PREFIX}gcc <<EOF
+  cat >${TARGET_PREFIX}gcc <<EOF
 #!/bin/sh
 ${TOOLCHAIN}/bin/ccache ${CROSS_CC} "\$@"
 EOF
@@ -129,7 +129,7 @@ post_makeinstall_host() {
 
   rm -f ${TARGET_PREFIX}gcc
 
-cat > ${TARGET_PREFIX}gcc <<EOF
+  cat >${TARGET_PREFIX}gcc <<EOF
 #!/bin/sh
 ${TOOLCHAIN}/bin/ccache ${CROSS_CC} "\$@"
 EOF
@@ -141,7 +141,7 @@ EOF
 
   [ ! -f "${CROSS_CXX}" ] && mv ${TARGET_PREFIX}g++ ${CROSS_CXX}
 
-cat > ${TARGET_PREFIX}g++ <<EOF
+  cat >${TARGET_PREFIX}g++ <<EOF
 #!/bin/sh
 ${TOOLCHAIN}/bin/ccache ${CROSS_CXX} "\$@"
 EOF
@@ -157,11 +157,11 @@ EOF
 }
 
 configure_target() {
- : # reuse configure_host()
+  : # reuse configure_host()
 }
 
 make_target() {
- : # reuse make_host()
+  : # reuse make_host()
 }
 
 makeinstall_target() {
@@ -174,11 +174,11 @@ makeinstall_target() {
 }
 
 configure_init() {
- : # reuse configure_host()
+  : # reuse configure_host()
 }
 
 make_init() {
- : # reuse make_host()
+  : # reuse make_host()
 }
 
 makeinstall_init() {
diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware/package.mk
index 2351477ebc..76fca2530c 100644
--- a/packages/linux-firmware/brcmfmac_sdio-firmware/package.mk
+++ b/packages/linux-firmware/brcmfmac_sdio-firmware/package.mk
@@ -36,7 +36,7 @@ post_makeinstall_target() {
           exit 1
         fi
       done
-    done < ${fwlist}
+    done <${fwlist}
   done
 
   mkdir -p ${INSTALL}/usr/bin
diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk
index b2498074fa..8424d73d73 100644
--- a/packages/linux-firmware/kernel-firmware/package.mk
+++ b/packages/linux-firmware/kernel-firmware/package.mk
@@ -57,15 +57,15 @@ makeinstall_target() {
           echo "ERROR: Firmware file ${fwfile} does not exist - aborting"
           exit 1
         fi
-      done <<< "$(cd ${PKG_FW_SOURCE} && eval "find "${fwline}"")"
-    done < "${fwlist}"
+      done <<<"$(cd ${PKG_FW_SOURCE} && eval "find "${fwline}"")"
+    done <"${fwlist}"
   done
 
   PKG_KERNEL_CFG_FILE=$(kernel_config_path) || die
 
   # The following files are RPi specific and installed by brcmfmac_sdio-firmware-rpi instead.
   # They are also not required at all if the kernel is not suitably configured.
-  if listcontains "${FIRMWARE}" "brcmfmac_sdio-firmware-rpi" || \
+  if listcontains "${FIRMWARE}" "brcmfmac_sdio-firmware-rpi" ||
      ! grep -q "^CONFIG_BRCMFMAC_SDIO=y" ${PKG_KERNEL_CFG_FILE}; then
     rm -fr ${FW_TARGET_DIR}/brcm/brcmfmac43430*-sdio.*
     rm -fr ${FW_TARGET_DIR}/brcm/brcmfmac43455*-sdio.*
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 656ece6550..cb2fc93db1 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -103,7 +103,8 @@ makeinstall_host() {
 }
 
 pre_make_target() {
-  ( cd ${ROOT}
+  ( 
+    cd ${ROOT}
     rm -rf ${BUILD}/initramfs
     rm -f ${STAMPS_INSTALL}/initramfs/install_target ${STAMPS_INSTALL}/*/install_init
     ${SCRIPTS}/install initramfs
@@ -182,7 +183,7 @@ pre_make_target() {
     kernel_make oldconfig
   else
     # accept default answers for .config changes
-    yes "" | kernel_make oldconfig > /dev/null
+    yes "" | kernel_make oldconfig >/dev/null
   fi
 
   if [ -f "${DISTRO_DIR}/${DISTRO}/kernel_options" ]; then
@@ -196,7 +197,7 @@ pre_make_target() {
       if [ "$(${PKG_BUILD}/scripts/config --state ${OPTION%%=*})" != "$(echo ${OPTION##*=} | tr -d '"')" ]; then
         MISSING_KERNEL_OPTIONS+="\t${OPTION}\n"
       fi
-    done < ${DISTRO_DIR}/${DISTRO}/kernel_options
+    done <${DISTRO_DIR}/${DISTRO}/kernel_options
 
     if [ -n "${MISSING_KERNEL_OPTIONS}" ]; then
       print_color CLR_WARNING "LINUX: kernel options not correct: \n${MISSING_KERNEL_OPTIONS%%}\nPlease run ./tools/check_kernel_config\n"
@@ -218,7 +219,8 @@ make_target() {
   DTC_FLAGS=-@ kernel_make ${KERNEL_TARGET} ${KERNEL_MAKE_EXTRACMD} modules
 
   if [ "${PKG_BUILD_PERF}" = "yes" ]; then
-    ( cd tools/perf
+    ( 
+      cd tools/perf
 
       # arch specific perf build args
       case "${TARGET_ARCH}" in
@@ -260,9 +262,9 @@ make_target() {
     if [ "${KERNEL_UIMAGE_COMP}" != "none" ]; then
       COMPRESSED_SIZE=$(stat -t "arch/${TARGET_KERNEL_ARCH}/boot/${KERNEL_TARGET}" | awk '{print $2}')
       # align to 1 MiB
-      COMPRESSED_SIZE=$(( ((${COMPRESSED_SIZE} - 1 >> 20) + 1) << 20 ))
-      PKG_KERNEL_UIMAGE_LOADADDR=$(printf '%X' "$(( ${KERNEL_UIMAGE_LOADADDR} + ${COMPRESSED_SIZE} ))")
-      PKG_KERNEL_UIMAGE_ENTRYADDR=$(printf '%X' "$(( ${KERNEL_UIMAGE_ENTRYADDR} + ${COMPRESSED_SIZE} ))")
+      COMPRESSED_SIZE=$((((${COMPRESSED_SIZE} - 1 >> 20) + 1) << 20))
+      PKG_KERNEL_UIMAGE_LOADADDR=$(printf '%X' "$((${KERNEL_UIMAGE_LOADADDR} + ${COMPRESSED_SIZE}))")
+      PKG_KERNEL_UIMAGE_ENTRYADDR=$(printf '%X' "$((${KERNEL_UIMAGE_ENTRYADDR} + ${COMPRESSED_SIZE}))")
     else
       PKG_KERNEL_UIMAGE_LOADADDR=${KERNEL_UIMAGE_LOADADDR}
       PKG_KERNEL_UIMAGE_ENTRYADDR=${KERNEL_UIMAGE_ENTRYADDR}
diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk
index 9ff382a32e..3c974ba9a0 100644
--- a/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk
@@ -19,11 +19,11 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.ui.screensaver"
 
 if [ ! "${OPENGL}" = "no" ]; then
-# for OpenGL (GLX) support
+  # for OpenGL (GLX) support
   PKG_DEPENDS_TARGET+=" ${OPENGL} glew"
 fi
 
 if [ "${OPENGLES_SUPPORT}" = yes ]; then
-# for OpenGL-ES support
+  # for OpenGL-ES support
   PKG_DEPENDS_TARGET+=" ${OPENGLES}"
 fi
diff --git a/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk
index 0cf1419cb6..e4d313084f 100644
--- a/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk
@@ -19,11 +19,11 @@ PKG_IS_ADDON="yes"
 PKG_ADDON_TYPE="xbmc.player.musicviz"
 
 if [ ! "${OPENGL}" = "no" ]; then
-# for OpenGL (GLX) support
+  # for OpenGL (GLX) support
   PKG_DEPENDS_TARGET+=" ${OPENGL} glew"
 fi
 
 if [ "${OPENGLES_SUPPORT}" = yes ]; then
-# for OpenGL-ES support
+  # for OpenGL-ES support
   PKG_DEPENDS_TARGET+=" ${OPENGLES}"
 fi
diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index a63d3ac750..c1cb5c3249 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -73,7 +73,7 @@ configure_package() {
     KODI_ALSA="-DENABLE_ALSA=ON"
   else
     KODI_ALSA="-DENABLE_ALSA=OFF"
- fi
+  fi
 
   if [ "${KODI_PULSEAUDIO_SUPPORT}" = yes ]; then
     PKG_DEPENDS_TARGET+=" pulseaudio"
@@ -136,13 +136,17 @@ configure_package() {
   fi
 
   case "${KODI_MYSQL_SUPPORT}" in
-    mysql)   PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} mysql"
-             KODI_MYSQL="-DENABLE_MYSQLCLIENT=ON -DENABLE_MARIADBCLIENT=OFF"
-             ;;
-    mariadb) PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} mariadb-connector-c"
-             KODI_MYSQL="-DENABLE_MARIADBCLIENT=ON -DENABLE_MYSQLCLIENT=OFF"
-             ;;
-    *)       KODI_MYSQL="-DENABLE_MYSQLCLIENT=OFF -DENABLE_MARIADBCLIENT=OFF"
+    mysql)
+      PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} mysql"
+      KODI_MYSQL="-DENABLE_MYSQLCLIENT=ON -DENABLE_MARIADBCLIENT=OFF"
+      ;;
+    mariadb)
+      PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} mariadb-connector-c"
+      KODI_MYSQL="-DENABLE_MARIADBCLIENT=ON -DENABLE_MYSQLCLIENT=OFF"
+      ;;
+    *)
+      KODI_MYSQL="-DENABLE_MYSQLCLIENT=OFF -DENABLE_MARIADBCLIENT=OFF"
+      ;;
   esac
 
   if [ "${KODI_AIRPLAY_SUPPORT}" = yes ]; then
@@ -291,13 +295,13 @@ configure_package() {
 configure_host() {
   setup_toolchain target:cmake
   cmake ${CMAKE_GENERATOR_NINJA} \
-        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CONF} \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-        -DHEADERS_ONLY=ON \
-        ${KODI_ARCH} \
-        ${KODI_NEON} \
-        ${KODI_PLATFORM} ..
+    -DCMAKE_TOOLCHAIN_FILE=${CMAKE_CONF} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
+    -DHEADERS_ONLY=ON \
+    ${KODI_ARCH} \
+    ${KODI_NEON} \
+    ${KODI_PLATFORM} ..
 }
 
 make_host() {
@@ -319,9 +323,9 @@ pre_configure_target() {
 
 post_makeinstall_target() {
   mkdir -p ${INSTALL}/.noinstall
-    mv ${INSTALL}/usr/share/kodi/addons/skin.estuary \
-       ${INSTALL}/usr/share/kodi/addons/service.xbmc.versioncheck \
-       ${INSTALL}/.noinstall
+  mv ${INSTALL}/usr/share/kodi/addons/skin.estuary \
+     ${INSTALL}/usr/share/kodi/addons/service.xbmc.versioncheck \
+     ${INSTALL}/.noinstall
 
   rm -rf ${INSTALL}/usr/bin/kodi
   rm -rf ${INSTALL}/usr/bin/kodi-standalone
@@ -334,53 +338,53 @@ post_makeinstall_target() {
   rm -rf ${INSTALL}/usr/share/xsessions
 
   mkdir -p ${INSTALL}/usr/lib/kodi
-    cp ${PKG_DIR}/scripts/kodi-config ${INSTALL}/usr/lib/kodi
-    cp ${PKG_DIR}/scripts/kodi-safe-mode ${INSTALL}/usr/lib/kodi
-    cp ${PKG_DIR}/scripts/kodi.sh ${INSTALL}/usr/lib/kodi
+  cp ${PKG_DIR}/scripts/kodi-config ${INSTALL}/usr/lib/kodi
+  cp ${PKG_DIR}/scripts/kodi-safe-mode ${INSTALL}/usr/lib/kodi
+  cp ${PKG_DIR}/scripts/kodi.sh ${INSTALL}/usr/lib/kodi
 
-    # Configure safe mode triggers - default 5 restarts within 900 seconds/15 minutes
-    sed -e "s|@KODI_MAX_RESTARTS@|${KODI_MAX_RESTARTS:-5}|g" \
-        -e "s|@KODI_MAX_SECONDS@|${KODI_MAX_SECONDS:-900}|g" \
-        -i ${INSTALL}/usr/lib/kodi/kodi.sh
+  # Configure safe mode triggers - default 5 restarts within 900 seconds/15 minutes
+  sed -e "s|@KODI_MAX_RESTARTS@|${KODI_MAX_RESTARTS:-5}|g" \
+      -e "s|@KODI_MAX_SECONDS@|${KODI_MAX_SECONDS:-900}|g" \
+      -i ${INSTALL}/usr/lib/kodi/kodi.sh
 
-    if [ "${KODI_PIPEWIRE_SUPPORT}" = "yes" ]; then
-      KODI_AUDIO_ARGS="--audio-backend=pipewire"
-    elif [ "${KODI_PULSEAUDIO_SUPPORT}" = "yes" -a "${KODI_ALSA_SUPPORT}" = "yes" ]; then
-      KODI_AUDIO_ARGS="--audio-backend=alsa+pulseaudio"
-    elif [ "${KODI_PULSEAUDIO_SUPPORT}" = "yes" -a "${KODI_ALSA_SUPPORT}" != "yes" ]; then
-      KODI_AUDIO_ARGS="--audio-backend=pulseaudio"
-    elif [ "${KODI_PULSEAUDIO_SUPPORT}" != "yes" -a "${KODI_ALSA_SUPPORT}" = "yes" ]; then
-      KODI_AUDIO_ARGS="--audio-backend=alsa"
-    fi
+  if [ "${KODI_PIPEWIRE_SUPPORT}" = "yes" ]; then
+    KODI_AUDIO_ARGS="--audio-backend=pipewire"
+  elif [ "${KODI_PULSEAUDIO_SUPPORT}" = "yes" -a "${KODI_ALSA_SUPPORT}" = "yes" ]; then
+    KODI_AUDIO_ARGS="--audio-backend=alsa+pulseaudio"
+  elif [ "${KODI_PULSEAUDIO_SUPPORT}" = "yes" -a "${KODI_ALSA_SUPPORT}" != "yes" ]; then
+    KODI_AUDIO_ARGS="--audio-backend=pulseaudio"
+  elif [ "${KODI_PULSEAUDIO_SUPPORT}" != "yes" -a "${KODI_ALSA_SUPPORT}" = "yes" ]; then
+    KODI_AUDIO_ARGS="--audio-backend=alsa"
+  fi
 
-    # adjust audio output device to what was built
-    sed "s/@KODI_AUDIO_ARGS@/${KODI_AUDIO_ARGS}/" ${PKG_DIR}/config/kodi.conf.in > ${INSTALL}/usr/lib/kodi/kodi.conf
+  # adjust audio output device to what was built
+  sed "s/@KODI_AUDIO_ARGS@/${KODI_AUDIO_ARGS}/" ${PKG_DIR}/config/kodi.conf.in >${INSTALL}/usr/lib/kodi/kodi.conf
 
-    # set default display environment
-    if [ "${DISPLAYSERVER}" = "x11" ]; then
-      echo "DISPLAY=:0.0" >> ${INSTALL}/usr/lib/kodi/kodi.conf
-    elif [ "${DISPLAYSERVER}" = "wl" ]; then
-      echo "WAYLAND_DISPLAY=wayland-1" >> ${INSTALL}/usr/lib/kodi/kodi.conf
-    fi
+  # set default display environment
+  if [ "${DISPLAYSERVER}" = "x11" ]; then
+    echo "DISPLAY=:0.0" >>${INSTALL}/usr/lib/kodi/kodi.conf
+  elif [ "${DISPLAYSERVER}" = "wl" ]; then
+    echo "WAYLAND_DISPLAY=wayland-1" >>${INSTALL}/usr/lib/kodi/kodi.conf
+  fi
 
-    # nvidia: Enable USLEEP to reduce CPU load while rendering
-    if listcontains "${GRAPHIC_DRIVERS}" "nvidia" || listcontains "${GRAPHIC_DRIVERS}" "nvidia-legacy"; then
-      echo "__GL_YIELD=USLEEP" >> ${INSTALL}/usr/lib/kodi/kodi.conf
-    fi
+  # nvidia: Enable USLEEP to reduce CPU load while rendering
+  if listcontains "${GRAPHIC_DRIVERS}" "nvidia" || listcontains "${GRAPHIC_DRIVERS}" "nvidia-legacy"; then
+    echo "__GL_YIELD=USLEEP" >>${INSTALL}/usr/lib/kodi/kodi.conf
+  fi
 
   mkdir -p ${INSTALL}/usr/sbin
-    cp ${PKG_DIR}/scripts/service-addon-wrapper ${INSTALL}/usr/sbin
+  cp ${PKG_DIR}/scripts/service-addon-wrapper ${INSTALL}/usr/sbin
 
   mkdir -p ${INSTALL}/usr/bin
-    cp ${PKG_DIR}/scripts/kodi-remote ${INSTALL}/usr/bin
-    cp ${PKG_DIR}/scripts/setwakeup.sh ${INSTALL}/usr/bin
-    cp ${PKG_DIR}/scripts/pastekodi ${INSTALL}/usr/bin
-    ln -sf /usr/bin/pastekodi ${INSTALL}/usr/bin/pastecrash
+  cp ${PKG_DIR}/scripts/kodi-remote ${INSTALL}/usr/bin
+  cp ${PKG_DIR}/scripts/setwakeup.sh ${INSTALL}/usr/bin
+  cp ${PKG_DIR}/scripts/pastekodi ${INSTALL}/usr/bin
+  ln -sf /usr/bin/pastekodi ${INSTALL}/usr/bin/pastecrash
 
   mkdir -p ${INSTALL}/usr/share/kodi/addons
-    cp -R ${PKG_DIR}/config/repository.libreelec.tv ${INSTALL}/usr/share/kodi/addons
-    sed -e "s|@ADDON_URL@|${ADDON_URL}|g" -i ${INSTALL}/usr/share/kodi/addons/repository.libreelec.tv/addon.xml
-    sed -e "s|@ADDON_VERSION@|${ADDON_VERSION}|g" -i ${INSTALL}/usr/share/kodi/addons/repository.libreelec.tv/addon.xml
+  cp -R ${PKG_DIR}/config/repository.libreelec.tv ${INSTALL}/usr/share/kodi/addons
+  sed -e "s|@ADDON_URL@|${ADDON_URL}|g" -i ${INSTALL}/usr/share/kodi/addons/repository.libreelec.tv/addon.xml
+  sed -e "s|@ADDON_VERSION@|${ADDON_VERSION}|g" -i ${INSTALL}/usr/share/kodi/addons/repository.libreelec.tv/addon.xml
 
   mkdir -p ${INSTALL}/usr/share/kodi/config
 
@@ -389,28 +393,28 @@ post_makeinstall_target() {
   mkdir -p ${INSTALL}/usr/share/kodi/system/settings
 
   ${PKG_DIR}/scripts/xml_merge.py ${PKG_DIR}/config/guisettings.xml \
-                                ${PROJECT_DIR}/${PROJECT}/kodi/guisettings.xml \
-                                ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/kodi/guisettings.xml \
-                                > ${INSTALL}/usr/share/kodi/config/guisettings.xml
+                                  ${PROJECT_DIR}/${PROJECT}/kodi/guisettings.xml \
+                                  ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/kodi/guisettings.xml \
+                                  >${INSTALL}/usr/share/kodi/config/guisettings.xml
 
   ${PKG_DIR}/scripts/xml_merge.py ${PKG_DIR}/config/sources.xml \
-                                ${PROJECT_DIR}/${PROJECT}/kodi/sources.xml \
-                                ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/kodi/sources.xml \
-                                > ${INSTALL}/usr/share/kodi/config/sources.xml
+                                  ${PROJECT_DIR}/${PROJECT}/kodi/sources.xml \
+                                  ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/kodi/sources.xml \
+                                  >${INSTALL}/usr/share/kodi/config/sources.xml
 
   ${PKG_DIR}/scripts/xml_merge.py ${PKG_DIR}/config/advancedsettings.xml \
-                                ${PROJECT_DIR}/${PROJECT}/kodi/advancedsettings.xml \
-                                ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/kodi/advancedsettings.xml \
-                                > ${INSTALL}/usr/share/kodi/system/advancedsettings.xml
+                                  ${PROJECT_DIR}/${PROJECT}/kodi/advancedsettings.xml \
+                                  ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/kodi/advancedsettings.xml \
+                                  >${INSTALL}/usr/share/kodi/system/advancedsettings.xml
 
   ${PKG_DIR}/scripts/xml_merge.py ${PKG_DIR}/config/appliance.xml \
-                                ${PKG_APPLIANCE_XML} \
-                                ${PROJECT_DIR}/${PROJECT}/kodi/appliance.xml \
-                                ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/kodi/appliance.xml \
-                                > ${INSTALL}/usr/share/kodi/system/settings/appliance.xml
+                                  ${PKG_APPLIANCE_XML} \
+                                  ${PROJECT_DIR}/${PROJECT}/kodi/appliance.xml \
+                                  ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/kodi/appliance.xml \
+                                  >${INSTALL}/usr/share/kodi/system/settings/appliance.xml
 
   mkdir -p ${INSTALL}/usr/cache/libreelec
-    cp ${PKG_DIR}/config/network_wait ${INSTALL}/usr/cache/libreelec
+  cp ${PKG_DIR}/config/network_wait ${INSTALL}/usr/cache/libreelec
 
   # GBM: install udev rule to ignore the power button in libinput/kodi so logind can handle it
   if [ "${DISPLAYSERVER}" = "no" ]; then
@@ -437,7 +441,7 @@ post_makeinstall_target() {
 
   if [ "${KODI_EXTRA_FONTS}" = yes ]; then
     mkdir -p ${INSTALL}/usr/share/kodi/media/Fonts
-      cp ${PKG_DIR}/fonts/*.ttf ${INSTALL}/usr/share/kodi/media/Fonts
+    cp ${PKG_DIR}/fonts/*.ttf ${INSTALL}/usr/share/kodi/media/Fonts
   fi
 
   # Compile kodi Python site-packages to .pyc bytecode, and remove .py source code
diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk
index b55ffbd2c8..11129c638e 100644
--- a/packages/multimedia/ffmpeg/package.mk
+++ b/packages/multimedia/ffmpeg/package.mk
@@ -26,8 +26,9 @@ case "${PROJECT}" in
   *)
     PKG_PATCH_DIRS+=" v4l2-request v4l2-drmprime"
     case "${PROJECT}" in
-      Allwinner|Rockchip)
+      Allwinner | Rockchip)
         PKG_PATCH_DIRS+=" vf-deinterlace-v4l2m2m"
+        ;;
     esac
     ;;
 esac
@@ -35,9 +36,9 @@ esac
 post_unpack() {
   # Fix FFmpeg version
   if [ "${PROJECT}" = "Amlogic" ]; then
-    echo "${PKG_FFMPEG_BRANCH}-${PKG_VERSION:0:7}" > ${PKG_BUILD}/VERSION
+    echo "${PKG_FFMPEG_BRANCH}-${PKG_VERSION:0:7}" >${PKG_BUILD}/VERSION
   else
-    echo "${PKG_VERSION}" > ${PKG_BUILD}/RELEASE
+    echo "${PKG_VERSION}" >${PKG_BUILD}/RELEASE
   fi
 }
 
diff --git a/packages/multimedia/gstreamer/gst-plugins-bad/package.mk b/packages/multimedia/gstreamer/gst-plugins-bad/package.mk
index 5053019eab..3648f0b6d1 100644
--- a/packages/multimedia/gstreamer/gst-plugins-bad/package.mk
+++ b/packages/multimedia/gstreamer/gst-plugins-bad/package.mk
@@ -188,11 +188,10 @@ pre_configure_target() {
 post_makeinstall_target() {
   # clean up
   safe_remove ${INSTALL}/usr/bin
-  for PKG_GST_PLUGINS_BAD in \
-    libgstadaptivedemux libgstbadaudio libgstbasecamerabinsrc libgstcodecs \
-    libgstinsertbin libgstisoff libgstmpegts libgstphotography libgstplayer \
-    libgstsctp libgsttranscoder libgsturidownloader libgstwebrtc
-  do
+  PKG_GST_PLUGINS_BAD_LIST="libgstadaptivedemux libgstbadaudio libgstbasecamerabinsrc libgstcodecs \
+                            libgstinsertbin libgstisoff libgstmpegts libgstphotography libgstplayer \
+                            libgstsctp libgsttranscoder libgsturidownloader libgstwebrtc"
+  for PKG_GST_PLUGINS_BAD in ${PKG_GST_PLUGINS_BAD_LIST}; do
     safe_remove ${INSTALL}/usr/lib/${PKG_GST_PLUGINS_BAD}-1.0*
   done
   safe_remove ${INSTALL}/usr/share
diff --git a/packages/multimedia/intel-vaapi-driver/package.mk b/packages/multimedia/intel-vaapi-driver/package.mk
index 290bc07ddb..9151c4b715 100644
--- a/packages/multimedia/intel-vaapi-driver/package.mk
+++ b/packages/multimedia/intel-vaapi-driver/package.mk
@@ -23,4 +23,3 @@ fi
 PKG_MESON_OPTS_TARGET="-Denable_hybrid_codec=false \
                        -Denable_tests=false \
                        ${DISPLAYSERVER_LIBVA}"
-
diff --git a/packages/multimedia/nv-codec-headers/package.mk b/packages/multimedia/nv-codec-headers/package.mk
index 1065f9570d..2a1e48a37e 100644
--- a/packages/multimedia/nv-codec-headers/package.mk
+++ b/packages/multimedia/nv-codec-headers/package.mk
@@ -10,6 +10,6 @@ PKG_URL="https://github.com/FFmpeg/nv-codec-headers/archive/n${PKG_VERSION}.tar.
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="FFmpeg version of headers required to interface with Nvidias codec APIs."
 
-makeinstall_target(){
+makeinstall_target() {
   make DESTDIR=${SYSROOT_PREFIX} PREFIX=/usr install
 }
diff --git a/packages/multimedia/rtmpdump/package.mk b/packages/multimedia/rtmpdump/package.mk
index 8ee3a11242..8e836e27a3 100644
--- a/packages/multimedia/rtmpdump/package.mk
+++ b/packages/multimedia/rtmpdump/package.mk
@@ -66,7 +66,7 @@ makeinstall_target() {
 post_makeinstall_target() {
   rm -rf ${INSTALL}/usr/sbin
 
-#  # to be removed: hack for "compatibility"
-#  mkdir -p ${INSTALL}/usr/lib
-#    ln -sf librtmp.so.1 ${INSTALL}/usr/lib/librtmp.so.0
+  #  # to be removed: hack for "compatibility"
+  #  mkdir -p ${INSTALL}/usr/lib
+  #    ln -sf librtmp.so.1 ${INSTALL}/usr/lib/librtmp.so.0
 }
diff --git a/packages/network/avahi/package.mk b/packages/network/avahi/package.mk
index a1b0705340..145ea80557 100644
--- a/packages/network/avahi/package.mk
+++ b/packages/network/avahi/package.mk
@@ -64,15 +64,15 @@ post_configure_target() {
 }
 
 post_makeinstall_target() {
-# disable wide-area
+  # disable wide-area
   sed -e "s,^.*enable-wide-area=.*$,enable-wide-area=no,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf
-# publish-hinfo
+  # publish-hinfo
   sed -e "s,^.*publish-hinfo=.*$,publish-hinfo=no,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf
-# publish-workstation
+  # publish-workstation
   sed -e "s,^.*publish-workstation=.*$,publish-workstation=no,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf
-# browse domains?
+  # browse domains?
   sed -e "s,^.*browse-domains=.*$,# browse-domains=,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf
-# set root user as default
+  # set root user as default
   sed -e "s,<port>22</port>,<port>22</port>\n    <txt-record>path=/storage</txt-record>\n    <txt-record>u=root</txt-record>,g" -i ${INSTALL}/etc/avahi/services/sftp-ssh.service
 
   rm -rf ${INSTALL}/etc/avahi/avahi-dnsconfd.action
diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk
index a039853854..f970d92b76 100644
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@@ -40,7 +40,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \
                            storagedir=/storage/.cache/bluetooth"
 
 pre_configure_target() {
-# bluez fails to build in subdirs
+  # bluez fails to build in subdirs
   cd ${PKG_BUILD}
     rm -rf .${TARGET_NAME}
 
@@ -62,8 +62,8 @@ post_makeinstall_target() {
         -e "s|^#\[Policy\]|\[Policy\]|g" \
         -e "s|^#AutoEnable.*|AutoEnable=true|g" \
         -e "s|^#JustWorksRepairing.*|JustWorksRepairing=always|g"
-    echo "[General]" > ${INSTALL}/etc/bluetooth/input.conf
-    echo "ClassicBondedOnly=false" >> ${INSTALL}/etc/bluetooth/input.conf
+    echo "[General]" >${INSTALL}/etc/bluetooth/input.conf
+    echo "ClassicBondedOnly=false" >>${INSTALL}/etc/bluetooth/input.conf
 
   mkdir -p ${INSTALL}/usr/share/services
     cp -P ${PKG_DIR}/default.d/*.conf ${INSTALL}/usr/share/services
diff --git a/packages/network/iwd/package.mk b/packages/network/iwd/package.mk
index 651ba0e4de..74b06a2320 100644
--- a/packages/network/iwd/package.mk
+++ b/packages/network/iwd/package.mk
@@ -39,4 +39,3 @@ post_makeinstall_target() {
 post_install() {
   enable_service iwd.service
 }
-
diff --git a/packages/network/libssh/package.mk b/packages/network/libssh/package.mk
index ea45c3efed..0fdb9075be 100644
--- a/packages/network/libssh/package.mk
+++ b/packages/network/libssh/package.mk
@@ -20,7 +20,7 @@ PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF \
                        -DWITH_INTERNAL_DOC=OFF"
 
 makeinstall_target() {
-# install static library only
+  # install static library only
   mkdir -p ${SYSROOT_PREFIX}/usr/lib
     cp ${PKG_BUILD}/.${TARGET_NAME}/src/libssh.a ${SYSROOT_PREFIX}/usr/lib
 
diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk
index bf2be76d80..2d91afe9b5 100644
--- a/packages/network/samba/package.mk
+++ b/packages/network/samba/package.mk
@@ -82,14 +82,14 @@ configure_package() {
 }
 
 pre_configure_target() {
-# samba uses its own build directory
+  # samba uses its own build directory
   cd ${PKG_BUILD}
     rm -rf .${TARGET_NAME}
 
-# work around link issues
+  # work around link issues
   export LDFLAGS="${LDFLAGS} -lreadline -lncurses"
 
-# support 64-bit offsets and seeks on 32-bit platforms
+  # support 64-bit offsets and seeks on 32-bit platforms
   if [ "${TARGET_ARCH}" = "arm" ]; then
     export CFLAGS+=" -D_FILE_OFFSET_BITS=64 -D_OFF_T_DEFINED_ -Doff_t=off64_t -Dlseek=lseek64"
   fi
@@ -97,7 +97,7 @@ pre_configure_target() {
 
 configure_target() {
   cp ${PKG_DIR}/config/samba4-cache.txt ${PKG_BUILD}/cache.txt
-    echo "Checking uname machine type: \"${TARGET_ARCH}\"" >> ${PKG_BUILD}/cache.txt
+    echo "Checking uname machine type: \"${TARGET_ARCH}\"" >>${PKG_BUILD}/cache.txt
 
   export COMPILE_ET=${TOOLCHAIN}/bin/heimdal_compile_et
   export ASN1_COMPILE=${TOOLCHAIN}/bin/heimdal_asn1_compile
diff --git a/packages/network/sshpass/package.mk b/packages/network/sshpass/package.mk
index 320663e919..81c7a65402 100644
--- a/packages/network/sshpass/package.mk
+++ b/packages/network/sshpass/package.mk
@@ -10,7 +10,7 @@ PKG_URL="https://downloads.sourceforge.net/sshpass/sshpass-${PKG_VERSION}.tar.gz
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="sshpass: a tool for non-interactive ssh password auth"
 
-pre_configure_target(){
+pre_configure_target() {
   export ac_cv_func_malloc_0_nonnull=yes
   export ac_cv_func_realloc_0_nonnull=yes
 }
diff --git a/packages/print/freetype/package.mk b/packages/print/freetype/package.mk
index a639615ef1..0458acb60a 100644
--- a/packages/print/freetype/package.mk
+++ b/packages/print/freetype/package.mk
@@ -20,10 +20,11 @@ PKG_CONFIGURE_OPTS_TARGET="LIBPNG_CFLAGS=-I${SYSROOT_PREFIX}/usr/include \
 
 pre_configure_target() {
   # unset LIBTOOL because freetype uses its own
-    ( cd ..
-      unset LIBTOOL
-      sh autogen.sh
-    )
+  (
+    cd ..
+    unset LIBTOOL
+    sh autogen.sh
+  )
 }
 
 post_makeinstall_target() {
diff --git a/packages/rust/rust/package.mk b/packages/rust/rust/package.mk
index 5d7b69ac12..6e29a150b7 100644
--- a/packages/rust/rust/package.mk
+++ b/packages/rust/rust/package.mk
@@ -27,12 +27,12 @@ configure_host() {
       # the arm target is special because we specify the subarch. ie armv8a
       cp -a ${PKG_DIR}/targets/arm-libreelec-linux-gnueabihf.json ${PKG_BUILD}/targets/${TARGET_NAME}.json
       ;;
-    "aarch64"|"x86_64")
+    "aarch64" | "x86_64")
       cp -a ${PKG_DIR}/targets/${TARGET_NAME}.json ${PKG_BUILD}/targets/${TARGET_NAME}.json
       ;;
   esac
 
-  cat > ${PKG_BUILD}/config.toml <<END
+  cat >${PKG_BUILD}/config.toml  <<END
 change-id = 102579
 
 [target.${TARGET_NAME}]
@@ -80,10 +80,10 @@ mandir = "${TOOLCHAIN}/share/man"
 
 END
 
-CARGO_HOME="${PKG_BUILD}/cargo_home"
-mkdir -p "${CARGO_HOME}"
+  CARGO_HOME="${PKG_BUILD}/cargo_home"
+  mkdir -p "${CARGO_HOME}"
 
-cat > ${CARGO_HOME}/config << END
+  cat >${CARGO_HOME}/config <<END
 [target.${TARGET_NAME}]
 linker = "${TARGET_PREFIX}gcc"
 
@@ -99,7 +99,6 @@ progress.when = 'always'
 progress.width = 80
 
 END
-
 }
 
 make_host() {
diff --git a/packages/security/libgpg-error/package.mk b/packages/security/libgpg-error/package.mk
index d98a18abac..f85f8d41e8 100644
--- a/packages/security/libgpg-error/package.mk
+++ b/packages/security/libgpg-error/package.mk
@@ -14,7 +14,7 @@ PKG_LONGDESC="A library that defines common error values for all GnuPG component
 pre_configure_target() {
   PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=${HOST_CC} --enable-static --disable-shared --disable-nls --disable-rpath --with-gnu-ld --with-pic"
 
-# inspired by openembedded
+  # inspired by openembedded
   case ${TARGET_ARCH} in
     aarch64)
       GPGERROR_TUPLE=aarch64-unknown-linux-gnu
diff --git a/packages/security/nss/package.mk b/packages/security/nss/package.mk
index 67893318d5..2cb6de4eab 100644
--- a/packages/security/nss/package.mk
+++ b/packages/security/nss/package.mk
@@ -21,14 +21,14 @@ make_host() {
   rm -rf ${PKG_BUILD}/dist
 
   INCLUDES="-I${TOOLCHAIN}/include" \
-  make BUILD_OPT=1 USE_64=1 \
-     PREFIX=${TOOLCHAIN} \
-     NSPR_INCLUDE_DIR=${TOOLCHAIN}/include/nspr \
-     USE_SYSTEM_ZLIB=1 ZLIB_LIBS="-lz -L${TOOLCHAIN}/lib" \
-     SKIP_SHLIBSIGN=1 \
-     NSS_TESTS="dummy" \
-     CC=${CC} LDFLAGS="${LDFLAGS} -L${TOOLCHAIN}/lib" \
-     V=1
+    make BUILD_OPT=1 USE_64=1 \
+    PREFIX=${TOOLCHAIN} \
+    NSPR_INCLUDE_DIR=${TOOLCHAIN}/include/nspr \
+    USE_SYSTEM_ZLIB=1 ZLIB_LIBS="-lz -L${TOOLCHAIN}/lib" \
+    SKIP_SHLIBSIGN=1 \
+    NSS_TESTS="dummy" \
+    CC=${CC} LDFLAGS="${LDFLAGS} -L${TOOLCHAIN}/lib" \
+    V=1
 }
 
 makeinstall_host() {
@@ -54,18 +54,18 @@ make_target() {
   rm -rf ${PKG_BUILD}/dist
 
   make BUILD_OPT=1 ${TARGET_USE_64} ${TARGET_x86_64} \
-     NSS_USE_SYSTEM_SQLITE=1 \
-     NSPR_INCLUDE_DIR=${SYSROOT_PREFIX}/usr/include/nspr \
-     NSS_USE_SYSTEM_SQLITE=1 \
-     USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz \
-     SKIP_SHLIBSIGN=1 \
-     OS_TEST=${TARGET_ARCH} \
-     NSS_TESTS="dummy" \
-     NSINSTALL=${TOOLCHAIN}/bin/nsinstall \
-     CPU_ARCH_TAG=${TARGET_ARCH} \
-     CC=${CC} \
-     LDFLAGS="${LDFLAGS} -L${SYSROOT_PREFIX}/usr/lib" \
-     V=1
+    NSS_USE_SYSTEM_SQLITE=1 \
+    NSPR_INCLUDE_DIR=${SYSROOT_PREFIX}/usr/include/nspr \
+    NSS_USE_SYSTEM_SQLITE=1 \
+    USE_SYSTEM_ZLIB=1 ZLIB_LIBS=-lz \
+    SKIP_SHLIBSIGN=1 \
+    OS_TEST=${TARGET_ARCH} \
+    NSS_TESTS="dummy" \
+    NSINSTALL=${TOOLCHAIN}/bin/nsinstall \
+    CPU_ARCH_TAG=${TARGET_ARCH} \
+    CC=${CC} \
+    LDFLAGS="${LDFLAGS} -L${SYSROOT_PREFIX}/usr/lib" \
+    V=1
 }
 
 makeinstall_target() {
diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk
index 69a4bafb1c..b2434e1eaf 100644
--- a/packages/sysutils/busybox/package.mk
+++ b/packages/sysutils/busybox/package.mk
@@ -153,8 +153,8 @@ makeinstall_target() {
 }
 
 post_install() {
-  echo "chmod 4755 ${INSTALL}/usr/bin/busybox" >> ${FAKEROOT_SCRIPT}
-  echo "chmod 000 ${INSTALL}/usr/cache/shadow" >> ${FAKEROOT_SCRIPT}
+  echo "chmod 4755 ${INSTALL}/usr/bin/busybox" >>${FAKEROOT_SCRIPT}
+  echo "chmod 000 ${INSTALL}/usr/cache/shadow" >>${FAKEROOT_SCRIPT}
 
   add_user root "${ROOT_PASSWORD}" 0 0 "Root User" "/storage" "/bin/sh"
   add_group root 0
diff --git a/packages/sysutils/dbus/package.mk b/packages/sysutils/dbus/package.mk
index 8f89ebffbc..c4b8823a52 100644
--- a/packages/sysutils/dbus/package.mk
+++ b/packages/sysutils/dbus/package.mk
@@ -43,6 +43,6 @@ post_install() {
   add_group dbus 81
   add_group netdev 497
 
-  echo "chmod 4750 ${INSTALL}/usr/lib/dbus/dbus-daemon-launch-helper" >> ${FAKEROOT_SCRIPT}
-  echo "chown 0:81 ${INSTALL}/usr/lib/dbus/dbus-daemon-launch-helper" >> ${FAKEROOT_SCRIPT}
+  echo "chmod 4750 ${INSTALL}/usr/lib/dbus/dbus-daemon-launch-helper" >>${FAKEROOT_SCRIPT}
+  echo "chown 0:81 ${INSTALL}/usr/lib/dbus/dbus-daemon-launch-helper" >>${FAKEROOT_SCRIPT}
 }
diff --git a/packages/sysutils/eventlircd/package.mk b/packages/sysutils/eventlircd/package.mk
index 75d6d2824c..2bac6d268a 100644
--- a/packages/sysutils/eventlircd/package.mk
+++ b/packages/sysutils/eventlircd/package.mk
@@ -16,7 +16,7 @@ PKG_CONFIGURE_OPTS_TARGET="--with-udev-dir=/usr/lib/udev \
                            --with-lircd-socket=/run/lirc/lircd"
 
 post_makeinstall_target() {
-# install our own evmap files and udev rules
+  # install our own evmap files and udev rules
   rm -rf ${INSTALL}/etc/eventlircd.d
   rm -rf ${INSTALL}/usr/lib/udev/rules.d
   rm -rf ${INSTALL}/usr/lib/udev/lircd_helper
diff --git a/packages/sysutils/evrepeat/package.mk b/packages/sysutils/evrepeat/package.mk
index 0952e512a1..0a36ef5548 100644
--- a/packages/sysutils/evrepeat/package.mk
+++ b/packages/sysutils/evrepeat/package.mk
@@ -9,4 +9,3 @@ PKG_SITE="https://github.com/HiassofT/evrepeat"
 PKG_URL="https://github.com/HiassofT/evrepeat/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Tool to view and change linux input device repeat settings"
-
diff --git a/packages/sysutils/kmod/package.mk b/packages/sysutils/kmod/package.mk
index e957093e40..e950fd674c 100644
--- a/packages/sysutils/kmod/package.mk
+++ b/packages/sysutils/kmod/package.mk
@@ -34,7 +34,7 @@ post_makeinstall_host() {
 }
 
 post_makeinstall_target() {
-# make symlinks for compatibility
+  # make symlinks for compatibility
   mkdir -p ${INSTALL}/usr/sbin
     ln -sf /usr/bin/kmod ${INSTALL}/usr/sbin/lsmod
     ln -sf /usr/bin/kmod ${INSTALL}/usr/sbin/insmod
@@ -46,6 +46,6 @@ post_makeinstall_target() {
   mkdir -p ${INSTALL}/etc
     ln -sf /storage/.config/modprobe.d ${INSTALL}/etc/modprobe.d
 
-# add user modprobe.d dir
+  # add user modprobe.d dir
   mkdir -p ${INSTALL}/usr/config/modprobe.d
 }
diff --git a/packages/sysutils/open-iscsi/package.mk b/packages/sysutils/open-iscsi/package.mk
index 0b8e26eb4f..28a019a0a3 100644
--- a/packages/sysutils/open-iscsi/package.mk
+++ b/packages/sysutils/open-iscsi/package.mk
@@ -79,7 +79,7 @@ makeinstall_target() {
 
     sed -i -e "s:= /sbin/iscsid:= /usr/sbin/iscsid:" ${INSTALL}/etc/iscsi/iscsid.conf
 
-    echo "InitiatorName=$(${TOOLCHAIN}/bin/iscsi-iname)" > ${INSTALL}/etc/iscsi/initiatorname.iscsi
+    echo "InitiatorName=$(${TOOLCHAIN}/bin/iscsi-iname)" >${INSTALL}/etc/iscsi/initiatorname.iscsi
 }
 
 post_install() {
diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk
index 7d78dec84b..9712da26a5 100644
--- a/packages/sysutils/systemd/package.mk
+++ b/packages/sysutils/systemd/package.mk
@@ -183,10 +183,10 @@ post_makeinstall_target() {
 
   # distro preset policy
   safe_remove ${INSTALL}/usr/lib/systemd/system-preset/*
-  echo "disable *" > ${INSTALL}/usr/lib/systemd/system-preset/99-default.preset
+  echo "disable *" >${INSTALL}/usr/lib/systemd/system-preset/99-default.preset
 
   safe_remove ${INSTALL}/usr/lib/systemd/user-preset/*
-  echo "disable *" > ${INSTALL}/usr/lib/systemd/user-preset/90-systemd.preset
+  echo "disable *" >${INSTALL}/usr/lib/systemd/user-preset/90-systemd.preset
 
   # remove networkd
   safe_remove ${INSTALL}/usr/lib/systemd/network
diff --git a/packages/sysutils/udevil/package.mk b/packages/sysutils/udevil/package.mk
index a8acf2f6a3..b489817583 100644
--- a/packages/sysutils/udevil/package.mk
+++ b/packages/sysutils/udevil/package.mk
@@ -18,7 +18,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-systemd \
                            --with-setfacl-prog=/usr/bin/setfacl"
 
 makeinstall_target() {
- : # nothing to install
+  : # nothing to install
 }
 
 post_makeinstall_target() {
@@ -30,7 +30,7 @@ post_makeinstall_target() {
     cp -PR src/udevil ${INSTALL}/usr/bin
 
   mkdir -p ${INSTALL}/usr/sbin
-  echo -e '#!/bin/sh\nexec /usr/bin/mount -t ntfs3 "$@"' > ${INSTALL}/usr/sbin/mount.ntfs
+  echo -e '#!/bin/sh\nexec /usr/bin/mount -t ntfs3 "$@"' >${INSTALL}/usr/sbin/mount.ntfs
   chmod 755 ${INSTALL}/usr/sbin/mount.ntfs
 }
 
diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk
index da83b4898e..7c14909b3c 100644
--- a/packages/sysutils/util-linux/package.mk
+++ b/packages/sysutils/util-linux/package.mk
@@ -85,14 +85,14 @@ post_makeinstall_target() {
       cp -PR ${PKG_DIR}/scripts/mount-swap ${INSTALL}/usr/lib/libreelec
 
     mkdir -p ${INSTALL}/etc
-      cat ${PKG_DIR}/config/swap.conf | \
+      cat ${PKG_DIR}/config/swap.conf |
         sed -e "s,@SWAPFILESIZE@,${SWAPFILESIZE},g" \
             -e "s,@SWAP_ENABLED_DEFAULT@,${SWAP_ENABLED_DEFAULT},g" \
-            > ${INSTALL}/etc/swap.conf
+            >${INSTALL}/etc/swap.conf
   fi
 }
 
-post_install () {
+post_install()  {
   if [ "${SWAP_SUPPORT}" = "yes" ]; then
     enable_service swap.service
   fi
diff --git a/packages/sysutils/v4l-utils/package.mk b/packages/sysutils/v4l-utils/package.mk
index 4b042f8703..4629b0cee5 100644
--- a/packages/sysutils/v4l-utils/package.mk
+++ b/packages/sysutils/v4l-utils/package.mk
@@ -29,7 +29,7 @@ create_multi_keymap() {
       map="${INSTALL}/usr/lib/udev/rc_keymaps/${f}.toml"
       [ -e "${map}" ] && cat "${map}"
     done
-  ) > ${INSTALL}/usr/lib/udev/rc_keymaps/${name}.toml
+  ) >${INSTALL}/usr/lib/udev/rc_keymaps/${name}.toml
 }
 
 post_makeinstall_target() {
@@ -62,7 +62,7 @@ post_makeinstall_target() {
     for f in ${PKG_DIR}/keymaps/*; do
       if [ -e ${f} ]; then
         keymap=$(basename ${f})
-        cat ${f} > ${INSTALL}/usr/lib/udev/rc_keymaps/${keymap}
+        cat ${f} >${INSTALL}/usr/lib/udev/rc_keymaps/${keymap}
       fi
     done
   )
@@ -74,7 +74,7 @@ post_makeinstall_target() {
     # use multi-keymap instead of default one
     sed -i '/^\*\s*rc-rc6-mce\s*rc6_mce/d' ${INSTALL}/etc/rc_maps.cfg
 
-    cat << EOF >> ${INSTALL}/etc/rc_maps.cfg
+    cat <<EOF  >>${INSTALL}/etc/rc_maps.cfg
 #
 # Custom LibreELEC configuration starts here
 #
diff --git a/packages/sysutils/wait-time-sync/package.mk b/packages/sysutils/wait-time-sync/package.mk
index bf0066ee93..35a40c7dba 100644
--- a/packages/sysutils/wait-time-sync/package.mk
+++ b/packages/sysutils/wait-time-sync/package.mk
@@ -9,7 +9,6 @@ PKG_URL=""
 PKG_DEPENDS_TARGET="make:host gcc:host"
 PKG_LONGDESC="A simple tool and systemd service to wait until NTP time is synced"
 
-
 post_install() {
   enable_service wait-time-sync.service
 }
diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk
index e3147ce40c..dde1601099 100644
--- a/packages/tools/bcm2835-bootloader/package.mk
+++ b/packages/tools/bcm2835-bootloader/package.mk
@@ -21,8 +21,7 @@ makeinstall_target() {
         cp -PRv fixup4x.dat ${INSTALL}/usr/share/bootloader/fixup.dat
         cp -PRv start4x.elf ${INSTALL}/usr/share/bootloader/start.elf
         ;;
-      RPi5)
-        ;;
+      RPi5) ;;
       *)
         cp -PRv bootcode.bin ${INSTALL}/usr/share/bootloader
         cp -PRv fixup_x.dat ${INSTALL}/usr/share/bootloader/fixup.dat
diff --git a/packages/tools/crust/package.mk b/packages/tools/crust/package.mk
index ccfa6c407a..1ded375817 100644
--- a/packages/tools/crust/package.mk
+++ b/packages/tools/crust/package.mk
@@ -35,14 +35,14 @@ make_target() {
 
   make distclean
   if [ "${BUILD_WITH_DEBUG}" = "yes" ]; then
-    echo "CONFIG_DEBUG_LOG=y" >> configs/${CRUST_CONFIG}
+    echo "CONFIG_DEBUG_LOG=y" >>configs/${CRUST_CONFIG}
   else
-    echo "CONFIG_SERIAL=n" >> configs/${CRUST_CONFIG}
+    echo "CONFIG_SERIAL=n" >>configs/${CRUST_CONFIG}
   fi
   # Boards with a PMIC need to disable CONFIG_PMIC_SHUTDOWN to get CIR wakeup from suspend
-  echo "CONFIG_PMIC_SHUTDOWN=n" >> configs/${CRUST_CONFIG}
-  echo "CONFIG_CIR=y" >> configs/${CRUST_CONFIG}
-  echo "CONFIG_CEC=y" >> configs/${CRUST_CONFIG}
+  echo "CONFIG_PMIC_SHUTDOWN=n" >>configs/${CRUST_CONFIG}
+  echo "CONFIG_CIR=y" >>configs/${CRUST_CONFIG}
+  echo "CONFIG_CEC=y" >>configs/${CRUST_CONFIG}
   make ${CRUST_CONFIG} BUILDCC=host-gcc
   make scp
 }
diff --git a/packages/tools/nano/package.mk b/packages/tools/nano/package.mk
index b09fd382f4..de78689539 100644
--- a/packages/tools/nano/package.mk
+++ b/packages/tools/nano/package.mk
@@ -23,17 +23,9 @@ post_makeinstall_target() {
   cp -a ${PKG_DIR}/config/* ${INSTALL}/etc/
 
   mkdir -p ${INSTALL}/usr/share/nano
-  for FILE_TYPES in \
-    css \
-    html \
-    java \
-    javascript \
-    json \
-    php \
-    python \
-    sh \
-    xml
-  do
-    cp -a ${PKG_BUILD}/syntax/${FILE_TYPES}.nanorc ${INSTALL}/usr/share/nano/
+
+  PKG_FILE_LIST="css html java javascript json php python sh xml"
+  for PKG_FILE_TYPES in ${PKG_FILE_LIST}; do
+    cp -a ${PKG_BUILD}/syntax/${PKG_FILE_TYPES}.nanorc ${INSTALL}/usr/share/nano/
   done
 }
diff --git a/packages/tools/newt/package.mk b/packages/tools/newt/package.mk
index 6dc42e3151..6bdaca02a2 100644
--- a/packages/tools/newt/package.mk
+++ b/packages/tools/newt/package.mk
@@ -16,13 +16,13 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
                            --without-tcl"
 
 pre_configure_target() {
- # newt fails to build in subdirs
- cd ${PKG_BUILD}
- rm -rf .${TARGET_NAME}
+  # newt fails to build in subdirs
+  cd ${PKG_BUILD}
+  rm -rf .${TARGET_NAME}
 }
 
 pre_configure_host() {
- # newt fails to build in subdirs
- cd ${PKG_BUILD}
- rm -rf .${HOST_NAME}
+  # newt fails to build in subdirs
+  cd ${PKG_BUILD}
+  rm -rf .${HOST_NAME}
 }
diff --git a/packages/tools/procps-ng/package.mk b/packages/tools/procps-ng/package.mk
index f9b4691767..d4c11cfe71 100644
--- a/packages/tools/procps-ng/package.mk
+++ b/packages/tools/procps-ng/package.mk
@@ -35,5 +35,5 @@ makeinstall_target() {
 
   sed 's@proc/misc.h@procps/misc.h@' \
     ${PKG_BUILD}/library/include/readproc.h \
-    > ${SYSROOT_PREFIX}/usr/include/libproc2/readproc.h
+    >${SYSROOT_PREFIX}/usr/include/libproc2/readproc.h
 }
diff --git a/packages/tools/syslinux/package.mk b/packages/tools/syslinux/package.mk
index bc4d037aa1..def5418dd3 100644
--- a/packages/tools/syslinux/package.mk
+++ b/packages/tools/syslinux/package.mk
@@ -16,7 +16,7 @@ PKG_LONGDESC="The SYSLINUX project covers lightweight linux bootloaders."
 pre_configure_target() {
   PKG_MAKE_OPTS_TARGET="CC=${CC} AR=${AR} RANLIB=${RANLIB} installer"
 
-# Unset all compiler FLAGS
+  # Unset all compiler FLAGS
   unset CFLAGS
   unset CPPFLAGS
   unset CXXFLAGS
diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk
index d4e7669c14..fd8e396232 100644
--- a/packages/tools/u-boot/package.mk
+++ b/packages/tools/u-boot/package.mk
@@ -28,7 +28,7 @@ post_patch() {
   if [ -n "${UBOOT_SYSTEM}" ] && find_file_path bootloader/config; then
     PKG_CONFIG_FILE="${PKG_BUILD}/configs/$(${ROOT}/${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} ${UBOOT_SYSTEM} config)"
     if [ -f "${PKG_CONFIG_FILE}" ]; then
-      cat ${FOUND_PATH} >> "${PKG_CONFIG_FILE}"
+      cat ${FOUND_PATH} >>"${PKG_CONFIG_FILE}"
     fi
   fi
 }
diff --git a/packages/virtual/mediacenter/package.mk b/packages/virtual/mediacenter/package.mk
index 838c652c7d..9fb7513a60 100644
--- a/packages/virtual/mediacenter/package.mk
+++ b/packages/virtual/mediacenter/package.mk
@@ -18,20 +18,20 @@ if [ "${MEDIACENTER}" = "kodi" ]; then
     PKG_DEPENDS_TARGET+=" ${MEDIACENTER}-theme-${i}"
   done
 
-# python-based tool for kodi management
+  # python-based tool for kodi management
   PKG_DEPENDS_TARGET+=" texturecache.py"
 
-# some python stuff needed for various addons
+  # some python stuff needed for various addons
   PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} Pillow \
-                                          simplejson \
-                                          pycryptodome"
+                                            simplejson \
+                                            pycryptodome"
 
-# settings addon
+  # settings addon
   if [ -n "${DISTRO_PKG_SETTINGS}" ]; then
     PKG_DEPENDS_TARGET+=" ${DISTRO_PKG_SETTINGS}"
   fi
 
-# other packages
+  # other packages
   PKG_DEPENDS_TARGET+=" xmlstarlet"
 
   if [ "${JOYSTICK_SUPPORT}" = "yes" ]; then
diff --git a/packages/virtual/network/package.mk b/packages/virtual/network/package.mk
index c0e9054949..7add4fd9c7 100644
--- a/packages/virtual/network/package.mk
+++ b/packages/virtual/network/package.mk
@@ -37,4 +37,3 @@ fi
 if [ "${NFS_SUPPORT}" = "yes" ]; then
   PKG_DEPENDS_TARGET+=" nfs-utils"
 fi
-
diff --git a/packages/wayland/util/bemenu/package.mk b/packages/wayland/util/bemenu/package.mk
index 7ee68e906c..92409e38b0 100644
--- a/packages/wayland/util/bemenu/package.mk
+++ b/packages/wayland/util/bemenu/package.mk
@@ -12,10 +12,10 @@ PKG_LONGDESC="Dynamic menu library and client program inspired by dmenu"
 
 PKG_MAKE_OPTS_TARGET="PREFIX=/usr clients wayland"
 
-makeinstall_target(){
+makeinstall_target() {
   make DESTDIR=${INSTALL} PREFIX=/usr install-libs install-bins install-wayland install-pkgconfig
 }
 
-post_makeinstall_target(){
+post_makeinstall_target() {
   ln -sf libbemenu.so.${PKG_VERSION} ${INSTALL}/usr/lib/libbemenu.so.0
 }
diff --git a/packages/wayland/util/foot/package.mk b/packages/wayland/util/foot/package.mk
index 2548e93395..be230c6921 100644
--- a/packages/wayland/util/foot/package.mk
+++ b/packages/wayland/util/foot/package.mk
@@ -17,7 +17,7 @@ PKG_MESON_OPTS_TARGET="-Ddocs=disabled \
                        -Dterminfo=disabled \
                        -Ddefault-terminfo=xterm"
 
-post_makeinstall_target(){
+post_makeinstall_target() {
   # clean up
   safe_remove ${INSTALL}/usr/share/*
 
diff --git a/packages/x11/other/fontconfig/package.mk b/packages/x11/other/fontconfig/package.mk
index a68e4014bd..4378423eaa 100644
--- a/packages/x11/other/fontconfig/package.mk
+++ b/packages/x11/other/fontconfig/package.mk
@@ -21,7 +21,7 @@ PKG_CONFIGURE_OPTS_TARGET="--with-arch=${TARGET_ARCH} \
                            --disable-rpath"
 
 pre_configure_target() {
-# ensure we dont use '-O3' optimization.
+  # ensure we dont use '-O3' optimization.
   CFLAGS=$(echo ${CFLAGS} | sed -e "s|-O3|-O2|")
   CXXFLAGS=$(echo ${CXXFLAGS} | sed -e "s|-O3|-O2|")
   CFLAGS+=" -I${PKG_BUILD}"