Merge pull request #9128 from CvH/13.0/shfmt-packages

cleanup package formatting
2025-07-28 13:16:41 +00:00 · 2024-08-11 19:39:07 +10:00 · 2024-08-11 19:39:07 +10:00 · 2fba186c6e
commit 2fba186c6e
parent b65e9d38de 2237555141
167 changed files with 393 additions and 403 deletions
--- a/packages/addons/addon-depends/ffmpegx/package.mk
+++ b/packages/addons/addon-depends/ffmpegx/package.mk
@ -165,6 +165,6 @@ configure_target() {
    --enable-libxml2 \
    \
    `#Advanced options` \
-    --disable-hardcoded-tables \
+    --disable-hardcoded-tables

 }
--- a/packages/addons/addon-depends/rpi-tools-depends/lg-gpio/package.mk
+++ b/packages/addons/addon-depends/rpi-tools-depends/lg-gpio/package.mk
@ -26,4 +26,3 @@ make_target() {
    python setup.py build
  )
 }
-
--- a/packages/addons/addon-depends/system-tools-depends/screen/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/screen/package.mk
@ -18,4 +18,3 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_utempter_h=no \
                           --disable-use-locale \
                           --disable-telnet \
                           --disable-socket-dir"
-
--- a/packages/addons/service/prometheus-node-exporter/package.mk
+++ b/packages/addons/service/prometheus-node-exporter/package.mk
@ -37,4 +37,3 @@ addon() {
  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
  cp -P ${PKG_BUILD}/bin/prometheus-node-exporter ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
 }
-
--- a/packages/addons/service/rsyslog/package.mk
+++ b/packages/addons/service/rsyslog/package.mk
@ -43,8 +43,7 @@ addon() {
     ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/

  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/rsyslog
-  for l in $(find ${PKG_INSTALL}/usr/lib -name *.so)
-  do
+  for l in $(find ${PKG_INSTALL}/usr/lib -name *.so); do
    cp ${l} ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/rsyslog/
  done
 }
--- a/packages/addons/tools/network-tools/package.mk
+++ b/packages/addons/tools/network-tools/package.mk
@ -101,6 +101,6 @@ addon() {
    ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwspy
    ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwpriv

-    find ${ADDON_BUILD}/${PKG_ADDON_ID}/bin -type f | \
+    find ${ADDON_BUILD}/${PKG_ADDON_ID}/bin -type f |
      xargs patchelf --add-rpath '${ORIGIN}/../lib.private'
 }
--- a/packages/addons/tools/rpi-tools/package.mk
+++ b/packages/addons/tools/rpi-tools/package.mk
@ -19,7 +19,6 @@ PKG_ADDON_NAME="Raspberry Pi Tools"
 PKG_ADDON_TYPE="xbmc.python.module"
 PKG_ADDON_PROJECTS="RPi ARM"

-
 addon() {
  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
    cp -PR $(get_build_dir lg-gpio)/liblgpio.so* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
--- a/packages/addons/tools/system-tools/package.mk
+++ b/packages/addons/tools/system-tools/package.mk
@ -191,6 +191,6 @@ addon() {
    cp -P $(get_install_dir vim)/usr/bin/vim ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
    cp -Pa $(get_install_dir vim)/storage/.kodi/addons/virtual.system-tools/data/vim/ ${ADDON_BUILD}/${PKG_ADDON_ID}/data

-    scanelf -EET_EXEC -RBF %F ${ADDON_BUILD}/${PKG_ADDON_ID}/bin | \
+    scanelf -EET_EXEC -RBF %F ${ADDON_BUILD}/${PKG_ADDON_ID}/bin |
      xargs patchelf --add-rpath '${ORIGIN}/../lib.private'
 }
--- 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
 }
--- 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"
-
--- a/packages/devel/boost/package.mk
+++ b/packages/devel/boost/package.mk
@ -37,7 +37,7 @@ configure_target() {

  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 ;" \
+  echo "using python : ${PKG_PYTHON_VERSION#python} : ${TOOLCHAIN} : ${SYSROOT_PREFIX}/usr/include : ${SYSROOT_PREFIX}/usr/lib ;" \
    >>tools/build/src/user-config.jam
 }

--- 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"
-
--- 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

--- a/packages/linux-firmware/kernel-firmware/package.mk
+++ b/packages/linux-firmware/kernel-firmware/package.mk
@ -65,7 +65,7 @@ makeinstall_target() {

  # 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.*
--- 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
@ -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
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@ -136,13 +136,17 @@ configure_package() {
  fi

  case "${KODI_MYSQL_SUPPORT}" in
-    mysql)   PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} mysql"
+    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"
+    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"
+    *)
+      KODI_MYSQL="-DENABLE_MYSQLCLIENT=OFF -DENABLE_MARIADBCLIENT=OFF"
+      ;;
  esac

  if [ "${KODI_AIRPLAY_SUPPORT}" = yes ]; then
--- a/packages/multimedia/ffmpeg/package.mk
+++ b/packages/multimedia/ffmpeg/package.mk
@ -28,6 +28,7 @@ case "${PROJECT}" in
    case "${PROJECT}" in
      Allwinner | Rockchip)
        PKG_PATCH_DIRS+=" vf-deinterlace-v4l2m2m"
+        ;;
    esac
    ;;
 esac
--- 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 \
+  PKG_GST_PLUGINS_BAD_LIST="libgstadaptivedemux libgstbadaudio libgstbasecamerabinsrc libgstcodecs \
                            libgstinsertbin libgstisoff libgstmpegts libgstphotography libgstplayer \
-    libgstsctp libgsttranscoder libgsturidownloader libgstwebrtc
-  do
+                            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
--- 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}"
-
--- 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
 }
-
--- a/packages/print/freetype/package.mk
+++ b/packages/print/freetype/package.mk
@ -20,7 +20,8 @@ PKG_CONFIGURE_OPTS_TARGET="LIBPNG_CFLAGS=-I${SYSROOT_PREFIX}/usr/include \

 pre_configure_target() {
  # unset LIBTOOL because freetype uses its own
-    ( cd ..
+  (
+    cd ..
    unset LIBTOOL
    sh autogen.sh
  )
--- a/packages/rust/rust/package.mk
+++ b/packages/rust/rust/package.mk
@ -99,7 +99,6 @@ progress.when = 'always'
 progress.width = 80

 END
-
 }

 make_host() {
--- 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"
-
--- a/packages/sysutils/util-linux/package.mk
+++ b/packages/sysutils/util-linux/package.mk
@ -85,7 +85,7 @@ 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
--- 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
 }
--- 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
--- 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
 }
--- 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
-