Merge pull request #8807 from antonlacon/le12-auto

Automated cleanup
2025-07-24 11:16:51 +00:00 · 2024-05-01 21:04:38 +02:00 · 2024-05-01 21:04:38 +02:00 · d938cb840b
commit d938cb840b
parent fbc5c64505 b90758e6f3
29 changed files with 33 additions and 33 deletions
--- a/packages/addons/addon-depends/podman/gpgme/package.mk
+++ b/packages/addons/addon-depends/podman/gpgme/package.mk
@ -25,6 +25,6 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-languages=cl \
                           --with-libassuan-prefix=$(get_install_dir libassuan)/usr"

 pre_configure_target() {
-  CFLAGS="${CFLAGS} -I$(get_install_dir libassuan)/usr/include"
-  LDFLAGS="${LDFLAGS} -L$(get_install_dir libassuan)/usr/lib"
+  CFLAGS+=" -I$(get_install_dir libassuan)/usr/include"
+  LDFLAGS+=" -L$(get_install_dir libassuan)/usr/lib"
 }
--- a/packages/addons/service/boblightd/package.mk
+++ b/packages/addons/service/boblightd/package.mk
@ -55,7 +55,7 @@ addon() {
    if [ "${DISPLAYSERVER}" = "x11" ]; then
      cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/boblight-X11 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
    fi
-    patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/boblight-*
+    patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/boblight-*

  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config
    cp -R ${PKG_DIR}/config/boblight.conf ${ADDON_BUILD}/${PKG_ADDON_ID}/config
--- a/packages/addons/service/lcdd/package.mk
+++ b/packages/addons/service/lcdd/package.mk
@ -42,7 +42,7 @@ addon() {

  cp -PR ${PKG_INSTALL}/etc/LCDd.conf ${ADDON_BUILD}/${PKG_ADDON_ID}/config/
  cp -PR ${PKG_INSTALL}/usr/lib       ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
-  patchelf --add-rpath '$ORIGIN/../../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/lcdproc/glcd.so
+  patchelf --add-rpath '${ORIGIN}/../../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/lcdproc/glcd.so
  cp -PR ${PKG_INSTALL}/usr/sbin      ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/

  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
--- a/packages/addons/service/librespot/package.mk
+++ b/packages/addons/service/librespot/package.mk
@ -37,7 +37,7 @@ addon() {
  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
    cp ${PKG_BUILD}/.${TARGET_NAME}/target/${TARGET_NAME}/release/librespot \
       ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-    patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/librespot
+    patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/librespot

  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
    cp $(get_build_dir avahi)/avahi-compat-libdns_sd/.libs/libdns_sd.so.1 \
--- a/packages/addons/service/minidlna/package.mk
+++ b/packages/addons/service/minidlna/package.mk
@ -35,7 +35,7 @@ pre_configure_target() {
 addon() {
  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
    cp -P ${PKG_INSTALL}/usr/sbin/minidlnad ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-    patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/minidlnad
+    patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/minidlnad

  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
    cp -p $(get_install_dir libexif)/usr/lib/libexif.so.12 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
--- a/packages/addons/service/mpd/package.mk
+++ b/packages/addons/service/mpd/package.mk
@ -102,7 +102,7 @@ addon() {
  # copy mpd cli binary
  cp -P $(get_install_dir mpd-mpc)/usr/bin/mpc ${ADDON_BUILD}/${PKG_ADDON_ID}/bin

-  patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/{mpc,mpd}
+  patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/{mpc,mpd}

  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
  cp -p $(get_install_dir libmpdclient)/usr/lib/libmpdclient.so ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
--- a/packages/addons/service/pcscd/package.mk
+++ b/packages/addons/service/pcscd/package.mk
@ -23,7 +23,7 @@ PKG_ADDON_TYPE="xbmc.service"
 addon() {
  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib.private}
    cp -Pa $(get_install_dir pcsc-lite)/usr/sbin/pcscd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/pcscd.bin
-    patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/pcscd.bin
+    patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/pcscd.bin
    cp -L $(get_install_dir polkit)/usr/lib/libpolkit-gobject-1.so.0 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private

  cp -a $(get_install_dir ccid)/storage/.kodi/addons/${PKG_ADDON_ID}/drivers ${ADDON_BUILD}/${PKG_ADDON_ID}
--- a/packages/addons/service/podman/package.mk
+++ b/packages/addons/service/podman/package.mk
@ -32,7 +32,7 @@ addon() {

    # podman
    cp -P $(get_build_dir podman-bin)/bin/podman ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-    patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/podman
+    patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/podman
    cp -P $(get_build_dir podman-bin)/bin/podman-remote ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/podman-remote

    # runc
--- a/packages/addons/service/snapclient/package.mk
+++ b/packages/addons/service/snapclient/package.mk
@ -22,7 +22,7 @@ addon() {

  cp $(get_install_dir snapcast)/usr/bin/snapclient \
     ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-  patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/snapclient
+  patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/snapclient

  cp $(get_install_dir alsa-plugins)/usr/lib/alsa/*.so \
     ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
--- a/packages/addons/service/tvheadend42/package.mk
+++ b/packages/addons/service/tvheadend42/package.mk
@ -126,7 +126,7 @@ addon() {
  if [ "${TARGET_ARCH}" = "x86_64" ]; then
    mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
    cp -P $(get_install_dir x265)/usr/lib/libx265.so.209 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
-    patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/{comskip,tvheadend}
+    patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/{comskip,tvheadend}
  fi

  # dvb-scan files
--- a/packages/addons/service/tvheadend43/package.mk
+++ b/packages/addons/service/tvheadend43/package.mk
@ -126,7 +126,7 @@ addon() {
  if [ "${TARGET_ARCH}" = "x86_64" ]; then
    mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
    cp -P $(get_install_dir x265)/usr/lib/libx265.so.209 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
-    patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/{comskip,tvheadend}
+    patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/{comskip,tvheadend}
  fi

  # dvb-scan files
--- a/packages/addons/service/vdr-addon/package.mk
+++ b/packages/addons/service/vdr-addon/package.mk
@ -53,7 +53,7 @@ addon() {
              vnsiserver wirbelscan wirbelscancontrol xmltv2vdr; do
    cp -PR $(get_build_dir vdr-plugin-${pkg})/libvdr*.so.* ${ADDON_BUILD}/${PKG_ADDON_ID}/plugin
  done
-  patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/plugin/libvdr-live.so.*
+  patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/plugin/libvdr-live.so.*

  # copy locale (omit ddci, dummydevice, robotv)
  for pkg in dvbapi eepg epgfixer epgsearch iptv live restfulapi satip vnsiserver wirbelscan \
--- a/packages/addons/tools/ffmpeg-tools/package.mk
+++ b/packages/addons/tools/ffmpeg-tools/package.mk
@ -22,7 +22,7 @@ addon() {
  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib.private}

  cp -L $(get_install_dir ffmpegx)/usr/local/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
-  patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/*
+  patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/*

  # libs
  if [ "${TARGET_ARCH}" = "x86_64" ]; then
--- a/packages/addons/tools/flirc_util/package.mk
+++ b/packages/addons/tools/flirc_util/package.mk
@ -33,6 +33,6 @@ make_target() {
 addon() {
  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib.private}
    cp -P ${PKG_BUILD}/build/flirc_util ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
-    patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/flirc_util
+    patchelf --add-rpath '${ORIGIN}/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/flirc_util
    cp -P $(get_install_dir hidapi)/usr/lib/libhidapi-hidraw.so* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
 }
--- a/packages/addons/tools/network-tools/package.mk
+++ b/packages/addons/tools/network-tools/package.mk
@ -102,5 +102,5 @@ addon() {
    ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwpriv

    find ${ADDON_BUILD}/${PKG_ADDON_ID}/bin -type f | \
-      xargs patchelf --add-rpath '$ORIGIN/../lib.private'
+      xargs patchelf --add-rpath '${ORIGIN}/../lib.private'
 }
--- a/packages/addons/tools/rpi-tools/package.mk
+++ b/packages/addons/tools/rpi-tools/package.mk
@ -24,7 +24,7 @@ addon() {
  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
    cp -PR $(get_build_dir lg-gpio)/liblgpio.so* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
    cp -PR $(get_build_dir lg-gpio)/PY_LGPIO/build/lib.linux*/* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
-    patchelf --add-rpath '$ORIGIN' ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/_lgpio*.so
+    patchelf --add-rpath '${ORIGIN}' ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/_lgpio*.so
    cp -PR $(get_build_dir gpiozero)/gpiozero ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/
    cp -PR $(get_build_dir colorzero)/colorzero ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/

--- a/packages/addons/tools/system-tools/package.mk
+++ b/packages/addons/tools/system-tools/package.mk
@ -122,7 +122,7 @@ addon() {
    cp -P $(get_install_dir i2c-tools)/usr/sbin/{i2cdetect,i2cdump,i2cget,i2cset} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin
    cp -P $(get_install_dir i2c-tools)/usr/lib/${PKG_PYTHON_VERSION}/site-packages/smbus.so \
      ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
-    patchelf --add-rpath '$ORIGIN' ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private/smbus.so
+    patchelf --add-rpath '${ORIGIN}' ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private/smbus.so
    cp -P $(get_install_dir i2c-tools)/usr/lib/libi2c.so.0.1.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private/libi2c.so
    cp -P $(get_install_dir i2c-tools)/usr/lib/libi2c.so.0.1.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private/libi2c.so.0
    cp -P $(get_install_dir i2c-tools)/usr/lib/libi2c.so.0.1.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private/libi2c.so.0.1.1
@ -188,5 +188,5 @@ addon() {
    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 | \
-      xargs patchelf --add-rpath '$ORIGIN/../lib.private'
+      xargs patchelf --add-rpath '${ORIGIN}/../lib.private'
 }
--- a/packages/audio/espeak-ng/package.mk
+++ b/packages/audio/espeak-ng/package.mk
@ -17,7 +17,7 @@ make_host() {
  (cd dictsource; ln -s ../../dictsource/* .)
  (cd phsource; ln -s ../../phsource/* .)
  cp -aP ../espeak-ng-data .
-  make DESTDIR=`pwd` -j1
+  make DESTDIR=$(pwd) -j1
 }

 make_target() {
--- 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} \
--- 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} \
--- a/packages/emulation/libretro-bsnes2014-performance/package.mk
+++ b/packages/emulation/libretro-bsnes2014-performance/package.mk
@ -16,7 +16,7 @@ PKG_LIBPATH="${PKG_LIBNAME}"
 PKG_LIBVAR="BSNES2014-PERFORMANCE_LIB"

 pre_make_target() {
-  if [ "${ARCH}" = "aarch64" ];then
+  if [ "${ARCH}" = "aarch64" ]; then
    LDFLAGS+=" -lgcc"
  fi
 }
--- a/packages/emulation/libretro-fbneo/package.mk
+++ b/packages/emulation/libretro-fbneo/package.mk
@ -20,7 +20,7 @@ PKG_MAKE_OPTS_TARGET="-C src/burner/libretro"
 if [ "${ARCH}" = "arm" ]; then
  PKG_MAKE_OPTS_TARGET+=" profile=performance"

-  if target_has_feature neon ; then
+  if target_has_feature neon; then
    PKG_MAKE_OPTS_TARGET+=" HAVE_NEON=1"
  fi

--- a/packages/emulation/libretro-mgba/package.mk
+++ b/packages/emulation/libretro-mgba/package.mk
@ -21,7 +21,7 @@ if [ "${ARCH}" = "arm" ]; then
  PKG_MAKE_OPTS_TARGET+=" platform=unix-armv"
 fi

-if target_has_feature neon ; then
+if target_has_feature neon; then
  PKG_MAKE_OPTS_TARGET+=" HAVE_NEON=1"
 fi

--- a/packages/emulation/libretro-mrboom/package.mk
+++ b/packages/emulation/libretro-mrboom/package.mk
@ -17,7 +17,7 @@ PKG_LIBVAR="MRBOOM_LIB"

 PKG_MAKE_OPTS_TARGET=""

-if target_has_feature neon ; then
+if target_has_feature neon; then
  PKG_MAKE_OPTS_TARGET+=" HAVE_NEON=1"
 fi

--- a/packages/emulation/libretro-pcsx-rearmed/package.mk
+++ b/packages/emulation/libretro-pcsx-rearmed/package.mk
@ -31,7 +31,7 @@ fi

 if [ "${ARCH}" = "arm" ]; then
  PKG_MAKE_OPTS_TARGET+=" DYNAREC=ari64"
-  if target_has_feature neon ; then
+  if target_has_feature neon; then
    PKG_MAKE_OPTS_TARGET+=" HAVE_NEON_ASM=1 BUILTIN_GPU=neon"
  else
    PKG_MAKE_OPTS_TARGET+=" HAVE_NEON_ASM=0 BUILTIN_GPU=unai"
--- a/packages/emulation/libretro-snes9x2010/package.mk
+++ b/packages/emulation/libretro-snes9x2010/package.mk
@ -19,7 +19,7 @@ PKG_LIBVAR="SNES9X2010_LIB"

 PKG_MAKE_OPTS_TARGET="-f Makefile.libretro"

-if [ "${PROJECT}" = "Rockchip" -a "${DEVICE}" = "OdroidGoAdvance" ];then 
+if [ "${PROJECT}" = "Rockchip" -a "${DEVICE}" = "OdroidGoAdvance" ]; then
  PKG_MAKE_OPTS_TARGET+=" platform=goa_armv8_a35"
 fi

--- a/packages/emulation/libretro-uae4arm/package.mk
+++ b/packages/emulation/libretro-uae4arm/package.mk
@ -20,7 +20,7 @@ PKG_MAKE_OPTS_TARGET="-f Makefile.libretro"

 if [ "${ARCH}" = "aarch64" ]; then
  PKG_MAKE_OPTS_TARGET+=" platform=unix-aarch64"
-elif target_has_feature neon ; then
+elif target_has_feature neon; then
  PKG_MAKE_OPTS_TARGET+=" platform=unix-neon"
 else
  PKG_MAKE_OPTS_TARGET+=" platform=unix"
--- a/packages/sysutils/busybox/package.mk
+++ b/packages/sysutils/busybox/package.mk
@ -117,7 +117,7 @@ makeinstall_target() {
    cp ${PKG_DIR}/scripts/apt-get ${INSTALL}/usr/bin/
    cp ${PKG_DIR}/scripts/sudo ${INSTALL}/usr/bin/
    cp ${PKG_DIR}/scripts/pastebinit ${INSTALL}/usr/bin/
-      sed -e "s/@DISTRONAME@-@OS_VERSION@/${DISTRONAME}-$OS_VERSION/g" \
+      sed -e "s/@DISTRONAME@-@OS_VERSION@/${DISTRONAME}-${OS_VERSION}/g" \
          -i ${INSTALL}/usr/bin/pastebinit
      ln -sf pastebinit ${INSTALL}/usr/bin/paste
    cp ${PKG_DIR}/scripts/vfd-clock ${INSTALL}/usr/bin/
--- a/packages/tools/rpi-eeprom/package.mk
+++ b/packages/tools/rpi-eeprom/package.mk
@ -12,7 +12,7 @@ PKG_LONGDESC="rpi-eeprom: firmware, config and scripts to update RPi4 SPI bootlo
 PKG_TOOLCHAIN="manual"

 makeinstall_target() {
-  
+
  if [ "${DEVICE}" = "RPi4" ]; then
    _variant="2711"
  else