From b29791a9bf47e2f942a6ea82eab8bea380365fda Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sun, 14 Apr 2024 21:14:25 -0400 Subject: [PATCH] addons: automated code cleanup Signed-off-by: Ian Leonard --- packages/addons/addon-depends/podman/gpgme/package.mk | 4 ++-- packages/addons/service/boblightd/package.mk | 2 +- packages/addons/service/lcdd/package.mk | 2 +- packages/addons/service/librespot/package.mk | 2 +- packages/addons/service/minidlna/package.mk | 2 +- packages/addons/service/mpd/package.mk | 2 +- packages/addons/service/pcscd/package.mk | 2 +- packages/addons/service/podman/package.mk | 2 +- packages/addons/service/snapclient/package.mk | 2 +- packages/addons/service/tvheadend42/package.mk | 2 +- packages/addons/service/tvheadend43/package.mk | 2 +- packages/addons/service/vdr-addon/package.mk | 2 +- packages/addons/tools/ffmpeg-tools/package.mk | 2 +- packages/addons/tools/flirc_util/package.mk | 2 +- packages/addons/tools/network-tools/package.mk | 2 +- packages/addons/tools/rpi-tools/package.mk | 2 +- packages/addons/tools/system-tools/package.mk | 4 ++-- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/addons/addon-depends/podman/gpgme/package.mk b/packages/addons/addon-depends/podman/gpgme/package.mk index 416b58a8d6..b0379bb712 100644 --- 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" } diff --git a/packages/addons/service/boblightd/package.mk b/packages/addons/service/boblightd/package.mk index c1c5e719b5..81b59d3a5f 100644 --- 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 diff --git a/packages/addons/service/lcdd/package.mk b/packages/addons/service/lcdd/package.mk index 099f250051..ad9010e194 100644 --- 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 diff --git a/packages/addons/service/librespot/package.mk b/packages/addons/service/librespot/package.mk index 67748d54d0..978565bcce 100644 --- 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 \ diff --git a/packages/addons/service/minidlna/package.mk b/packages/addons/service/minidlna/package.mk index 3fb0c4a37f..82e88ad5cd 100644 --- 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 diff --git a/packages/addons/service/mpd/package.mk b/packages/addons/service/mpd/package.mk index 41fe638bdf..ebb35b5be5 100644 --- 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 diff --git a/packages/addons/service/pcscd/package.mk b/packages/addons/service/pcscd/package.mk index 3900b140d2..75c78fde97 100644 --- 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} diff --git a/packages/addons/service/podman/package.mk b/packages/addons/service/podman/package.mk index 70b1e1fd1c..ed3857e973 100644 --- 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 diff --git a/packages/addons/service/snapclient/package.mk b/packages/addons/service/snapclient/package.mk index 234b5f5287..a24cf929f8 100644 --- 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 diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk index b70e8c5d99..96b97ac455 100644 --- 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 diff --git a/packages/addons/service/tvheadend43/package.mk b/packages/addons/service/tvheadend43/package.mk index 95349bc5b3..2708b61884 100644 --- 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 diff --git a/packages/addons/service/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk index ae44c36a82..17b796a853 100644 --- 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 \ diff --git a/packages/addons/tools/ffmpeg-tools/package.mk b/packages/addons/tools/ffmpeg-tools/package.mk index a90d200cd0..2281649168 100644 --- 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 diff --git a/packages/addons/tools/flirc_util/package.mk b/packages/addons/tools/flirc_util/package.mk index a8a7caa83d..3f011432a5 100644 --- 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 } diff --git a/packages/addons/tools/network-tools/package.mk b/packages/addons/tools/network-tools/package.mk index 0118faeb7d..ce41b57343 100644 --- 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' } diff --git a/packages/addons/tools/rpi-tools/package.mk b/packages/addons/tools/rpi-tools/package.mk index 5b1cabbf1c..820829e4db 100644 --- 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/ diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk index beba9a4b09..0cfc2cd995 100644 --- 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' }