From eeab3d92b45f7ab5b0aeda041a005afeef2a5cbe Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:33:41 +0000 Subject: [PATCH 01/27] addons: automated code cleanup Signed-off-by: Ian Leonard --- .../Adafruit_Python_ADS1x15/package.mk | 2 +- .../Adafruit_Python_ADXL345/package.mk | 2 +- .../Adafruit_Python_BMP/package.mk | 2 +- .../Adafruit_Python_CharLCD/package.mk | 2 +- .../Adafruit_Python_DHT/package.mk | 10 +-- .../Adafruit_Python_GPIO/package.mk | 2 +- .../Adafruit_Python_LED_Backpack/package.mk | 2 +- .../Adafruit_Python_LSM303/package.mk | 2 +- .../Adafruit_Python_MCP3008/package.mk | 2 +- .../Adafruit_Python_MCP4725/package.mk | 2 +- .../Adafruit_Python_PCA9685/package.mk | 2 +- .../Adafruit_Python_PureIO/package.mk | 2 +- .../Adafruit_Python_SI1145/package.mk | 2 +- .../Adafruit_Python_SSD1306/package.mk | 2 +- .../Adafruit_Python_TCS34725/package.mk | 2 +- .../Adafruit_Python_VCNL40xx/package.mk | 2 +- .../Adafruit_Python_WS2801/package.mk | 2 +- .../chrome-depends/at-spi2-atk/package.mk | 2 +- .../chrome-depends/at-spi2-core/package.mk | 4 +- .../chrome-depends/atk/package.mk | 2 +- .../chrome-libXcomposite/package.mk | 6 +- .../chrome-libXdamage/package.mk | 6 +- .../chrome-libXfixes/package.mk | 6 +- .../chrome-depends/chrome-libXi/package.mk | 6 +- .../chrome-libXrender/package.mk | 6 +- .../chrome-depends/chrome-libXtst/package.mk | 6 +- .../chrome-depends/chrome-libxcb/package.mk | 6 +- .../chrome-libxkbcommon/package.mk | 6 +- .../chrome-depends/cups/package.mk | 6 +- .../chrome-depends/gdk-pixbuf/package.mk | 2 +- .../chrome-depends/gtk3/package.mk | 6 +- .../chrome-depends/harfbuzz-icu/package.mk | 4 +- .../chrome-depends/itstool/package.mk | 2 +- .../chrome-depends/libXScrnSaver/package.mk | 2 +- .../chrome-depends/libXcursor/package.mk | 2 +- .../chrome-depends/libXft/package.mk | 2 +- .../chrome-depends/libxss/package.mk | 2 +- .../chrome-depends/pango/package.mk | 2 +- .../chrome-depends/scrnsaverproto/package.mk | 2 +- .../chrome-depends/unclutter/package.mk | 8 +- .../addon-depends/containerd/package.mk | 4 +- .../addons/addon-depends/cxxtools/package.mk | 6 +- .../dvb-tools-depends/blindscan-s2/package.mk | 6 +- .../dvb-tools-depends/dvblast/package.mk | 2 +- .../dvb-tools-depends/dvbsnoop/package.mk | 2 +- .../dvb-tools-depends/mumudvb/package.mk | 2 +- .../dvb-tools-depends/szap-s2/package.mk | 6 +- .../dvb-tools-depends/t2scan/package.mk | 2 +- .../dvb-tools-depends/tune-s2/package.mk | 6 +- .../dvb-tools-depends/w_scan/package.mk | 2 +- packages/addons/addon-depends/enca/package.mk | 16 ++-- packages/addons/addon-depends/enet/package.mk | 4 +- .../addons/addon-depends/faad2/package.mk | 2 +- .../ffmpegx-depends/libvpx/package.mk | 10 +-- .../ffmpegx-depends/x264/package.mk | 24 ++--- .../ffmpegx-depends/x265/package.mk | 2 +- .../addons/addon-depends/ffmpegx/package.mk | 62 ++++++------- .../game-tools/bchunk/package.mk | 8 +- .../game-tools/ecm-tools/package.mk | 2 +- .../addon-depends/game-tools/iat/package.mk | 2 +- .../game-tools/linuxconsoletools/package.mk | 4 +- packages/addons/addon-depends/go/package.mk | 2 +- .../inadyn/libconfuse/package.mk | 2 +- .../addons/addon-depends/jasper/package.mk | 4 +- .../jre-depends/jdk-aarch64-zulu/package.mk | 2 +- .../jre-depends/jdk-arm-zulu/package.mk | 6 +- .../jre-depends/jdk-x86_64-zulu/package.mk | 2 +- .../jre-depends/jre-libXinerama/package.mk | 4 +- .../jre-depends/jre-libbluray/package.mk | 4 +- .../lcdd-depends/libugpio/package.mk | 2 +- .../lcdd-depends/serdisplib/package.mk | 24 ++--- .../addons/addon-depends/libconfig/package.mk | 6 +- .../addons/addon-depends/libdvbcsa/package.mk | 14 +-- .../addons/addon-depends/libexif/package.mk | 2 +- .../addons/addon-depends/libiconv/package.mk | 6 +- .../addons/addon-depends/libid3tag/package.mk | 4 +- .../addons/addon-depends/libmad/package.mk | 10 +-- .../addon-depends/libnetwork/package.mk | 10 +-- .../librespot-depends/rust/package.mk | 34 +++---- .../librespot-depends/rustup.rs/package.mk | 2 +- .../addon-depends/libvncserver/package.mk | 2 +- .../addons/addon-depends/libzip/package.mk | 2 +- .../depends/libmediainfo/package.mk | 18 ++-- .../depends/libzen/package.mk | 18 ++-- .../mediainfo/package.mk | 6 +- .../mesa-demos/package.mk | 10 +-- .../mpg123/package.mk | 2 +- .../mpv-drmprime/package.mk | 22 ++--- .../opencaster/package.mk | 6 +- .../squeezelite/package.mk | 10 +-- .../tsdecrypt/package.mk | 4 +- .../tstools/package.mk | 4 +- .../network-tools-depends/bwm-ng/package.mk | 2 +- .../depends/libpcap/package.mk | 2 +- .../depends/libstatgrab/package.mk | 2 +- .../network-tools-depends/iftop/package.mk | 6 +- .../network-tools-depends/iperf/package.mk | 2 +- .../network-tools-depends/irssi/package.mk | 6 +- .../network-tools-depends/lftp/package.mk | 4 +- .../network-tools-depends/ncftp/package.mk | 6 +- .../network-tools-depends/ngrep/package.mk | 6 +- .../network-tools-depends/nmap/package.mk | 8 +- .../network-tools-depends/rar2fs/package.mk | 10 +-- .../network-tools-depends/sshfs/package.mk | 2 +- .../network-tools-depends/tcpdump/package.mk | 2 +- .../network-tools-depends/udpxy/package.mk | 6 +- .../wireless_tools/package.mk | 8 +- packages/addons/addon-depends/opus/package.mk | 6 +- .../addons/addon-depends/pngquant/package.mk | 10 +-- .../addons/addon-depends/protobuf/package.mk | 12 +-- .../addons/addon-depends/qtbase/package.mk | 2 +- .../rpi-tools-depends/RPi.GPIO/package.mk | 10 +-- .../rpi-tools-depends/gpiozero/package.mk | 2 +- .../lan951x-led-ctl/package.mk | 8 +- .../addon-depends/rpi_ws281x/package.mk | 2 +- .../rsyslog-depends/libestr/package.mk | 2 +- .../rsyslog-depends/libfastjson/package.mk | 2 +- .../rsyslog-depends/liblogging/package.mk | 2 +- .../rsyslog-depends/liblognorm/package.mk | 2 +- .../rsyslog-depends/librelp/package.mk | 2 +- packages/addons/addon-depends/runc/package.mk | 10 +-- .../snapcast-depends/aixlog/package.mk | 2 +- .../snapcast-depends/alsa-plugins/package.mk | 10 +-- .../snapcast-depends/asio/package.mk | 2 +- .../snapcast-depends/popl/package.mk | 6 +- .../shairport-sync/package.mk | 2 +- .../snapcast-depends/snapcast/package.mk | 10 +-- .../system-tools-depends/autossh/package.mk | 6 +- .../depends/efivar/package.mk | 14 +-- .../depends/libmtp/package.mk | 2 +- .../depends/libssh2/package.mk | 2 +- .../depends/oniguruma/package.mk | 2 +- .../system-tools-depends/diffutils/package.mk | 2 +- .../system-tools-depends/dstat/package.mk | 8 +- .../system-tools-depends/dtach/package.mk | 4 +- .../efibootmgr/package.mk | 10 +-- .../system-tools-depends/encfs/package.mk | 4 +- .../system-tools-depends/evtest/package.mk | 2 +- .../getscancodes/package.mk | 8 +- .../system-tools-depends/hddtemp/package.mk | 4 +- .../hid_mapper/package.mk | 4 +- .../system-tools-depends/htop/package.mk | 2 +- .../system-tools-depends/i2c-tools/package.mk | 14 +-- .../inotify-tools/package.mk | 4 +- .../system-tools-depends/jq/package.mk | 2 +- .../lm_sensors/package.mk | 8 +- .../system-tools-depends/lshw/package.mk | 2 +- .../system-tools-depends/mc/package.mk | 14 +-- .../system-tools-depends/nmon/package.mk | 12 +-- .../system-tools-depends/patch/package.mk | 2 +- .../system-tools-depends/pv/package.mk | 2 +- .../system-tools-depends/screen/package.mk | 2 +- .../smartmontools/package.mk | 2 +- .../system-tools-depends/st/package.mk | 4 +- .../system-tools-depends/strace/package.mk | 2 +- .../system-tools-depends/stress-ng/package.mk | 2 +- .../system-tools-depends/unrar/package.mk | 32 +++---- .../system-tools-depends/vim/package.mk | 8 +- .../tinc-depends/miniupnpc/package.mk | 2 +- packages/addons/addon-depends/tini/package.mk | 2 +- .../addons/addon-depends/tntnet/package.mk | 8 +- .../addons/addon-depends/tslib/package.mk | 20 ++--- .../ttyd-depends/libwebsockets/package.mk | 2 +- .../tvh-dtv-scan-tables/package.mk | 4 +- .../vdr-plugins/vdr-plugin-ddci2/package.mk | 12 +-- .../vdr-plugin-dummydevice/package.mk | 8 +- .../vdr-plugins/vdr-plugin-dvbapi/package.mk | 10 +-- .../vdr-plugins/vdr-plugin-eepg/package.mk | 10 +-- .../vdr-plugin-epgfixer/package.mk | 10 +-- .../vdr-plugin-epgsearch/package.mk | 10 +-- .../vdr-plugins/vdr-plugin-iptv/package.mk | 10 +-- .../vdr-plugins/vdr-plugin-live/package.mk | 12 +-- .../vdr-plugin-restfulapi/package.mk | 10 +-- .../vdr-plugins/vdr-plugin-robotv/package.mk | 12 +-- .../vdr-plugins/vdr-plugin-satip/package.mk | 10 +-- .../vdr-plugin-streamdev/package.mk | 12 +-- .../vdr-plugin-vnsiserver/package.mk | 10 +-- .../vdr-plugin-wirbelscan/package.mk | 4 +- .../vdr-plugin-wirbelscancontrol/package.mk | 6 +- .../vdr-plugin-xmltv2vdr/package.mk | 8 +- packages/addons/addon-depends/vdr/package.mk | 6 +- .../addons/addon-depends/whois/package.mk | 2 +- packages/addons/browser/chrome/package.mk | 10 +-- packages/addons/driver/hdhomerun/package.mk | 6 +- .../addons/driver/sundtek-mediatv/package.mk | 20 ++--- .../libraries/adafruit-libraries/package.mk | 36 ++++---- .../repository.linuxserver.docker/package.mk | 8 +- .../addons/script/driverselect/package.mk | 2 +- .../script/script.config.vdr/package.mk | 12 +-- packages/addons/service/boblightd/package.mk | 42 ++++----- packages/addons/service/docker/package.mk | 10 +-- packages/addons/service/hyperion/package.mk | 24 ++--- packages/addons/service/inadyn/package.mk | 8 +- packages/addons/service/lcdd/package.mk | 32 +++---- packages/addons/service/librespot/package.mk | 16 ++-- packages/addons/service/locale/package.mk | 26 +++--- packages/addons/service/minidlna/package.mk | 18 ++-- packages/addons/service/minisatip/package.mk | 16 ++-- packages/addons/service/mpd/package.mk | 14 +-- packages/addons/service/net-snmp/package.mk | 10 +-- packages/addons/service/oscam/package.mk | 16 ++-- packages/addons/service/pcscd/package.mk | 10 +-- packages/addons/service/proftpd/package.mk | 26 +++--- packages/addons/service/rsyslog/package.mk | 20 ++--- packages/addons/service/snapclient/package.mk | 10 +-- packages/addons/service/snapserver/package.mk | 6 +- packages/addons/service/tigervnc/package.mk | 16 ++-- packages/addons/service/tinc/package.mk | 10 +-- .../addons/service/touchscreen/package.mk | 12 +-- packages/addons/service/ttyd/package.mk | 16 ++-- .../addons/service/tvheadend42/package.mk | 56 ++++++------ packages/addons/service/usbmuxd/package.mk | 4 +- packages/addons/service/vdr-addon/package.mk | 36 ++++---- packages/addons/skin/estouchy/package.mk | 4 +- packages/addons/tools/btrfs-progs/package.mk | 6 +- .../addons/tools/dotnet-runtime/package.mk | 12 +-- packages/addons/tools/dvb-tools/package.mk | 40 ++++----- packages/addons/tools/ffmpeg-tools/package.mk | 4 +- packages/addons/tools/game-tools/package.mk | 16 ++-- packages/addons/tools/jre.zulu/package.mk | 14 +-- .../addons/tools/multimedia-tools/package.mk | 16 ++-- .../addons/tools/network-tools/package.mk | 50 +++++------ packages/addons/tools/rpi-tools/package.mk | 10 +-- packages/addons/tools/system-tools/package.mk | 88 +++++++++---------- 224 files changed, 963 insertions(+), 963 deletions(-) diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk index a73fadf632..0c8a88960b 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADS1x15/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="a963cc0ee83e2ba6d671b02df5febf7250f626aa" PKG_SHA256="2f81a9a6b7b7f46b79faa5b01df0c25fa5f16af80842d74e35b5fbf01ab0c619" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the ADS1015 and ADS1115 analog to digital converters with a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk index 76e1371b57..fefd2df3e0 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_ADXL345/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="dca3d90b5477a304fa130f5cc90ea59e3968ce6f" PKG_SHA256="22ec0fc6679cc3e9b5f0aff5cfeef34cbbf13e59aecfb829c2f0dc2d90b5fb8b" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the ADXL345 triple-axis accelerometer over I2C with a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk index ef2f9eb563..68f733057b 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_BMP/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="e8521e969afae3321d9789353d7e92ea9a5e9a56" PKG_SHA256="e5e140c34e312f6a00c62b1bd47ebe3f1857009b1c202c18c7b092ebb2e1eb9c" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python library for accessing the BMP series pressure and temperature sensors like the BMP085/BMP180 on a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk index 875a13ba1c..d975b959d4 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_CharLCD/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="bc75cad284766240424f29dc8e7b84d0caceb72e" PKG_SHA256="eae4b446162feb533a469a9dacf6e750250f925561c9f7983a11d340e1dd98d4" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python library for accessing Adafruit character LCDs from a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk index eed74cebff..e4fedee1a6 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_DHT/package.mk @@ -6,18 +6,18 @@ PKG_VERSION="18846deec6a96572b3f2c4a9edfb5bac55b46f5b" PKG_SHA256="9125f8f42b4874db257a45184b866e8b424aa67230d2ffbc734b53686da7817f" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python library to read the DHT series of humidity and temperature sensors on a Raspberry Pi." PKG_TOOLCHAIN="manual" pre_make_target() { - export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" - export LDSHARED="$CC -shared" + export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr" + export LDSHARED="${CC} -shared" } make_target() { - case "$PROJECT:$DEVICE" in + case "${PROJECT}:${DEVICE}" in "RPi:RPi") PKG_RPI_VERSION="--force-pi" ;; @@ -28,5 +28,5 @@ make_target() { PKG_RPI_VERSION="" esac - python3 setup.py build $PKG_RPI_VERSION --cross-compile + python3 setup.py build ${PKG_RPI_VERSION} --cross-compile } diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk index 3ca10bd492..66f433ce69 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_GPIO/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="c543d1df9c0a71bafb9f0a1f9dceecd79a920e74" PKG_SHA256="d3cb74fd033ebe5aea1786a584d64ef5eb8082ef2bf0a568b01691612cd04e88" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Library to provide a cross-platform GPIO interface on the Raspberry Pi ." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk index 74d7f88ad5..b2dea34d42 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LED_Backpack/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="e34b9548e86e63747563a94f02b65b2980fdefff" PKG_SHA256="244d2625cdaebdc68e299fedde276efa5c9f7c143681c4ee056fb8350a4f7167" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python library for controlling LED backpack displays." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk index 3317084c5c..11c0ca32d6 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_LSM303/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="37d288844515d7bb62a2329982eb033e92dceceb" PKG_SHA256="609591f2add15e849d3bba320417c705a50a3ed077632baf20c12c8b740d5331" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the LSM303 accelerometer & magnetometer with Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk index d6101f6583..6b98f74467 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP3008/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="e721d26e650c99b0f6d3efd4ec30444e1adf5ccd" PKG_SHA256="f5e4c847a87716c16f0209df95c281b5071549644a79a143a77b212f25c464dc" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the MCP3008 analog to digital converter with a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk index ce4da41ae7..357869b27f 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_MCP4725/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="4d028bbcf58b011a8f14c5d95057b7e1dcc1064e" PKG_SHA256="6ebbd1f76807b01dc2b723064e52b0c82fc45388265b8ec867e0a42a46a6e926" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the MCP4725 digital to analog converter with a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk index 68ef549477..ea54877d60 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PCA9685/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="f86db2ca5de379748afd71e379ce2155f47d21e7" PKG_SHA256="46e11dcfbfaab5756ddeb6ab31740cf8c7419ec1d32be2519f19882e7d86e426" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the PCA9685 PWM servo/LED controller with a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk index 974547bcb6..4ca39414b5 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_PureIO/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="6f4976d91c52d70b67b28bba75a429b5328a52c1" PKG_SHA256="891a4d077fe6610de6aa4b0dc5b9933a6c7db3492072df60c0383662f28c2ae9" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Pure python access to Linux IO including I2C and SPI." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk index 0a55c11674..2a7876c849 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SI1145/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="18c400643b39dbf29ab7ff8e74ab0c5c36ef5cf1" PKG_SHA256="0238b2c01cfbb2890ae78468d2fc19c815748fc94860a4eb92b649d074476264" PKG_LICENSE="MIT" PKG_SITE="https://github.com/THP-JOE/Python_SI1145" -PKG_URL="https://github.com/THP-JOE/Python_SI1145/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/THP-JOE/Python_SI1145/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python library for accessing the SI1145 temperature sensor on a Raspberry Pi" PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk index 513d4d8807..b8af29e488 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_SSD1306/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="8819e2d203df49f2843059d981b7347d9881c82b" PKG_SHA256="ed1163dee2fe6c0c2065a429e1d93cff7397a309071ff83714c84566739680a2" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="SSD1306 oled driver library for 'monochrome' 128x64 and 128x32 OLEDs." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk index af3e4ec978..cba9019c39 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_TCS34725/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="6306f90b4601237a852acef89eeecc1261ce38b3" PKG_SHA256="f2c3218551da55d7fdbe2499a6ffa3a0b8ed1709e4402c6b0e0f37b17d4aa81f" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the TCS34725 color sensor with the Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk index cbe10ab385..d16e9da3ad 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_VCNL40xx/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="5c72575b7390fbedfae0b5fb2a881ca9efe9ca22" PKG_SHA256="78346836965562720248138203a4af9dc6aa18815bda2a5b7842e3b9af9d1ea8" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to use the VCNL4000 & VCNL4010 proximity sensors with the Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk index 43ebf971a8..d26f29e561 100644 --- a/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk +++ b/packages/addons/addon-depends/adafruit-libraries-depends/Adafruit_Python_WS2801/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="d0c190715ffef1b00e5ffa2d7b7560e7f8ed4263" PKG_SHA256="6219edb5c1d767ff950f5020bacdfb5ba608b4995eb14d6073fdec2f17f584cb" PKG_LICENSE="MIT" PKG_SITE="https://github.com/adafruit/${PKG_NAME}" -PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/adafruit/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="Python code to control WS2801 and similar SPI interface addressable RGB LED strips on a Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/chrome-depends/at-spi2-atk/package.mk b/packages/addons/addon-depends/chrome-depends/at-spi2-atk/package.mk index ac5b402208..f82675e465 100644 --- a/packages/addons/addon-depends/chrome-depends/at-spi2-atk/package.mk +++ b/packages/addons/addon-depends/chrome-depends/at-spi2-atk/package.mk @@ -7,6 +7,6 @@ PKG_VERSION="2.38.0" PKG_SHA256="cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f" PKG_LICENSE="OSS" PKG_SITE="http://www.gnome.org/" -PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/${PKG_VERSION:0:4}/at-spi2-atk-$PKG_VERSION.tar.xz" +PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-atk/${PKG_VERSION:0:4}/at-spi2-atk-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain at-spi2-core atk libX11 libxml2" PKG_LONGDESC="A GTK+ module that bridges ATK to D-Bus at-spi." diff --git a/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk b/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk index 9d90e91f86..a8466e68c5 100644 --- a/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk +++ b/packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.39.1" PKG_SHA256="44d2b042e47d25571581efff673af0a8cd79531babbad2b043784879e15e4228" PKG_LICENSE="OSS" PKG_SITE="http://www.gnome.org/" -PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-$PKG_VERSION.tar.xz" +PKG_URL="https://ftp.gnome.org/pub/gnome/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain atk dbus glib libXtst" PKG_LONGDESC="Protocol definitions and daemon for D-Bus at-spi." @@ -16,5 +16,5 @@ PKG_MESON_OPTS_TARGET="-Denable_docs=false \ -Ddbus_daemon=/usr/bin/dbus-daemon" pre_configure_target() { - TARGET_LDFLAGS="$LDFLAGS -lXext" + TARGET_LDFLAGS="${LDFLAGS} -lXext" } diff --git a/packages/addons/addon-depends/chrome-depends/atk/package.mk b/packages/addons/addon-depends/chrome-depends/atk/package.mk index 46833214e3..456b6617b4 100644 --- a/packages/addons/addon-depends/chrome-depends/atk/package.mk +++ b/packages/addons/addon-depends/chrome-depends/atk/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.36.0" PKG_SHA256="fb76247e369402be23f1f5c65d38a9639c1164d934e40f6a9cf3c9e96b652788" PKG_LICENSE="GPL" PKG_SITE="http://library.gnome.org/devel/atk/" -PKG_URL="https://ftp.gnome.org/pub/gnome/sources/atk/${PKG_VERSION:0:4}/atk-$PKG_VERSION.tar.xz" +PKG_URL="https://ftp.gnome.org/pub/gnome/sources/atk/${PKG_VERSION:0:4}/atk-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain glib glib:host" PKG_LONGDESC="Provides the set of accessibility interfaces that are implemented by other applications." PKG_BUILD_FLAGS="+pic" diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk index f7cf5a031e..3dfd366f86 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk @@ -9,11 +9,11 @@ PKG_URL="" PKG_DEPENDS_UNPACK+=" libXcomposite" PKG_BUILD_FLAGS="-sysroot" -PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \ +PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \ --disable-static \ --enable-shared" unpack() { - mkdir -p $PKG_BUILD - tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD + mkdir -p ${PKG_BUILD} + tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD} } diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk index daa3092630..27e67b709f 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk @@ -9,11 +9,11 @@ PKG_URL="" PKG_DEPENDS_UNPACK+=" libXdamage" PKG_BUILD_FLAGS="-sysroot" -PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \ +PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \ --disable-static \ --enable-shared" unpack() { - mkdir -p $PKG_BUILD - tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD + mkdir -p ${PKG_BUILD} + tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD} } diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk index 8168c904bd..ca767e58bb 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk @@ -9,11 +9,11 @@ PKG_URL="" PKG_DEPENDS_UNPACK+=" libXfixes" PKG_BUILD_FLAGS="-sysroot" -PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \ +PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \ --disable-static \ --enable-shared" unpack() { - mkdir -p $PKG_BUILD - tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD + mkdir -p ${PKG_BUILD} + tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD} } diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk index b1b77c3d39..d13753890b 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk @@ -9,11 +9,11 @@ PKG_URL="" PKG_DEPENDS_UNPACK+=" libXi" PKG_BUILD_FLAGS="-sysroot" -PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \ +PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \ --disable-static \ --enable-shared" unpack() { - mkdir -p $PKG_BUILD - tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD + mkdir -p ${PKG_BUILD} + tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD} } diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk index ca5a9a08d4..aff4ca0c3f 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk @@ -9,11 +9,11 @@ PKG_URL="" PKG_DEPENDS_UNPACK+=" libXrender" PKG_BUILD_FLAGS="-sysroot" -PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \ +PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \ --disable-static \ --enable-shared" unpack() { - mkdir -p $PKG_BUILD - tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD + mkdir -p ${PKG_BUILD} + tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD} } diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk index e5cbb8990d..c00c409738 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk @@ -9,11 +9,11 @@ PKG_URL="" PKG_DEPENDS_UNPACK+=" libXtst" PKG_BUILD_FLAGS="-sysroot" -PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \ +PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \ --disable-static \ --enable-shared" unpack() { - mkdir -p $PKG_BUILD - tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD + mkdir -p ${PKG_BUILD} + tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD} } diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk index 2879084f49..56b4afdeeb 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk @@ -9,11 +9,11 @@ PKG_URL="" PKG_DEPENDS_UNPACK+=" libxcb" PKG_BUILD_FLAGS="-sysroot" -PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \ +PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_TARGET} \ --disable-static \ --enable-shared" unpack() { - mkdir -p $PKG_BUILD - tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.xz -C $PKG_BUILD + mkdir -p ${PKG_BUILD} + tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD} } diff --git a/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk b/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk index 4f7431c89e..3846dabfda 100644 --- a/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk +++ b/packages/addons/addon-depends/chrome-depends/chrome-libxkbcommon/package.mk @@ -9,11 +9,11 @@ PKG_URL="" PKG_DEPENDS_UNPACK+=" libxkbcommon" PKG_BUILD_FLAGS="-sysroot" -PKG_MESON_OPTS_TARGET="$PKG_MESON_OPTS_TARGET \ +PKG_MESON_OPTS_TARGET="${PKG_MESON_OPTS_TARGET} \ -Denable-static=false \ -Denable-shared=true" unpack() { - mkdir -p $PKG_BUILD - tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.xz -C $PKG_BUILD + mkdir -p ${PKG_BUILD} + tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:7}/${PKG_NAME:7}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD} } diff --git a/packages/addons/addon-depends/chrome-depends/cups/package.mk b/packages/addons/addon-depends/chrome-depends/cups/package.mk index 29cfcb3f20..7f3e141401 100644 --- a/packages/addons/addon-depends/chrome-depends/cups/package.mk +++ b/packages/addons/addon-depends/chrome-depends/cups/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.3.3" PKG_SHA256="fe298713aad0cbb861de24760f140851122caae9f34d480dbfff0bd9211d961a" PKG_LICENSE="GPL" PKG_SITE="http://www.cups.org" -PKG_URL="https://github.com/apple/cups/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/apple/cups/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain openssl zlib" PKG_LONGDESC="CUPS printing system." PKG_BUILD_FLAGS="+pic -sysroot" @@ -22,9 +22,9 @@ PKG_CONFIGURE_OPTS_TARGET="--libdir=/usr/lib \ pre_configure_target() { cd .. - rm -rf .$TARGET_NAME + rm -rf .${TARGET_NAME} } makeinstall_target() { - make BUILDROOT="$INSTALL" install + make BUILDROOT="${INSTALL}" install } diff --git a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk index 04e70a72f7..563a28821f 100644 --- a/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk +++ b/packages/addons/addon-depends/chrome-depends/gdk-pixbuf/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.42.2" PKG_SHA256="83c66a1cfd591d7680c144d2922c5955d38b4db336d7cd3ee109f7bcf9afef15" PKG_LICENSE="OSS" PKG_SITE="http://www.gtk.org/" -PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_VERSION:0:4}/gdk-pixbuf-$PKG_VERSION.tar.xz" +PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_VERSION:0:4}/gdk-pixbuf-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain glib libjpeg-turbo libpng jasper shared-mime-info tiff libX11" PKG_DEPENDS_CONFIG="shared-mime-info" PKG_LONGDESC="GdkPixbuf is a a GNOME library for image loading and manipulation." diff --git a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk index a0971d0d33..0d5f8ce001 100644 --- a/packages/addons/addon-depends/chrome-depends/gtk3/package.mk +++ b/packages/addons/addon-depends/chrome-depends/gtk3/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="3.24.23" PKG_SHA256="5d864d248357a2251545b3387b35942de5f66e4c66013f0962eb5cb6f8dae2b1" PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" -PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-$PKG_VERSION.tar.xz" +PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain at-spi2-atk atk cairo gdk-pixbuf glib libX11 libXi libXrandr libepoxy pango" PKG_DEPENDS_CONFIG="libXft pango gdk-pixbuf shared-mime-info" PKG_LONGDESC="A library for creating graphical user interfaces for the X Window System." @@ -31,7 +31,7 @@ PKG_MESON_OPTS_TARGET="-Dbroadway_backend=false \ -Dx11_backend=true" pre_configure_target() { - # $TOOLCHAIN/bin/glib-compile-resources requires $TOOLCHAIN/lib/libffi.so.6 - export LD_LIBRARY_PATH="$TOOLCHAIN/lib:$LD_LIBRARY_PATH" + # ${TOOLCHAIN}/bin/glib-compile-resources requires ${TOOLCHAIN}/lib/libffi.so.6 + export LD_LIBRARY_PATH="${TOOLCHAIN}/lib:${LD_LIBRARY_PATH}" export GLIB_COMPILE_RESOURCES=glib-compile-resources GLIB_MKENUMS=glib-mkenums GLIB_GENMARSHAL=glib-genmarshal } diff --git a/packages/addons/addon-depends/chrome-depends/harfbuzz-icu/package.mk b/packages/addons/addon-depends/chrome-depends/harfbuzz-icu/package.mk index 67e7b35986..c5ed2ddb94 100644 --- a/packages/addons/addon-depends/chrome-depends/harfbuzz-icu/package.mk +++ b/packages/addons/addon-depends/chrome-depends/harfbuzz-icu/package.mk @@ -22,6 +22,6 @@ PKG_MESON_OPTS_TARGET="-Dcairo=enabled \ -Dicu=enabled" unpack() { - mkdir -p $PKG_BUILD - tar --strip-components=1 -xf $SOURCES/${PKG_NAME:0:8}/${PKG_NAME:0:8}-$PKG_VERSION.tar.xz -C $PKG_BUILD + mkdir -p ${PKG_BUILD} + tar --strip-components=1 -xf ${SOURCES}/${PKG_NAME:0:8}/${PKG_NAME:0:8}-${PKG_VERSION}.tar.xz -C ${PKG_BUILD} } diff --git a/packages/addons/addon-depends/chrome-depends/itstool/package.mk b/packages/addons/addon-depends/chrome-depends/itstool/package.mk index e3801a0546..c9fcc36a40 100644 --- a/packages/addons/addon-depends/chrome-depends/itstool/package.mk +++ b/packages/addons/addon-depends/chrome-depends/itstool/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="2.0.6" PKG_SHA256="6233cc22726a9a5a83664bf67d1af79549a298c23185d926c3677afa917b92a9" PKG_LICENSE="GPLv3" PKG_SITE="http://itstool.org" -PKG_URL="http://files.itstool.org/itstool/itstool-$PKG_VERSION.tar.bz2" +PKG_URL="http://files.itstool.org/itstool/itstool-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_HOST="toolchain libxml2:host" PKG_LONGDESC="ITS Tool allows you to translate your XML documents with PO files." diff --git a/packages/addons/addon-depends/chrome-depends/libXScrnSaver/package.mk b/packages/addons/addon-depends/chrome-depends/libXScrnSaver/package.mk index 9656d720f7..dd3a376d5b 100644 --- a/packages/addons/addon-depends/chrome-depends/libXScrnSaver/package.mk +++ b/packages/addons/addon-depends/chrome-depends/libXScrnSaver/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.2.3" PKG_SHA256="f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8" PKG_LICENSE="GPL" PKG_SITE="http://xorg.freedesktop.org/" -PKG_URL="https://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-$PKG_VERSION.tar.bz2" +PKG_URL="https://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain scrnsaverproto" PKG_LONGDESC="X11 Screen Saver extension client library." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk b/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk index cb00ccd813..d183388b99 100644 --- a/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk +++ b/packages/addons/addon-depends/chrome-depends/libXcursor/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.2.0" PKG_SHA256="3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXcursor-$PKG_VERSION.tar.bz2" +PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXcursor-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libX11 libXfixes libXrender" PKG_LONGDESC="X11 Cursor management library.s" PKG_BUILD_FLAGS="+pic -sysroot" diff --git a/packages/addons/addon-depends/chrome-depends/libXft/package.mk b/packages/addons/addon-depends/chrome-depends/libXft/package.mk index 44726cdf29..15e0380503 100644 --- a/packages/addons/addon-depends/chrome-depends/libXft/package.mk +++ b/packages/addons/addon-depends/chrome-depends/libXft/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.3.3" PKG_SHA256="225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXft-$PKG_VERSION.tar.bz2" +PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXft-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain fontconfig freetype libXrender util-macros xorgproto" PKG_LONGDESC="X FreeType library." PKG_BUILD_FLAGS="+pic -sysroot" diff --git a/packages/addons/addon-depends/chrome-depends/libxss/package.mk b/packages/addons/addon-depends/chrome-depends/libxss/package.mk index ce7949263c..133820edc4 100644 --- a/packages/addons/addon-depends/chrome-depends/libxss/package.mk +++ b/packages/addons/addon-depends/chrome-depends/libxss/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.2.3" PKG_SHA256="f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXScrnSaver-$PKG_VERSION.tar.bz2" +PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXScrnSaver-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libXext scrnsaverproto" PKG_LONGDESC="X11 Screen Saver extension library." PKG_BUILD_FLAGS="+pic -sysroot" diff --git a/packages/addons/addon-depends/chrome-depends/pango/package.mk b/packages/addons/addon-depends/chrome-depends/pango/package.mk index c7784b0044..d7c5416d95 100644 --- a/packages/addons/addon-depends/chrome-depends/pango/package.mk +++ b/packages/addons/addon-depends/chrome-depends/pango/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.48.0" PKG_SHA256="391f26f3341c2d7053e0fb26a956bd42360dadd825efe7088b1e9340a65e74e6" PKG_LICENSE="GPL" PKG_SITE="http://www.pango.org/" -PKG_URL="https://ftp.gnome.org/pub/gnome/sources/pango/${PKG_VERSION:0:4}/pango-$PKG_VERSION.tar.xz" +PKG_URL="https://ftp.gnome.org/pub/gnome/sources/pango/${PKG_VERSION:0:4}/pango-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain cairo freetype fontconfig fribidi glib harfbuzz libX11 libXft" PKG_DEPENDS_CONFIG="libXft cairo" PKG_LONGDESC="The Pango library for layout and rendering of internationalized text." diff --git a/packages/addons/addon-depends/chrome-depends/scrnsaverproto/package.mk b/packages/addons/addon-depends/chrome-depends/scrnsaverproto/package.mk index 22695e56a0..aeafb7ef97 100644 --- a/packages/addons/addon-depends/chrome-depends/scrnsaverproto/package.mk +++ b/packages/addons/addon-depends/chrome-depends/scrnsaverproto/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.2.2" PKG_SHA256="8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65" PKG_LICENSE="GPL" PKG_SITE="http://xorg.freedesktop.org/" -PKG_URL="https://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-$PKG_VERSION.tar.bz2" +PKG_URL="https://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="X11 Screen Saver extension wire protocol." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/chrome-depends/unclutter/package.mk b/packages/addons/addon-depends/chrome-depends/unclutter/package.mk index c7809603d5..d5df736175 100644 --- a/packages/addons/addon-depends/chrome-depends/unclutter/package.mk +++ b/packages/addons/addon-depends/chrome-depends/unclutter/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="1.09" PKG_SHA256="3a53575fe2a75a34bc9a2b0ad92ee0f8a7dbedc05d8783f191c500060a40a9bd" PKG_LICENSE="Public Domain" PKG_SITE="https://sourceforge.net/projects/unclutter/" -PKG_URL="https://sourceforge.net/projects/unclutter/unclutter/source_$PKG_VERSION/unclutter-$PKG_VERSION.tar.gz" +PKG_URL="https://sourceforge.net/projects/unclutter/unclutter/source_${PKG_VERSION}/unclutter-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libX11" PKG_LONGDESC="Unclutter runs in the background of an X11 session and hides the X11 Cursor." make_target() { rm -f Makefile - LDFLAGS="$LDFLAGS -lX11" $MAKE unclutter + LDFLAGS="${LDFLAGS} -lX11" ${MAKE} unclutter } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - install -m 755 unclutter $INSTALL/usr/bin/ + mkdir -p ${INSTALL}/usr/bin + install -m 755 unclutter ${INSTALL}/usr/bin/ } diff --git a/packages/addons/addon-depends/containerd/package.mk b/packages/addons/addon-depends/containerd/package.mk index 39ec958134..ff0712f4cc 100644 --- a/packages/addons/addon-depends/containerd/package.mk +++ b/packages/addons/addon-depends/containerd/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3.9" PKG_SHA256="9244212589c84b12262769dca6fb985c0c680cb5259c8904b29c511d81fd62d0" PKG_LICENSE="APL" PKG_SITE="https://containerd.tools/" -PKG_URL="https://github.com/containerd/containerd/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain go:host" PKG_LONGDESC="A daemon to control runC, built for performance and density." PKG_TOOLCHAIN="manual" @@ -22,7 +22,7 @@ pre_make_target() { export CONTAINERD_VERSION=${PKG_VERSION} export CONTAINERD_REVISION=${PKG_GIT_COMMIT} export CONTAINERD_PKG=github.com/containerd/containerd - export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld $CC" + export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld ${CC}" mkdir -p ${GOPATH} if [ -d ${PKG_BUILD}/vendor ]; then diff --git a/packages/addons/addon-depends/cxxtools/package.mk b/packages/addons/addon-depends/cxxtools/package.mk index 60c19e6e4d..95f702bbe9 100644 --- a/packages/addons/addon-depends/cxxtools/package.mk +++ b/packages/addons/addon-depends/cxxtools/package.mk @@ -17,11 +17,11 @@ PKG_CONFIGURE_OPTS_HOST="--disable-demos --with-atomictype=pthread --disable-uni PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --disable-demos --with-atomictype=pthread --disable-unittest" post_makeinstall_host() { - rm -rf $TOOLCHAIN/bin/cxxtools-config + rm -rf ${TOOLCHAIN}/bin/cxxtools-config } post_makeinstall_target() { - sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/cxxtools-config + sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/cxxtools-config - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk b/packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk index 881d01556a..c45fb9f144 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/blindscan-s2/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="28c50c6c3789ea3fcc11b992723d652378c0e925" PKG_SHA256="ac766d04bf1a32cf9c74a7ba12070ddf7c4c15bc0a94a0da60d104f2b76f0f9e" PKG_LICENSE="GPL" PKG_SITE="https://github.com/OpenVisionE2/blindscan-s2/" -PKG_URL="https://github.com/OpenVisionE2/blindscan-s2/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/OpenVisionE2/blindscan-s2/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="blindscan-s2 is a program to blindscan digital satellite signals" PKG_BUILD_FLAGS="-sysroot" makeinstall_target() { - mkdir -p $INSTALL/usr/bin - make install BIND=$INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + make install BIND=${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk b/packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk index 8cdb4d8a29..6e08aa304d 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/dvblast/package.mk @@ -13,6 +13,6 @@ PKG_LONGDESC="DVBlast is a simple and powerful MPEG-2/TS demux and streaming app PKG_BUILD_FLAGS="-sysroot" pre_configure_target() { - export LDFLAGS="$LDFLAGS -lm" + export LDFLAGS="${LDFLAGS} -lm" export PREFIX="/usr" } diff --git a/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk b/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk index 010bbe6d23..3d31bf1071 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/dvbsnoop/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="badf61fcdab1177c1162747be06d035a2b671e9b" PKG_SHA256="7f0f5d9ca15c5caae3ca249d95a5fc30cececd16f63e00a1404e0d2368ce56fa" PKG_LICENSE="GPL" PKG_SITE="http://dvbsnoop.sourceforge.net/" -PKG_URL="https://github.com/Duckbox-Developers/dvbsnoop/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/Duckbox-Developers/dvbsnoop/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="dvbsnoop is a DVB/MPEG stream analyzer program" PKG_TOOLCHAIN="autotools" diff --git a/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk b/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk index 42b68c115d..07b5b3a699 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/mumudvb/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="efc815ccecf5a2b9603027c959a4966fe501f6a5" # 2021-01-06 PKG_SHA256="b3a6f4a5d2f08d31afa46504dc53644ae21d7dbfa320a216efafcf1e7c44cdba" PKG_LICENSE="GPL" PKG_SITE="http://mumudvb.net/" -PKG_URL="https://github.com/braice/MuMuDVB/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/braice/MuMuDVB/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libdvbcsa" PKG_LONGDESC="MuMuDVB (Multi Multicast DVB) is a program that streams from DVB on a network using multicasting or unicast" PKG_TOOLCHAIN="autotools" diff --git a/packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk b/packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk index 2b85330403..4129eec4b0 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/szap-s2/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="69ff3584caf9b46f7a551b39b9f9956f8461377c" PKG_SHA256="eea8d99d2d5d6403d624acdd9df908a2dd7767dd5469b44e9a281ff863096b32" PKG_LICENSE="GPL" PKG_SITE="https://bitbucket.org/updatelee/tune-s2" -PKG_URL="https://bitbucket.org/CrazyCat/szap-s2/get/$PKG_VERSION.tar.gz" +PKG_URL="https://bitbucket.org/CrazyCat/szap-s2/get/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="szap-s2 is a simple zapping tool for the Linux DVB S2 API" PKG_BUILD_FLAGS="-sysroot" makeinstall_target() { - mkdir -p $INSTALL/usr/bin - make install BIND=$INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + make install BIND=${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk b/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk index 3f674bc7a6..651a8c42de 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/t2scan/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.7" PKG_SHA256="44e4b738a2beed8eb964be3d90b6da48c2d1c672d81fd8db8bbda87bcc433fcb" PKG_LICENSE="GPL" PKG_SITE="https://github.com/mighty-p/t2scan" -PKG_URL="https://github.com/mighty-p/t2scan/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/mighty-p/t2scan/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A small channel scan tool which generates DVB-T/T2 channels.conf files." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk b/packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk index c84bcaad78..3ec09c5fb2 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/tune-s2/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="60cc4aaa70b646d38f2e40251860375283c44816" PKG_SHA256="e39069a0f2f0930809647052fe1f8c9a13f05af537013b03a99f09ceb9bfb997" PKG_LICENSE="GPL" PKG_SITE="https://bitbucket.org/updatelee/tune-s2" -PKG_URL="https://bitbucket.org/CrazyCat/tune-s2/get/$PKG_VERSION.tar.gz" +PKG_URL="https://bitbucket.org/CrazyCat/tune-s2/get/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="tune-s2 is a small linux app to be able to tune a dvb devices" PKG_BUILD_FLAGS="-sysroot" makeinstall_target() { - mkdir -p $INSTALL/usr/bin - make install BIND=$INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + make install BIND=${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk b/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk index 3bd3deda2c..0f611c5db2 100644 --- a/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk +++ b/packages/addons/addon-depends/dvb-tools-depends/w_scan/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="20170107" PKG_SHA256="38e0f38a7bf06cff6d6ea01652ad4ee60da2cb0e937360468f936da785b46ffe" PKG_LICENSE="GPL" PKG_SITE="https://www.gen2vdr.de/wirbel/w_scan/index2.html" -PKG_URL="https://www.gen2vdr.de/wirbel/w_scan/w_scan-$PKG_VERSION.tar.bz2" +PKG_URL="https://www.gen2vdr.de/wirbel/w_scan/w_scan-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T channels.conf files." PKG_TOOLCHAIN="autotools" diff --git a/packages/addons/addon-depends/enca/package.mk b/packages/addons/addon-depends/enca/package.mk index 9b10033db0..93c2f0d4bc 100644 --- a/packages/addons/addon-depends/enca/package.mk +++ b/packages/addons/addon-depends/enca/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.19" PKG_SHA256="3a487eca40b41021e2e4b7a6440b97d822e6532db5464471f572ecf77295e8b8" PKG_LICENSE="GPL" PKG_SITE="http://freshmeat.net/projects/enca/" -PKG_URL="http://dl.cihar.com/enca/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://dl.cihar.com/enca/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Enca detects the encoding of text files, on the basis of knowledge of their language." PKG_BUILD_FLAGS="+pic" @@ -16,7 +16,7 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__dev_random=yes \ ac_cv_file__dev_urandom=no \ ac_cv_file__dev_srandom=no \ ac_cv_file__dev_arandom=no \ - CPPFLAGS="-I$SYSROOT_PREFIX/usr/include" \ + CPPFLAGS="-I${SYSROOT_PREFIX}/usr/include" \ --disable-shared \ --enable-static \ --disable-external \ @@ -25,14 +25,14 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_file__dev_random=yes \ --with-gnu-ld" pre_make_target() { - make CC="$HOST_CC" \ - CPPFLAGS="$HOST_CPPFLAGS" \ - CFLAGS="$HOST_CFLAGS" \ - LDFLAGS="$HOST_LDFLAGS" \ + make CC="${HOST_CC}" \ + CPPFLAGS="${HOST_CPPFLAGS}" \ + CFLAGS="${HOST_CFLAGS}" \ + LDFLAGS="${HOST_LDFLAGS}" \ -C tools } post_makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig - cp enca.pc $SYSROOT_PREFIX/usr/lib/pkgconfig + mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig + cp enca.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig } diff --git a/packages/addons/addon-depends/enet/package.mk b/packages/addons/addon-depends/enet/package.mk index d7f0fb5015..d5aaf4c0a2 100644 --- a/packages/addons/addon-depends/enet/package.mk +++ b/packages/addons/addon-depends/enet/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="d9e561938fd9360cdbbd67d78b105ccbe4af0a65" # 10 Jan 2021 # 1.3.17+vi PKG_SHA256="ff52ea54edb71662d5933b165c073f079c90ed9adcf98bcb7b2e74d4ddf3dc6b" PKG_LICENSE="MIT" PKG_SITE="https://github.com/cgutman/enet/" -PKG_URL="https://github.com/cgutman/enet/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/cgutman/enet/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A network communication layer on top of UDP (User Datagram Protocol)." PKG_TOOLCHAIN="autotools" @@ -14,5 +14,5 @@ PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared" post_makeinstall_target() { - rm -r $INSTALL + rm -r ${INSTALL} } diff --git a/packages/addons/addon-depends/faad2/package.mk b/packages/addons/addon-depends/faad2/package.mk index 9e754c9ebe..dd51601425 100644 --- a/packages/addons/addon-depends/faad2/package.mk +++ b/packages/addons/addon-depends/faad2/package.mk @@ -23,5 +23,5 @@ pre_configure_target() { } post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk b/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk index 1117a25563..a1b1b60edc 100644 --- a/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk +++ b/packages/addons/addon-depends/ffmpegx-depends/libvpx/package.mk @@ -10,13 +10,13 @@ PKG_URL="https://github.com/webmproject/libvpx/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="WebM VP8/VP9 Codec" -if [ "$TARGET_ARCH" = "x86_64" ]; then +if [ "${TARGET_ARCH}" = "x86_64" ]; then PKG_DEPENDS_TARGET+=" nasm:host" fi configure_target() { - case $ARCH in + case ${ARCH} in aarch64) PKG_TARGET_NAME_LIBVPX="arm64-linux-gcc" ;; @@ -28,10 +28,10 @@ configure_target() { ;; esac - $PKG_CONFIGURE_SCRIPT --prefix=/usr \ - --extra-cflags="$CFLAGS" \ + ${PKG_CONFIGURE_SCRIPT} --prefix=/usr \ + --extra-cflags="${CFLAGS}" \ --as=nasm \ - --target=$PKG_TARGET_NAME_LIBVPX \ + --target=${PKG_TARGET_NAME_LIBVPX} \ --disable-docs \ --disable-examples \ --disable-shared \ diff --git a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk index 493f575df9..cc0b42082b 100644 --- a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk +++ b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk @@ -6,20 +6,20 @@ PKG_VERSION="6bc7fe4f36ea95db77e6df6d76153dd5a2c770a0" PKG_SHA256="d89911373d1de50b5ed1fc8ace9744968e15b69490e1b197d2d4f1b1c456930b" PKG_LICENSE="GPL" PKG_SITE="http://www.videolan.org/developers/x264.html" -PKG_URL="https://code.videolan.org/videolan/x264/-/archive/master/x264-$PKG_VERSION.tar.gz" +PKG_URL="https://code.videolan.org/videolan/x264/-/archive/master/x264-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="x264 codec" -if [ "$TARGET_ARCH" = "x86_64" ]; then +if [ "${TARGET_ARCH}" = "x86_64" ]; then PKG_DEPENDS_TARGET+=" nasm:host" fi pre_configure_target() { - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} - if [ "$TARGET_ARCH" = "x86_64" ]; then - export AS="$TOOLCHAIN/bin/nasm" + if [ "${TARGET_ARCH}" = "x86_64" ]; then + export AS="${TOOLCHAIN}/bin/nasm" else PKG_X264_ASM="--disable-asm" fi @@ -27,13 +27,13 @@ pre_configure_target() { configure_target() { ./configure \ - --cross-prefix="$TARGET_PREFIX" \ - --extra-cflags="$CFLAGS" \ - --extra-ldflags="$LDFLAGS" \ - --host="$TARGET_NAME" \ + --cross-prefix="${TARGET_PREFIX}" \ + --extra-cflags="${CFLAGS}" \ + --extra-ldflags="${LDFLAGS}" \ + --host="${TARGET_NAME}" \ --prefix="/usr" \ - --sysroot="$SYSROOT_PREFIX" \ - $PKG_X264_ASM \ + --sysroot="${SYSROOT_PREFIX}" \ + ${PKG_X264_ASM} \ --disable-cli \ --enable-lto \ --enable-pic \ diff --git a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk index 3070efbbe4..df8a59b295 100644 --- a/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk +++ b/packages/addons/addon-depends/ffmpegx-depends/x265/package.mk @@ -13,6 +13,6 @@ PKG_LONGDESC="x265 is a H.265/HEVC video encoder application library" PKG_TOOLCHAIN="make" pre_configure_target() { - LDFLAGS="$LDFLAGS -ldl" + LDFLAGS+=" -ldl" cmake -G "Unix Makefiles" ./source } diff --git a/packages/addons/addon-depends/ffmpegx/package.mk b/packages/addons/addon-depends/ffmpegx/package.mk index 64af017adc..1ffc6694a6 100644 --- a/packages/addons/addon-depends/ffmpegx/package.mk +++ b/packages/addons/addon-depends/ffmpegx/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="4.3.1" PKG_SHA256="ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb" PKG_LICENSE="LGPLv2.1+" PKG_SITE="https://ffmpeg.org" -PKG_URL="https://ffmpeg.org/releases/ffmpeg-$PKG_VERSION.tar.xz" +PKG_URL="https://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain aom bzip2 gnutls libvorbis opus x264 zlib" PKG_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding." PKG_BUILD_FLAGS="-gold -sysroot" @@ -14,31 +14,31 @@ PKG_BUILD_FLAGS="-gold -sysroot" # Dependencies get_graphicdrivers -if [ "$TARGET_ARCH" = "x86_64" ]; then +if [ "${TARGET_ARCH}" = "x86_64" ]; then PKG_DEPENDS_TARGET+=" nasm:host x265" - if listcontains "$GRAPHIC_DRIVERS" "(iris|i915|i965)"; then + if listcontains "${GRAPHIC_DRIVERS}" "(iris|i915|i965)"; then PKG_DEPENDS_TARGET+=" intel-vaapi-driver" fi fi -if [[ ! $TARGET_ARCH = arm ]] || target_has_feature neon; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvpx" +if [[ ! ${TARGET_ARCH} = arm ]] || target_has_feature neon; then + PKG_DEPENDS_TARGET+=" libvpx" fi # X11 grab for screen recording -if [ "$DISPLAYSERVER" = "x11" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libxcb libX11" +if [ "${DISPLAYSERVER}" = "x11" ]; then + PKG_DEPENDS_TARGET+=" libxcb libX11" fi pre_configure_target() { - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} # HW encoders # Generic - if [[ "$TARGET_ARCH" = "x86_64" ]]; then + if [[ "${TARGET_ARCH}" = "x86_64" ]]; then PKG_FFMPEG_HW_ENCODERS_GENERIC="\ `#Video encoders` \ --enable-encoder=h264_vaapi \ @@ -89,8 +89,8 @@ pre_configure_target() { --enable-encoder=libvorbis" # X11 grab for screen recording - if [ "$DISPLAYSERVER" = "x11" ]; then - PKG_FFMPEG_LIBS="$PKG_FFMPEG_LIBS -lX11" + if [ "${DISPLAYSERVER}" = "x11" ]; then + PKG_FFMPEG_LIBS+=" -lX11" PKG_FFMPEG_X11_GRAB="\ --enable-libxcb \ --enable-libxcb-shm \ @@ -118,35 +118,35 @@ configure_target() { --disable-doc \ \ `#Hardware accelerated decoding encoding` \ - $PKG_FFMPEG_HW_ENCODERS_GENERIC \ + ${PKG_FFMPEG_HW_ENCODERS_GENERIC} \ \ `#General options` \ --enable-avresample \ --disable-lzma \ --disable-alsa \ - $PKG_FFMPEG_X11_GRAB \ + ${PKG_FFMPEG_X11_GRAB} \ \ `#Toolchain options` \ - --arch="$TARGET_ARCH" \ - --cpu="$TARGET_CPU" \ - --cross-prefix="$TARGET_PREFIX" \ + --arch="${TARGET_ARCH}" \ + --cpu="${TARGET_CPU}" \ + --cross-prefix="${TARGET_PREFIX}" \ --enable-cross-compile \ - --sysroot="$SYSROOT_PREFIX" \ - --sysinclude="$SYSROOT_PREFIX/usr/include" \ + --sysroot="${SYSROOT_PREFIX}" \ + --sysinclude="${SYSROOT_PREFIX}/usr/include" \ --target-os="linux" \ - --nm="$NM" \ - --ar="$AR" \ - --as="$CC" \ - --cc="$CC" \ - --ld="$CC" \ - --pkg-config="$TOOLCHAIN/bin/pkg-config" \ - --host-cc="$HOST_CC" \ - --host-cflags="$HOST_CFLAGS" \ - --host-ldflags="$HOST_LDFLAGS" \ + --nm="${NM}" \ + --ar="${AR}" \ + --as="${CC}" \ + --cc="${CC}" \ + --ld="${CC}" \ + --pkg-config="${TOOLCHAIN}/bin/pkg-config" \ + --host-cc="${HOST_CC}" \ + --host-cflags="${HOST_CFLAGS}" \ + --host-ldflags="${HOST_LDFLAGS}" \ --host-extralibs="-lm" \ - --extra-cflags="$CFLAGS" \ - --extra-ldflags="$LDFLAGS" \ - --extra-libs="$PKG_FFMPEG_LIBS" \ + --extra-cflags="${CFLAGS}" \ + --extra-ldflags="${LDFLAGS}" \ + --extra-libs="${PKG_FFMPEG_LIBS}" \ --enable-pic \ --enable-gnutls \ --disable-openssl \ diff --git a/packages/addons/addon-depends/game-tools/bchunk/package.mk b/packages/addons/addon-depends/game-tools/bchunk/package.mk index 72b6aca687..1826275dc5 100644 --- a/packages/addons/addon-depends/game-tools/bchunk/package.mk +++ b/packages/addons/addon-depends/game-tools/bchunk/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="1.2.2" PKG_SHA256="e7d99b5b60ff0b94c540379f6396a670210400124544fb1af985dd3551eabd89" PKG_LICENSE="GPL" PKG_SITE="http://he.fi/bchunk/" -PKG_URL="http://he.fi/bchunk/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://he.fi/bchunk/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Tool to convert a CD image in a .bin/.cue format to a set of .iso and .cdr tracks." PKG_BUILD_FLAGS="-sysroot" make_target() { - make $PKG_MAKE_OPTS_TARGET CC=$CC LD=$CC + make ${PKG_MAKE_OPTS_TARGET} CC=${CC} LD=${CC} } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -p bchunk $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -p bchunk ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/game-tools/ecm-tools/package.mk b/packages/addons/addon-depends/game-tools/ecm-tools/package.mk index 241eb65de2..7e7be65477 100644 --- a/packages/addons/addon-depends/game-tools/ecm-tools/package.mk +++ b/packages/addons/addon-depends/game-tools/ecm-tools/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.0.3" PKG_SHA256="7b7475789603e64c7ae3ddcb0e95f09640ba37a7f13b29c8e8f2f4087bd872c9" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/alucryd/ecm-tools" -PKG_URL="https://github.com/alucryd/ecm-tools/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/alucryd/ecm-tools/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Error Code Modeler.s" PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/game-tools/iat/package.mk b/packages/addons/addon-depends/game-tools/iat/package.mk index 04b1e81fa2..6ceb0399e1 100644 --- a/packages/addons/addon-depends/game-tools/iat/package.mk +++ b/packages/addons/addon-depends/game-tools/iat/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.1.7" PKG_SHA256="fb72c42f4be18107ec1bff8448bd6fac2a3926a574d4950a4d5120f0012d62ca" PKG_LICENSE="GPL" PKG_SITE="https://sourceforge.net/projects/iat.berlios/" -PKG_URL="https://sourceforge.net/projects/iat.berlios/files/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="https://sourceforge.net/projects/iat.berlios/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Iso9660 Analyzer Tool to detect many structures of image file." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk b/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk index 12d430232f..db9f3acd14 100644 --- a/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk +++ b/packages/addons/addon-depends/game-tools/linuxconsoletools/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.7.1" PKG_SHA256="bd4d4b7e37da02fc67e47ddf20b6f1243c0a7af7b02b918d5e72138ea8727547" PKG_LICENSE="GPL" PKG_SITE="http://sourceforge.net/projects/linuxconsole/" -PKG_URL="http://prdownloads.sourceforge.net/linuxconsole/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://prdownloads.sourceforge.net/linuxconsole/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Set of utilities for joysticks and serial devices." PKG_BUILD_FLAGS="-sysroot" @@ -14,5 +14,5 @@ PKG_BUILD_FLAGS="-sysroot" PKG_MAKE_OPTS_TARGET="SYSTEMD_SUPPORT=0" makeinstall_target() { - make install PREFIX="/usr" DESTDIR="$INSTALL" + make install PREFIX="/usr" DESTDIR="${INSTALL}" } diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk index 787a378e5e..6291529153 100644 --- a/packages/addons/addon-depends/go/package.mk +++ b/packages/addons/addon-depends/go/package.mk @@ -22,7 +22,7 @@ configure_host() { fi export GOARCH=amd64 - if [ ! -d $GOROOT_BOOTSTRAP ]; then + if [ ! -d ${GOROOT_BOOTSTRAP} ]; then cat < $SYSROOT_PREFIX/usr/lib/pkgconfig/mad.pc << "EOF" + mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig + cat > ${SYSROOT_PREFIX}/usr/lib/pkgconfig/mad.pc << "EOF" prefix=/usr exec_prefix=${prefix} libdir=${exec_prefix}/lib diff --git a/packages/addons/addon-depends/libnetwork/package.mk b/packages/addons/addon-depends/libnetwork/package.mk index 1712f175ba..29b404fce9 100644 --- a/packages/addons/addon-depends/libnetwork/package.mk +++ b/packages/addons/addon-depends/libnetwork/package.mk @@ -16,17 +16,17 @@ pre_make_target() { go_configure export CGO_ENABLED=0 - export LDFLAGS="-extld $CC" + export LDFLAGS="-extld ${CC}" mkdir -p ${GOPATH} - if [ -d $PKG_BUILD/vendor ]; then - mv $PKG_BUILD/vendor ${GOPATH}/src + if [ -d ${PKG_BUILD}/vendor ]; then + mv ${PKG_BUILD}/vendor ${GOPATH}/src fi - ln -fs $PKG_BUILD ${GOPATH}/src/github.com/docker/libnetwork + ln -fs ${PKG_BUILD} ${GOPATH}/src/github.com/docker/libnetwork } make_target() { mkdir -p bin - $GOLANG build -v -o bin/docker-proxy -a -ldflags "$LDFLAGS" ./cmd/proxy + ${GOLANG} build -v -o bin/docker-proxy -a -ldflags "${LDFLAGS}" ./cmd/proxy } diff --git a/packages/addons/addon-depends/librespot-depends/rust/package.mk b/packages/addons/addon-depends/librespot-depends/rust/package.mk index efad5540dc..fde7e7d301 100644 --- a/packages/addons/addon-depends/librespot-depends/rust/package.mk +++ b/packages/addons/addon-depends/librespot-depends/rust/package.mk @@ -10,10 +10,10 @@ PKG_LONGDESC="A systems programming language that prevents segfaults, and guaran PKG_TOOLCHAIN="manual" make_target() { - export CARGO_HOME="$PKG_BUILD/cargo" - export RUSTUP_HOME="$CARGO_HOME" - export PATH="$CARGO_HOME/bin:$PATH" - case "$TARGET_ARCH" in + export CARGO_HOME="${PKG_BUILD}/cargo" + export RUSTUP_HOME="${CARGO_HOME}" + export PATH="${CARGO_HOME}/bin:${PATH}" + case "${TARGET_ARCH}" in aarch64) RUST_TARGET_TRIPLE="aarch64-unknown-linux-gnu" ;; @@ -25,28 +25,28 @@ make_target() { ;; esac "$(get_build_dir rustup.rs)/rustup-init.sh" \ - --default-toolchain "$PKG_VERSION" \ + --default-toolchain "${PKG_VERSION}" \ --no-modify-path \ --profile minimal \ - --target "$RUST_TARGET_TRIPLE" \ + --target "${RUST_TARGET_TRIPLE}" \ -y - cat <"$CARGO_HOME/config" + cat <"${CARGO_HOME}/config" [build] -target = "$RUST_TARGET_TRIPLE" +target = "${RUST_TARGET_TRIPLE}" -[target.$RUST_TARGET_TRIPLE] -ar = "$AR" -linker = "$CC" +[target.${RUST_TARGET_TRIPLE}] +ar = "${AR}" +linker = "${CC}" EOF - cat <"$CARGO_HOME/env" -export CARGO_HOME="$CARGO_HOME" -export CARGO_TARGET_DIR="\$PKG_BUILD/.\$TARGET_NAME" -export PATH="$CARGO_HOME/bin:$PATH" + cat <"${CARGO_HOME}/env" +export CARGO_HOME="${CARGO_HOME}" +export CARGO_TARGET_DIR="\${PKG_BUILD}/.\${TARGET_NAME}" +export PATH="${CARGO_HOME}/bin:${PATH}" export PKG_CONFIG_ALLOW_CROSS="1" -export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR" -export RUSTUP_HOME="$CARGO_HOME" +export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}" +export RUSTUP_HOME="${CARGO_HOME}" unset CFLAGS EOF } diff --git a/packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk b/packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk index bfffe620fe..544068b761 100644 --- a/packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk +++ b/packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.23.1" PKG_SHA256="0203231bfe405ee1c7d5e7e1c013b9b8a2dc87fbd8474e77f500331d8c26365f" PKG_LICENSE="MIT" PKG_SITE="https://www.rust-lang.org" -PKG_URL="https://github.com/rust-lang-nursery/rustup.rs/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/rust-lang-nursery/rustup.rs/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The Rust toolchain installer." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/libvncserver/package.mk b/packages/addons/addon-depends/libvncserver/package.mk index 2139e2e630..bc88df8fb6 100644 --- a/packages/addons/addon-depends/libvncserver/package.mk +++ b/packages/addons/addon-depends/libvncserver/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.9.13" PKG_SHA256="0ae5bb9175dc0a602fe85c1cf591ac47ee5247b87f2bf164c16b05f87cbfa81a" PKG_LICENSE="GPL" PKG_SITE="https://libvnc.github.io/" -PKG_URL="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libjpeg-turbo libpng openssl systemd" PKG_LONGDESC="A C library that allow you to easily implement VNC server or client functionality." diff --git a/packages/addons/addon-depends/libzip/package.mk b/packages/addons/addon-depends/libzip/package.mk index d094826183..e7c16e7ee7 100644 --- a/packages/addons/addon-depends/libzip/package.mk +++ b/packages/addons/addon-depends/libzip/package.mk @@ -23,5 +23,5 @@ PKG_CMAKE_OPTS_TARGET="-DENABLE_COMMONCRYPTO=OFF \ -DBUILD_SHARED_LIBS=OFF" post_makeinstall_target() { - rm -rf $INSTALL/usr/lib + rm -rf ${INSTALL}/usr/lib } diff --git a/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk index 24c610cc65..5c2fb274e2 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/depends/libmediainfo/package.mk @@ -17,8 +17,8 @@ configure_target() { cd Project/GNU/Library do_autoreconf ./configure \ - --host=$TARGET_NAME \ - --build=$HOST_NAME \ + --host=${TARGET_NAME} \ + --build=${HOST_NAME} \ --enable-static \ --disable-shared \ --prefix=/usr \ @@ -30,12 +30,12 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/include/MediaInfo $INSTALL/usr/lib/pkgconfig - cp -aP ../../../Source/MediaInfo/*.h $INSTALL/usr/include/MediaInfo - for i in Archive Audio Duplicate Export Image Multiple Reader Tag Text Video ; do - mkdir -p $INSTALL/usr/include/MediaInfo/$i/ - cp -aP ../../../Source/MediaInfo/$i/*.h $INSTALL/usr/include/MediaInfo/$i/ + mkdir -p ${INSTALL}/usr/include/MediaInfo ${INSTALL}/usr/lib/pkgconfig + cp -aP ../../../Source/MediaInfo/*.h ${INSTALL}/usr/include/MediaInfo + for i in Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do + mkdir -p ${INSTALL}/usr/include/MediaInfo/${i}/ + cp -aP ../../../Source/MediaInfo/${i}/*.h ${INSTALL}/usr/include/MediaInfo/${i}/ done - cp -P .libs/* $INSTALL/usr/lib - cp -P libmediainfo.pc $INSTALL/usr/lib/pkgconfig + cp -P .libs/* ${INSTALL}/usr/lib + cp -P libmediainfo.pc ${INSTALL}/usr/lib/pkgconfig } diff --git a/packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk index 5963cfdc2e..bb893e7b5b 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/depends/libzen/package.mk @@ -16,8 +16,8 @@ configure_target() { cd Project/GNU/Library do_autoreconf ./configure \ - --host=$TARGET_NAME \ - --build=$HOST_NAME \ + --host=${TARGET_NAME} \ + --build=${HOST_NAME} \ --enable-static \ --disable-shared \ --prefix=/usr @@ -28,12 +28,12 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/include/ZenLib $INSTALL/usr/lib/pkgconfig - cp -aP ../../../Source/ZenLib/*.h $INSTALL/usr/include/ZenLib - for i in HTTP_Client Format/Html Format/Http ; do - mkdir -p $INSTALL/usr/include/ZenLib/$i/ - cp -aP ../../../Source/ZenLib/$i/*.h $INSTALL/usr/include/ZenLib/$i/ + mkdir -p ${INSTALL}/usr/include/ZenLib ${INSTALL}/usr/lib/pkgconfig + cp -aP ../../../Source/ZenLib/*.h ${INSTALL}/usr/include/ZenLib + for i in HTTP_Client Format/Html Format/Http; do + mkdir -p ${INSTALL}/usr/include/ZenLib/${i}/ + cp -aP ../../../Source/ZenLib/${i}/*.h ${INSTALL}/usr/include/ZenLib/${i}/ done - cp -P .libs/* $INSTALL/usr/lib - cp -P libzen.pc $INSTALL/usr/lib/pkgconfig + cp -P .libs/* ${INSTALL}/usr/lib + cp -P libzen.pc ${INSTALL}/usr/lib/pkgconfig } diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk index c9a756db92..dbba8aa373 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/mediainfo/package.mk @@ -17,8 +17,8 @@ configure_target() { cd Project/GNU/CLI do_autoreconf ./configure \ - --host=$TARGET_NAME \ - --build=$HOST_NAME \ + --host=${TARGET_NAME} \ + --build=${HOST_NAME} \ --prefix=/usr } @@ -27,5 +27,5 @@ make_target() { } makeinstall_target() { - make install DESTDIR=$INSTALL + make install DESTDIR=${INSTALL} } diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk index 5206c1df6e..9053cdfed5 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/mesa-demos/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d" PKG_ARCH="i386 x86_64" PKG_LICENSE="OSS" PKG_SITE="http://www.mesa3d.org/" -PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/demos/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="ftp://ftp.freedesktop.org/pub/mesa/demos/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libX11 mesa glu glew" PKG_LONGDESC="Mesa 3D demos - installed are the well known glxinfo and glxgears." PKG_TOOLCHAIN="autotools" @@ -16,8 +16,8 @@ PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--without-glut" makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -P src/xdemos/glxdemo $INSTALL/usr/bin - cp -P src/xdemos/glxgears $INSTALL/usr/bin - cp -P src/xdemos/glxinfo $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -P src/xdemos/glxdemo ${INSTALL}/usr/bin + cp -P src/xdemos/glxgears ${INSTALL}/usr/bin + cp -P src/xdemos/glxinfo ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk index 19ab720072..994ce799ec 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/mpg123/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.26.4" PKG_SHA256="081991540df7a666b29049ad870f293cfa28863b36488ab4d58ceaa7b5846454" PKG_LICENSE="LGPLv2" PKG_SITE="http://www.mpg123.org/" -PKG_URL="http://downloads.sourceforge.net/sourceforge/mpg123/mpg123-$PKG_VERSION.tar.bz2" +PKG_URL="http://downloads.sourceforge.net/sourceforge/mpg123/mpg123-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain alsa-lib" PKG_LONGDESC="A console based real time MPEG Audio Player for Layer 1, 2 and 3." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk index ce6ea9488d..b904236382 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/mpv-drmprime/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.33.0" PKG_SHA256="f1b9baf5dc2eeaf376597c28a6281facf6ed98ff3d567e3955c95bf2459520b4" PKG_LICENSE="GPL" PKG_SITE="https://mpv.io/" -PKG_URL="https://github.com/mpv-player/mpv/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/mpv-player/mpv/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain waf:host alsa ffmpeg libass libdrm" PKG_LONGDESC="A media player based on MPlayer and mplayer2. It supports a wide variety of video file formats, audio and video codecs, and subtitle types." PKG_TOOLCHAIN="manual" @@ -29,29 +29,29 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \ --enable-gbm \ --enable-egl-drm" -if [ "$OPENGLES_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET+=" $OPENGLES" +if [ "${OPENGLES_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" fi -if [ "$OPENGL_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET+=" $OPENGL" +if [ "${OPENGL_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL}" fi -if [ "$VAAPI_SUPPORT" = "yes" ]; then +if [ "${VAAPI_SUPPORT}" = "yes" ]; then PKG_DEPENDS_TARGET+=" libva" PKG_CONFIGURE_OPTS_TARGET+=" --enable-vaapi --enable-vaapi-drm" else PKG_CONFIGURE_OPTS_TARGET+=" --disable-vaapi" fi -if [ "$PULSEAUDIO_SUPPORT" = "yes" ]; then +if [ "${PULSEAUDIO_SUPPORT}" = "yes" ]; then PKG_DEPENDS_TARGET+=" pulseaudio" PKG_CONFIGURE_OPTS_TARGET+=" --enable-pulse" else PKG_CONFIGURE_OPTS_TARGET+=" --disable-pulse" fi -if [ "$KODI_BLURAY_SUPPORT" = "yes" ]; then +if [ "${KODI_BLURAY_SUPPORT}" = "yes" ]; then PKG_DEPENDS_TARGET+=" libbluray" PKG_CONFIGURE_OPTS_TARGET+=" --enable-libbluray" else @@ -59,7 +59,7 @@ else fi configure_target() { - waf configure $PKG_CONFIGURE_OPTS_TARGET + waf configure ${PKG_CONFIGURE_OPTS_TARGET} } make_target() { @@ -67,6 +67,6 @@ make_target() { } makeinstall_target() { - waf install --destdir=$INSTALL - rm -r $INSTALL/usr/share + waf install --destdir=${INSTALL} + rm -r ${INSTALL}/usr/share } diff --git a/packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk index d543113f4f..d50e3ede8c 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk @@ -12,10 +12,10 @@ PKG_LONGDESC="A free and open source MPEG2 transport stream data generator and p PKG_BUILD_FLAGS="-sysroot" pre_configure_target() { - PKG_MAKE_OPTS_TARGET="CC=$CC" + PKG_MAKE_OPTS_TARGET="CC=${CC}" } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - make install DESTDIR=$INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + make install DESTDIR=${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk index 99062e0eb5..801a8a3de8 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/squeezelite/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="78fef68d39704753cb7101231a8d3bc29f2aa2c9" # 2021-01-03 # 1.9.8.1315 PKG_SHA256="e4dce15d6f8968150d9535cb4e95017b4097d2282a1da1c87b3c7651dbca40c3" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/ralph-irving/squeezelite" -PKG_URL="https://github.com/ralph-irving/squeezelite/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/ralph-irving/squeezelite/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain faad2 ffmpeg flac libmad libvorbis mpg123 soxr libogg" PKG_DEPENDS_CONFIG="mpg123" PKG_LONGDESC="A client for the Logitech Media Server." @@ -15,11 +15,11 @@ PKG_BUILD_FLAGS="-sysroot" make_target() { make \ OPTS="-DDSD -DFFMPEG -DRESAMPLE -DVISEXPORT -DLINKALL" \ - CFLAGS="$CFLAGS $(pkg-config --cflags libmpg123 vorbisfile vorbis ogg)" \ - LDFLAGS="$LDFLAGS $(pkg-config --libs libmpg123 vorbisfile vorbis ogg)" + CFLAGS="${CFLAGS} $(pkg-config --cflags libmpg123 vorbisfile vorbis ogg)" \ + LDFLAGS+=" $(pkg-config --libs libmpg123 vorbisfile vorbis ogg)" } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -p squeezelite $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -p squeezelite ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/multimedia-tools-depends/tsdecrypt/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/tsdecrypt/package.mk index 7818509905..db5e0a0689 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/tsdecrypt/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/tsdecrypt/package.mk @@ -15,9 +15,9 @@ PKG_BUILD_FLAGS="-sysroot" PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr" make_target() { - make CC=$CC LINK="$LD -o" + make CC=${CC} LINK="${LD} -o" } post_make_target() { - make strip STRIP=$STRIP + make strip STRIP=${STRIP} } diff --git a/packages/addons/addon-depends/multimedia-tools-depends/tstools/package.mk b/packages/addons/addon-depends/multimedia-tools-depends/tstools/package.mk index 01e1463775..aeca8cbc92 100644 --- a/packages/addons/addon-depends/multimedia-tools-depends/tstools/package.mk +++ b/packages/addons/addon-depends/multimedia-tools-depends/tstools/package.mk @@ -7,12 +7,12 @@ PKG_VERSION="db1f79f409818fa0476ecf8593079a7ca3dbafd2" PKG_SHA256="f204229016c9deafcc75fe602c390339878312126134edbfcebf239e093dc4ff" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kynesim/tstools" -PKG_URL="https://github.com/kynesim/tstools/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kynesim/tstools/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="This is a set of cross-platform command line tools for working with MPEG data." PKG_BUILD_FLAGS="-sysroot" -PKG_MAKE_OPTS_TARGET="CROSS_COMPILE=$TARGET_PREFIX prefix=/usr" +PKG_MAKE_OPTS_TARGET="CROSS_COMPILE=${TARGET_PREFIX} prefix=/usr" PKG_MAKEINSTALL_OPTS_TARGET="${PKG_MAKE_OPTS_TARGET}" pre_make_target() { diff --git a/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk b/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk index 9b7cad0cd0..6e0c785f7f 100644 --- a/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.6.3" PKG_SHA256="c1a552b6ff48ea3e4e10110a7c188861abc4750befc67c6caaba8eb3ecf67f46" PKG_LICENSE="GPL" PKG_SITE="http://www.gropp.org/?id=projects&sub=bwm-ng" -PKG_URL="https://github.com/vgropp/bwm-ng/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/vgropp/bwm-ng/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses libstatgrab" PKG_LONGDESC="A small and simple console-based live network and disk io bandwidth monitor." PKG_TOOLCHAIN="autotools" diff --git a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk index 10370c344f..da07b3d0b9 100644 --- a/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/depends/libpcap/package.mk @@ -29,5 +29,5 @@ pre_configure_target() { } post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/network-tools-depends/depends/libstatgrab/package.mk b/packages/addons/addon-depends/network-tools-depends/depends/libstatgrab/package.mk index a6086cf64d..2879514aae 100644 --- a/packages/addons/addon-depends/network-tools-depends/depends/libstatgrab/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/depends/libstatgrab/package.mk @@ -5,7 +5,7 @@ PKG_NAME="libstatgrab" PKG_VERSION="0.92" PKG_SHA256="5bf1906aff9ffc3eeacf32567270f4d819055d8386d98b9c8c05519012d5a196" PKG_SITE="http://www.i-scream.org/libstatgrab/" -PKG_URL="http://ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-$PKG_VERSION.tar.gz" +PKG_URL="http://ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_SECTION=libs PKG_LONGDESC="A library that provides cross platform access to statistics about the system on which it's run." diff --git a/packages/addons/addon-depends/network-tools-depends/iftop/package.mk b/packages/addons/addon-depends/network-tools-depends/iftop/package.mk index 002a901a08..27e52f51ac 100644 --- a/packages/addons/addon-depends/network-tools-depends/iftop/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/iftop/package.mk @@ -6,15 +6,15 @@ PKG_VERSION="77901c8c53e01359d83b8090aacfe62214658183" PKG_SHA256="f2728741f1bd2099d325271b4b2564a696dbce7c23401360ac6c9841cbda1108" PKG_LICENSE="GPL" PKG_SITE="http://www.ex-parrot.com/pdw/iftop/" -PKG_URL="https://code.blinkace.com/pdw/iftop/-/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://code.blinkace.com/pdw/iftop/-/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses libpcap libnl" PKG_LONGDESC="A tool to display bandwidth usage on an interface." PKG_TOOLCHAIN="autotools" PKG_BUILD_FLAGS="-sysroot" pre_build_target() { - mkdir -p $PKG_BUILD/.$TARGET_NAME - cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME + mkdir -p ${PKG_BUILD}/.${TARGET_NAME} + cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME} } pre_configure_target() { diff --git a/packages/addons/addon-depends/network-tools-depends/iperf/package.mk b/packages/addons/addon-depends/network-tools-depends/iperf/package.mk index 7b2a01d0cc..14f809aa72 100644 --- a/packages/addons/addon-depends/network-tools-depends/iperf/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/iperf/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="3.9" PKG_SHA256="c6d8076b800f2b51f92dc941b0a9b77fbf2a867f623b5cb3cbf4754dabc40899" PKG_LICENSE="BSD" PKG_SITE="http://software.es.net/iperf/" -PKG_URL="https://github.com/esnet/iperf/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/esnet/iperf/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain openssl" PKG_LONGDESC="A tool to measuring maximum TCP and UDP bandwidth performance." PKG_TOOLCHAIN="autotools" diff --git a/packages/addons/addon-depends/network-tools-depends/irssi/package.mk b/packages/addons/addon-depends/network-tools-depends/irssi/package.mk index 7068c0c4bb..b5a004a7b2 100644 --- a/packages/addons/addon-depends/network-tools-depends/irssi/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/irssi/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="1.2.2" PKG_SHA256="6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578" PKG_LICENSE="GPL" PKG_SITE="http://www.irssi.org/" -PKG_URL="https://github.com/irssi/irssi/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://github.com/irssi/irssi/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain glib ncurses openssl" PKG_LONGDESC="Irssi is a terminal based IRC client for UNIX systems." PKG_BUILD_FLAGS="-sysroot" -PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=$SYSROOT_PREFIX \ +PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=${SYSROOT_PREFIX} \ --disable-glibtest \ --without-socks \ --with-textui \ @@ -20,5 +20,5 @@ PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=$SYSROOT_PREFIX \ --without-perl" pre_configure_target() { - export CFLAGS="$CFLAGS -I$PKG_BUILD" + export CFLAGS="${CFLAGS} -I${PKG_BUILD}" } diff --git a/packages/addons/addon-depends/network-tools-depends/lftp/package.mk b/packages/addons/addon-depends/network-tools-depends/lftp/package.mk index f944e56027..d81b2f7a57 100644 --- a/packages/addons/addon-depends/network-tools-depends/lftp/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/lftp/package.mk @@ -14,5 +14,5 @@ PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--disable-nls \ --without-gnutls \ --with-openssl \ - --with-readline=$SYSROOT_PREFIX/usr \ - --with-zlib=$SYSROOT_PREFIX/usr" + --with-readline=${SYSROOT_PREFIX}/usr \ + --with-zlib=${SYSROOT_PREFIX}/usr" diff --git a/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk b/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk index 9379f547ee..0a36e8f2f0 100644 --- a/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/ncftp/package.mk @@ -18,10 +18,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_librtmp_rtmp_h=yes \ --without-curses" pre_configure_target() { - export CFLAGS="$CFLAGS -I../" + export CFLAGS="${CFLAGS} -I../" } pre_build_target() { - mkdir -p $PKG_BUILD/.$TARGET_NAME - cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME + mkdir -p ${PKG_BUILD}/.${TARGET_NAME} + cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME} } diff --git a/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk b/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk index d11042af2d..f64642e45a 100644 --- a/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk @@ -12,11 +12,11 @@ PKG_LONGDESC="A tool like GNU grep applied to the network layer." PKG_TOOLCHAIN="autotools" PKG_BUILD_FLAGS="-sysroot -parallel" -PKG_CONFIGURE_OPTS_TARGET="--with-pcap-includes=$SYSROOT_PREFIX/usr/include \ +PKG_CONFIGURE_OPTS_TARGET="--with-pcap-includes=${SYSROOT_PREFIX}/usr/include \ --enable-ipv6 \ --disable-dropprivs" pre_build_target() { - mkdir -p $PKG_BUILD/.$TARGET_NAME - cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME + mkdir -p ${PKG_BUILD}/.${TARGET_NAME} + cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME} } diff --git a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk index a0ff6b76e7..7e2a6bdc7f 100644 --- a/packages/addons/addon-depends/network-tools-depends/nmap/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/nmap/package.mk @@ -18,12 +18,12 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --with-libdnet=included \ --with-liblua=included \ --with-liblinear=included \ - --with-openssl=$SYSROOT_PREFIX" + --with-openssl=${SYSROOT_PREFIX}" pre_configure_target() { # nmap fails to build in subdirs - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} - export CPPFLAGS="$CPPFLAGS -Iliblua" + export CPPFLAGS="${CPPFLAGS} -Iliblua" } diff --git a/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk b/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk index 51b4eae0ac..0bfbe024a0 100644 --- a/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk @@ -6,15 +6,15 @@ PKG_VERSION="1.29.3" PKG_SHA256="e813ad62cccdc6081f00c081eb09b435e6ed58422a8f83e222e1aa9d7a0f0866" PKG_LICENSE="GPL3" PKG_SITE="https://github.com/hasse69/rar2fs" -PKG_URL="https://github.com/hasse69/rar2fs/releases/download/v$PKG_VERSION/rar2fs-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/hasse69/rar2fs/releases/download/v${PKG_VERSION}/rar2fs-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain fuse unrar" PKG_LONGDESC="FUSE file system for reading RAR archives" PKG_BUILD_FLAGS="-sysroot" pre_configure_target() { - PKG_CONFIGURE_OPTS_TARGET="--with-unrar=$PKG_BUILD/unrar \ - --with-unrar-lib=$PKG_BUILD/unrar \ + PKG_CONFIGURE_OPTS_TARGET="--with-unrar=${PKG_BUILD}/unrar \ + --with-unrar-lib=${PKG_BUILD}/unrar \ --disable-static-unrar" - cp -a $(get_install_dir unrar)/usr/include/unrar $PKG_BUILD/ - cp -p $(get_install_dir unrar)/usr/lib/libunrar.a $PKG_BUILD/unrar/ + cp -a $(get_install_dir unrar)/usr/include/unrar ${PKG_BUILD}/ + cp -p $(get_install_dir unrar)/usr/lib/libunrar.a ${PKG_BUILD}/unrar/ } diff --git a/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk b/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk index c21b1d97a1..c1f1a2ae21 100644 --- a/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/sshfs/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="2.10" PKG_SHA256="70845dde2d70606aa207db5edfe878e266f9c193f1956dd10ba1b7e9a3c8d101" PKG_LICENSE="GPL" PKG_SITE="https://github.com/libfuse/sshfs" -PKG_URL="https://github.com/libfuse/sshfs/releases/download/sshfs-$PKG_VERSION/sshfs-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libfuse/sshfs/releases/download/sshfs-${PKG_VERSION}/sshfs-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain fuse glib" PKG_LONGDESC="A filesystem client based on the SSH File Transfer Protocol." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk b/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk index 45d9f8fc23..2eae392ea2 100644 --- a/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk @@ -18,7 +18,7 @@ pre_configure_target() { # When cross-compiling, configure can't set linux version # forcing it sed -i -e 's/ac_cv_linux_vers=unknown/ac_cv_linux_vers=2/' ../configure - CFLAGS+=" -I$SYSROOT_PREFIX/usr/include/tirpc" + CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/tirpc" LDFLAGS+=" -ltirpc" } diff --git a/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk b/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk index 325592ffc9..fc1555b8dd 100644 --- a/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk @@ -14,9 +14,9 @@ PKG_BUILD_FLAGS="-sysroot" PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr" post_unpack() { - mv $PKG_BUILD/README $PKG_BUILD/README- - mv $PKG_BUILD/chipmunk/* $PKG_BUILD - rmdir $PKG_BUILD/chipmunk + mv ${PKG_BUILD}/README ${PKG_BUILD}/README- + mv ${PKG_BUILD}/chipmunk/* ${PKG_BUILD} + rmdir ${PKG_BUILD}/chipmunk } configure_target() { diff --git a/packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk b/packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk index adb26db864..dce7f2138c 100644 --- a/packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="30.pre9" PKG_SHA256="abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63" PKG_LICENSE="GPL" PKG_SITE="https://github.com/HewlettPackard/wireless-tools" -PKG_URL="https://hewlettpackard.github.io/wireless-tools/$PKG_NAME.$PKG_VERSION.tar.gz" +PKG_URL="https://hewlettpackard.github.io/wireless-tools/${PKG_NAME}.${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The Wireless Tools (WT) is a set of tools allowing to manipulate the Wireless Extensions." PKG_BUILD_FLAGS="-sysroot" make_target() { - make PREFIX=/usr CC="$CC" AR="$AR" \ - CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" iwmulticall + make PREFIX=/usr CC="${CC}" AR="${AR}" \ + CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" iwmulticall } makeinstall_target() { - make PREFIX=$INSTALL/usr install-iwmulticall + make PREFIX=${INSTALL}/usr install-iwmulticall } diff --git a/packages/addons/addon-depends/opus/package.mk b/packages/addons/addon-depends/opus/package.mk index 6b591cdb94..6fd1d722e1 100644 --- a/packages/addons/addon-depends/opus/package.mk +++ b/packages/addons/addon-depends/opus/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="1.3.1" PKG_SHA256="65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d" PKG_LICENSE="BSD" PKG_SITE="http://www.opus-codec.org" -PKG_URL="https://archive.mozilla.org/pub/opus/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://archive.mozilla.org/pub/opus/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Codec designed for interactive speech and audio transmission over the Internet." PKG_TOOLCHAIN="configure" -if [ "$TARGET_ARCH" = "arm" ]; then +if [ "${TARGET_ARCH}" = "arm" ]; then PKG_FIXED_POINT="--enable-fixed-point" else PKG_FIXED_POINT="--disable-fixed-point" @@ -19,4 +19,4 @@ fi PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-shared \ - $PKG_FIXED_POINT" + ${PKG_FIXED_POINT}" diff --git a/packages/addons/addon-depends/pngquant/package.mk b/packages/addons/addon-depends/pngquant/package.mk index a71333c15f..ed91eb7809 100644 --- a/packages/addons/addon-depends/pngquant/package.mk +++ b/packages/addons/addon-depends/pngquant/package.mk @@ -15,13 +15,13 @@ configure_host() { } make_host() { - cd $PKG_BUILD - BIN=$PKG_BUILD/pngquant make + cd ${PKG_BUILD} + BIN=${PKG_BUILD}/pngquant make - $STRIP $PKG_BUILD/pngquant + ${STRIP} ${PKG_BUILD}/pngquant } makeinstall_host() { - mkdir -p $TOOLCHAIN/bin - cp $PKG_BUILD/pngquant $TOOLCHAIN/bin + mkdir -p ${TOOLCHAIN}/bin + cp ${PKG_BUILD}/pngquant ${TOOLCHAIN}/bin } diff --git a/packages/addons/addon-depends/protobuf/package.mk b/packages/addons/addon-depends/protobuf/package.mk index 7112e3bb7b..f448b0ab8f 100644 --- a/packages/addons/addon-depends/protobuf/package.mk +++ b/packages/addons/addon-depends/protobuf/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="3.14.0" PKG_SHA256="50ec5a07c0c55d4ec536dd49021f2e194a26bfdbc531d03d1e9d4d3e27175659" PKG_LICENSE="OSS" PKG_SITE="https://developers.google.com/protocol-buffers/" -PKG_URL="https://github.com/google/$PKG_NAME/releases/download/v$PKG_VERSION/$PKG_NAME-cpp-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/google/${PKG_NAME}/releases/download/v${PKG_VERSION}/${PKG_NAME}-cpp-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="toolchain:host zlib:host" PKG_DEPENDS_TARGET="toolchain zlib protobuf:host" PKG_LONGDESC="Protocol Buffers for Google's data interchange format." @@ -17,16 +17,16 @@ PKG_CMAKE_OPTS_HOST="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \ -Dprotobuf_BUILD_EXAMPLES=0 \ -Dprotobuf_WITH_ZLIB=1" -PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_HOST" +PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_HOST}" configure_package() { - PKG_CMAKE_SCRIPT="$PKG_BUILD/cmake/CMakeLists.txt" + PKG_CMAKE_SCRIPT="${PKG_BUILD}/cmake/CMakeLists.txt" } post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin - # HACK: we have protoc in $TOOLCHAIN/bin but it seems + # HACK: we have protoc in ${TOOLCHAIN}/bin but it seems # the one from sysroot prefix is picked when building hyperion. remove it! - rm -f $SYSROOT_PREFIX/usr/bin/protoc + rm -f ${SYSROOT_PREFIX}/usr/bin/protoc } diff --git a/packages/addons/addon-depends/qtbase/package.mk b/packages/addons/addon-depends/qtbase/package.mk index c6364225e9..adc312d88c 100644 --- a/packages/addons/addon-depends/qtbase/package.mk +++ b/packages/addons/addon-depends/qtbase/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="5.14.0" PKG_SHA256="4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463" PKG_LICENSE="GPL" PKG_SITE="http://qt-project.org" -PKG_URL="http://download.qt.io/archive/qt/${PKG_VERSION%.*}/$PKG_VERSION/submodules/$PKG_NAME-everywhere-src-$PKG_VERSION.tar.xz" +PKG_URL="http://download.qt.io/archive/qt/${PKG_VERSION%.*}/${PKG_VERSION}/submodules/${PKG_NAME}-everywhere-src-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="freetype libjpeg-turbo libpng openssl sqlite zlib" PKG_LONGDESC="A cross-platform application and UI framework." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk b/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk index fa9541ec0b..8576e9c11a 100644 --- a/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk +++ b/packages/addons/addon-depends/rpi-tools-depends/RPi.GPIO/package.mk @@ -7,16 +7,16 @@ PKG_SHA256="7424bc6c205466764f30f666c18187a0824077daf20b295c42f08aea2cb87d3f" PKG_ARCH="arm" PKG_LICENSE="MIT" PKG_SITE="http://sourceforge.net/p/raspberry-gpio-python/" -PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="A module to control Raspberry Pi GPIO channels." PKG_TOOLCHAIN="manual" pre_configure_target() { - export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" - export LDSHARED="$CC -shared" - export CFLAGS="$CFLAGS -fcommon" - export CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/$PKG_PYTHON_VERSION" + export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr" + export LDSHARED="${CC} -shared" + export CFLAGS="${CFLAGS} -fcommon" + export CPPFLAGS="${TARGET_CPPFLAGS} -I${SYSROOT_PREFIX}/usr/include/${PKG_PYTHON_VERSION}" } make_target() { diff --git a/packages/addons/addon-depends/rpi-tools-depends/gpiozero/package.mk b/packages/addons/addon-depends/rpi-tools-depends/gpiozero/package.mk index eea3936842..6d88a1ffaf 100644 --- a/packages/addons/addon-depends/rpi-tools-depends/gpiozero/package.mk +++ b/packages/addons/addon-depends/rpi-tools-depends/gpiozero/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="ae1a8dc4e6e793ffd8f900968f3290d218052c46347fa0c0503c65fabe422e4d" PKG_ARCH="arm" PKG_LICENSE="BSD" PKG_SITE="https://github.com/RPi-Distro/python-gpiozero" -PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A simple interface to everyday GPIO components used with Raspberry Pi." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk b/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk index 17177a72d1..d6b814c322 100644 --- a/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk +++ b/packages/addons/addon-depends/rpi-tools-depends/lan951x-led-ctl/package.mk @@ -7,15 +7,15 @@ PKG_SHA256="27d607d3c5c7b142681dcd9fd0afecb7fcb052abfaffc330b28906f782e602f3" PKG_ARCH="arm" PKG_LICENSE="GPL" PKG_SITE="https://mockmoon-cybernetics.ch/computer/raspberry-pi/lan951x-led-ctl/" -PKG_URL="https://mockmoon-cybernetics.ch/cgi/cgit/lan951x-led-ctl.git/snapshot/lan951x-led-ctl-$PKG_VERSION.tar.xz" +PKG_URL="https://mockmoon-cybernetics.ch/cgi/cgit/lan951x-led-ctl.git/snapshot/lan951x-led-ctl-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libusb" PKG_LONGDESC="Control LEDs connected to LAN9512/LAN9514 ethernet USB controllers." PKG_TOOLCHAIN="manual" make_target() { - $CC -std=c11 -I./include -Wall -Wstrict-prototypes -Wconversion \ + ${CC} -std=c11 -I./include -Wall -Wstrict-prototypes -Wconversion \ -Wmissing-prototypes -Wshadow -Wextra -Wunused \ - $CFLAGS -lusb-1.0 $LDFLAGS -o lan951x-led-ctl src/lan951x-led-ctl.c + ${CFLAGS} -lusb-1.0 ${LDFLAGS} -o lan951x-led-ctl src/lan951x-led-ctl.c - $STRIP lan951x-led-ctl + ${STRIP} lan951x-led-ctl } diff --git a/packages/addons/addon-depends/rpi_ws281x/package.mk b/packages/addons/addon-depends/rpi_ws281x/package.mk index 0adb1aa1de..32e60b6efb 100644 --- a/packages/addons/addon-depends/rpi_ws281x/package.mk +++ b/packages/addons/addon-depends/rpi_ws281x/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="6c5ade93d1af78cd19e60ee5ecc34adfd111b186" PKG_SHA256="e8fb94429edc21cfd894548755a417eb5b2e121329f4b54270cfb3f727696e21" PKG_LICENSE="BSD-3c" PKG_SITE="https://github.com/hyperion-project/rpi_ws281x" -PKG_URL="https://github.com/hyperion-project/rpi_ws281x/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/hyperion-project/rpi_ws281x/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Userspace Raspberry Pi PWM library for WS281X LEDs." PKG_TOOLCHAIN="manual" diff --git a/packages/addons/addon-depends/rsyslog-depends/libestr/package.mk b/packages/addons/addon-depends/rsyslog-depends/libestr/package.mk index 7600a6f03d..152be1f437 100644 --- a/packages/addons/addon-depends/rsyslog-depends/libestr/package.mk +++ b/packages/addons/addon-depends/rsyslog-depends/libestr/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.1.11" PKG_SHA256="46b53b80f875fd82981d927a45f0c9df9d17ee1d0e29efab76aaa9cd54a46bb4" PKG_LICENSE="GPL" PKG_SITE="http://libestr.adiscon.com" -PKG_URL="https://github.com/rsyslog/libestr/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/rsyslog/libestr/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_TOOLCHAIN="autotools" PKG_LONGDESC="Some essentials for string handling." diff --git a/packages/addons/addon-depends/rsyslog-depends/libfastjson/package.mk b/packages/addons/addon-depends/rsyslog-depends/libfastjson/package.mk index 8949dd1b6f..f4dded89bb 100644 --- a/packages/addons/addon-depends/rsyslog-depends/libfastjson/package.mk +++ b/packages/addons/addon-depends/rsyslog-depends/libfastjson/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.99.8" PKG_SHA256="3544c757668b4a257825b3cbc26f800f59ef3c1ff2a260f40f96b48ab1d59e07" PKG_LICENSE="GPL" PKG_SITE="http://www.rsyslog.com/tag/libfastjson" -PKG_URL="http://download.rsyslog.com/libfastjson/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://download.rsyslog.com/libfastjson/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A fast json library for C." PKG_BUILD_FLAGS="+pic" diff --git a/packages/addons/addon-depends/rsyslog-depends/liblogging/package.mk b/packages/addons/addon-depends/rsyslog-depends/liblogging/package.mk index cd05a04d02..523dbc8c9a 100644 --- a/packages/addons/addon-depends/rsyslog-depends/liblogging/package.mk +++ b/packages/addons/addon-depends/rsyslog-depends/liblogging/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.0.6" PKG_SHA256="338c6174e5c8652eaa34f956be3451f7491a4416ab489aef63151f802b00bf93" PKG_LICENSE="GPL" PKG_SITE="http://www.liblogging.org" -PKG_URL="http://download.rsyslog.com/liblogging/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://download.rsyslog.com/liblogging/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain systemd" PKG_LONGDESC="An easy to use and lightweight signal-safe logging library." diff --git a/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk b/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk index 225fed909e..2ae1b6d8d7 100644 --- a/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk +++ b/packages/addons/addon-depends/rsyslog-depends/liblognorm/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="2.0.6" PKG_SHA256="594ea3318ef419cb7f21cf81c513db35a838b32207999a11a82b709da9ff9a2b" PKG_LICENSE="GPL" PKG_SITE="http://www.liblognorm.com" -PKG_URL="https://github.com/rsyslog/liblognorm/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/rsyslog/liblognorm/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libestr libfastjson" PKG_TOOLCHAIN="autotools" PKG_LONGDESC="A fast samples-based log normalization library." diff --git a/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk b/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk index 89770c6ee1..ee6d5ba480 100644 --- a/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk +++ b/packages/addons/addon-depends/rsyslog-depends/librelp/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.9.0" PKG_SHA256="24ee9e843960d1400a44ffaedb0b1ec91463df8f8acca869cc027ed25ee6bf33" PKG_LICENSE="GPL" PKG_SITE="https://www.rsyslog.com/category/librelp/" -PKG_URL="http://download.rsyslog.com/librelp/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://download.rsyslog.com/librelp/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Provides reliable event logging over the network." PKG_TOOLCHAIN="autotools" diff --git a/packages/addons/addon-depends/runc/package.mk b/packages/addons/addon-depends/runc/package.mk index d553dc73da..fe773eae2e 100644 --- a/packages/addons/addon-depends/runc/package.mk +++ b/packages/addons/addon-depends/runc/package.mk @@ -18,17 +18,17 @@ PKG_GIT_COMMIT="ff819c7e9184c13b7c2607fe6c30ae19403a7aff" pre_make_target() { go_configure - export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_GIT_COMMIT} -X main.version=$(cat ./VERSION) -extld $CC" + export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_GIT_COMMIT} -X main.version=$(cat ./VERSION) -extld ${CC}" mkdir -p ${GOPATH} - if [ -d $PKG_BUILD/vendor ]; then - mv $PKG_BUILD/vendor ${GOPATH}/src + if [ -d ${PKG_BUILD}/vendor ]; then + mv ${PKG_BUILD}/vendor ${GOPATH}/src fi - ln -fs $PKG_BUILD ${GOPATH}/src/github.com/opencontainers/runc + ln -fs ${PKG_BUILD} ${GOPATH}/src/github.com/opencontainers/runc } make_target() { mkdir -p bin - $GOLANG build -v -o bin/runc -a -tags "cgo static_build" -ldflags "$LDFLAGS" ./ + ${GOLANG} build -v -o bin/runc -a -tags "cgo static_build" -ldflags "${LDFLAGS}" ./ } diff --git a/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk b/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk index 4688caf7cf..21baa5d2d4 100644 --- a/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/aixlog/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.4.0" PKG_SHA256="cce5b8f5408cfd19b4d4eb678274d0c74490dc0eb2bdc8f97c852036897d6099" PKG_LICENSE="MIT" PKG_SITE="https://github.com/badaix/aixlog" -PKG_URL="https://github.com/badaix/aixlog/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/badaix/aixlog/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Header-only C++ logging library." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk b/packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk index 3157f3ba92..ebdb7d068d 100644 --- a/packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk @@ -7,15 +7,15 @@ PKG_VERSION="1.2.2" PKG_SHA256="1c0f06450c928d711719686c9dbece2d480184f36fab11b8f0534cb7b41e337d" PKG_LICENSE="GPL" PKG_SITE="http://www.alsa-project.org/" -PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain alsa-lib" PKG_LONGDESC="Alsa plugins." -if [ "$PULSEAUDIO_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio" +if [ "${PULSEAUDIO_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" pulseaudio" SUBDIR_PULSEAUDIO="pulse" fi PKG_CONFIGURE_OPTS_TARGET="--with-plugindir=/usr/lib/alsa" -PKG_MAKE_OPTS_TARGET="SUBDIRS=$SUBDIR_PULSEAUDIO" -PKG_MAKEINSTALL_OPTS_TARGET="SUBDIRS=$SUBDIR_PULSEAUDIO" +PKG_MAKE_OPTS_TARGET="SUBDIRS=${SUBDIR_PULSEAUDIO}" +PKG_MAKEINSTALL_OPTS_TARGET="SUBDIRS=${SUBDIR_PULSEAUDIO}" diff --git a/packages/addons/addon-depends/snapcast-depends/asio/package.mk b/packages/addons/addon-depends/snapcast-depends/asio/package.mk index 4eb5ea36e1..e479e79aa3 100644 --- a/packages/addons/addon-depends/snapcast-depends/asio/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/asio/package.mk @@ -16,5 +16,5 @@ PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--without-boost --without-openssl" post_unpack() { - mv $PKG_BUILD/asio/* $PKG_BUILD + mv ${PKG_BUILD}/asio/* ${PKG_BUILD} } diff --git a/packages/addons/addon-depends/snapcast-depends/popl/package.mk b/packages/addons/addon-depends/snapcast-depends/popl/package.mk index 963fbe82c7..5ad00a492e 100644 --- a/packages/addons/addon-depends/snapcast-depends/popl/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/popl/package.mk @@ -6,13 +6,13 @@ PKG_VERSION="1.2.0" PKG_SHA256="dee63eed9bac3da9ec0008902c7ec72caa319461b20fc116e57e45948671a0bf" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/badaix/popl" -PKG_URL="https://github.com/badaix/popl/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/badaix/popl/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Header-only C++ program options parser library." PKG_TOOLCHAIN="manual" PKG_BUILD_FLAGS="-sysroot" makeinstall_target() { - mkdir -p $INSTALL/usr/include - cp -p $PKG_BUILD/include/popl.hpp $INSTALL/usr/include + mkdir -p ${INSTALL}/usr/include + cp -p ${PKG_BUILD}/include/popl.hpp ${INSTALL}/usr/include } diff --git a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk index 952fd0d3f1..d52f0089fc 100644 --- a/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/shairport-sync/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="3.3.7" PKG_SHA256="7f8d4ecec53f2f681a962467bf09205568fc936c8c31a9ee07b1bd72d3d95b12" PKG_LICENSE="OSS" PKG_SITE="https://github.com/mikebrady/shairport-sync" -PKG_URL="https://github.com/mikebrady/shairport-sync/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/mikebrady/shairport-sync/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain alsa-lib avahi libconfig libdaemon openssl popt pulseaudio soxr" PKG_LONGDESC="AirPlay audio player." PKG_TOOLCHAIN="autotools" diff --git a/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk b/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk index bf9b8ebbc2..49e953eb9b 100644 --- a/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk +++ b/packages/addons/addon-depends/snapcast-depends/snapcast/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.23.0" PKG_SHA256="70efdeea60021f493f77ba1f3d00784911463cad11c6df214ecb19d74899b611" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/badaix/snapcast" -PKG_URL="https://github.com/badaix/snapcast/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/badaix/snapcast/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain aixlog alsa-lib asio avahi flac libvorbis popl boost opus" PKG_LONGDESC="Synchronous multi-room audio player." PKG_TOOLCHAIN="make" @@ -14,14 +14,14 @@ PKG_BUILD_FLAGS="-sysroot" pre_configure_target() { cd .. - rm -rf .$TARGET_NAME - CXXFLAGS="$CXXFLAGS -pthread \ + rm -rf .${TARGET_NAME} + CXXFLAGS="${CXXFLAGS} -pthread \ -I$(get_install_dir aixlog)/usr/include \ -I$(get_install_dir asio)/usr/include \ -I$(get_install_dir popl)/usr/include" } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -p server/snapserver client/snapclient $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -p server/snapserver client/snapclient ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/system-tools-depends/autossh/package.mk b/packages/addons/addon-depends/system-tools-depends/autossh/package.mk index 318f7998b2..9d5ca84e60 100644 --- a/packages/addons/addon-depends/system-tools-depends/autossh/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/autossh/package.mk @@ -16,10 +16,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes" pre_configure_target() { - export CFLAGS="$CFLAGS -I." + export CFLAGS="${CFLAGS} -I." } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -p autossh $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -p autossh ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk index aeb69c70c8..1261d99ff2 100644 --- a/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk @@ -7,13 +7,13 @@ PKG_SHA256="016dfae596b691c8d38e488f8bfac3ba437befc260a6f32e60dd390595c9f3e9" PKG_ARCH="x86_64" PKG_LICENSE="LGPL" PKG_SITE="https://github.com/rhboot/efivar" -PKG_URL="https://github.com/rhboot/efivar/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/rhboot/efivar/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain efivar:host" PKG_LONGDESC="Tools and library to manipulate EFI variables." pre_make_host() { - export TOPDIR=$PKG_BUILD + export TOPDIR=${PKG_BUILD} } make_host() { @@ -22,7 +22,7 @@ make_host() { pre_make_target() { sed -e 's/-Werror//' -i src/include/gcc.specs - export TOPDIR=$PKG_BUILD + export TOPDIR=${PKG_BUILD} } make_target() { @@ -34,9 +34,9 @@ makeinstall_host() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib - cp -P src/libefivar.a src/libefiboot.a $SYSROOT_PREFIX/usr/lib/ + mkdir -p ${SYSROOT_PREFIX}/usr/lib + cp -P src/libefivar.a src/libefiboot.a ${SYSROOT_PREFIX}/usr/lib/ - mkdir -p $SYSROOT_PREFIX/usr/include/efivar - cp -P src/include/efivar/*.h $SYSROOT_PREFIX/usr/include/efivar + mkdir -p ${SYSROOT_PREFIX}/usr/include/efivar + cp -P src/include/efivar/*.h ${SYSROOT_PREFIX}/usr/include/efivar } diff --git a/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk index 9cad351207..cab3421a83 100644 --- a/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/depends/libmtp/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.1.18" PKG_SHA256="7280fe50c044c818a06667f45eabca884deab3193caa8682e0b581e847a281f0" PKG_LICENSE="GPL" PKG_SITE="http://libmtp.sourceforge.net/" -PKG_URL="$SOURCEFORGE_SRC/project/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="${SOURCEFORGE_SRC}/project/${PKG_NAME}/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libusb" PKG_LONGDESC="An Initiator implementation of the Media Transfer Protocol (MTP)." PKG_TOOLCHAIN="autotools" diff --git a/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk index d825fc415c..10cac399a6 100644 --- a/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.9.0" PKG_SHA256="d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd" PKG_LICENSE="BSD" PKG_SITE="https://www.libssh2.org" -PKG_URL="https://www.libssh2.org/download/libssh2-$PKG_VERSION.tar.gz" +PKG_URL="https://www.libssh2.org/download/libssh2-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain openssl" PKG_LONGDESC="A library implementing the SSH2 protocol" PKG_BUILD_FLAGS="+pic" diff --git a/packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk b/packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk index 956463d02a..b8eb7d56ff 100644 --- a/packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="6.9.6" PKG_SHA256="bd0faeb887f748193282848d01ec2dad8943b5dfcb8dc03ed52dcc963549e819" PKG_LICENSE="BSD" PKG_SITE="https://github.com/kkos/oniguruma" -PKG_URL="https://github.com/kkos/oniguruma/releases/download/v$PKG_VERSION/onig-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kkos/oniguruma/releases/download/v${PKG_VERSION}/onig-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A regular expression library" diff --git a/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk b/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk index fc1727fbe1..4643abb80b 100644 --- a/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/diffutils/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="3.7" PKG_SHA256="b3a7a6221c3dc916085f0d205abf6b8e1ba443d4dd965118da364a1dc1cb3a26" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/diffutils/" -PKG_URL="http://ftpmirror.gnu.org/diffutils/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftpmirror.gnu.org/diffutils/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A package of several programs related to finding differences between files." PKG_TOOLCHAIN="autotools" diff --git a/packages/addons/addon-depends/system-tools-depends/dstat/package.mk b/packages/addons/addon-depends/system-tools-depends/dstat/package.mk index 31c22b033b..9c65e0fed8 100644 --- a/packages/addons/addon-depends/system-tools-depends/dstat/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/dstat/package.mk @@ -6,17 +6,17 @@ PKG_VERSION="e428c7dc7137f81f8ca6bef8854b37a4ddd4f337" # 19 Jun 2020 PKG_SHA256="3315f5cefc7cd4e968430baa19247fc32af36dd42c9ad3edf5962ae4f597013f" PKG_LICENSE="GPL" PKG_SITE="http://dag.wiee.rs/home-made/dstat" -PKG_URL="https://github.com/dstat-real/dstat/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/dstat-real/dstat/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3" PKG_LONGDESC="Versatile resource statistics tool." PKG_TOOLCHAIN="manual" PKG_BUILD_FLAGS="-sysroot" post_unpack() { - rm $PKG_BUILD/Makefile + rm ${PKG_BUILD}/Makefile } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -p dstat $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -p dstat ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/system-tools-depends/dtach/package.mk b/packages/addons/addon-depends/system-tools-depends/dtach/package.mk index 87616ea491..4bdb8c8d74 100644 --- a/packages/addons/addon-depends/system-tools-depends/dtach/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/dtach/package.mk @@ -12,6 +12,6 @@ PKG_LONGDESC="A program that emulates the detach feature of screen." PKG_BUILD_FLAGS="-sysroot" makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -p dtach $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -p dtach ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk b/packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk index c5e4c4bb84..57f6734eab 100644 --- a/packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk @@ -7,14 +7,14 @@ PKG_SHA256="e951ce9e0534c63bb71ba8b2a3830d4402e51440cb4d524d18c1ef40ae5ee218" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://github.com/rhboot/efibootmgr" -PKG_URL="https://github.com/rhboot/efibootmgr/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/rhboot/efibootmgr/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain efivar pciutils zlib" PKG_LONGDESC="Tool to modify UEFI Firmware Boot Manager Variables." PKG_BUILD_FLAGS="-sysroot" make_target() { - export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include -I$SYSROOT_PREFIX/usr/include/efivar -fgnu89-inline -Wno-pointer-sign" - export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -ludev -ldl" + export CFLAGS="${CFLAGS} -I${SYSROOT_PREFIX}/usr/include -I${SYSROOT_PREFIX}/usr/include/efivar -fgnu89-inline -Wno-pointer-sign" + export LDFLAGS="${LDFLAGS} -L${SYSROOT_PREFIX}/usr/lib -ludev -ldl" make EFIDIR=BOOT EFI_LOADER=bootx64.efi PKG_CONFIG=true \ LDLIBS="-lefiboot -lefivar" \ @@ -22,6 +22,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -p src/efibootmgr $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -p src/efibootmgr ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/system-tools-depends/encfs/package.mk b/packages/addons/addon-depends/system-tools-depends/encfs/package.mk index 3e4e505fea..0838b1acaa 100644 --- a/packages/addons/addon-depends/system-tools-depends/encfs/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/encfs/package.mk @@ -6,11 +6,11 @@ PKG_VERSION="1.9.5" PKG_SHA256="4709f05395ccbad6c0a5b40a4619d60aafe3473b1a79bafb3aa700b1f756fd63" PKG_LICENSE="LGPL" PKG_SITE="https://vgough.github.io/encfs/" -PKG_URL="https://github.com/vgough/encfs/releases/download/v$PKG_VERSION/encfs-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/vgough/encfs/releases/download/v${PKG_VERSION}/encfs-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain fuse openssl" PKG_LONGDESC="A Encrypted Filesystem for FUSE." PKG_BUILD_FLAGS="-sysroot" PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=$SYSROOT_PREFIX/usr/include \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=${SYSROOT_PREFIX}/usr/include \ -DBUILD_UNIT_TESTS=OFF" diff --git a/packages/addons/addon-depends/system-tools-depends/evtest/package.mk b/packages/addons/addon-depends/system-tools-depends/evtest/package.mk index dff2c5cb52..7577a93af1 100644 --- a/packages/addons/addon-depends/system-tools-depends/evtest/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/evtest/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.34" PKG_SHA256="8e2431cdc83587925048157a5772aa0c79b79a64ae5815bf004634cbe53597d0" PKG_LICENSE="GPL" PKG_SITE="http://cgit.freedesktop.org/evtest/" -PKG_URL="https://repo.or.cz/evtest.git/snapshot/evtest-$PKG_VERSION.tar.gz" +PKG_URL="https://repo.or.cz/evtest.git/snapshot/evtest-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libxml2" PKG_LONGDESC="A simple tool for input event debugging." PKG_TOOLCHAIN="autotools" diff --git a/packages/addons/addon-depends/system-tools-depends/getscancodes/package.mk b/packages/addons/addon-depends/system-tools-depends/getscancodes/package.mk index e54e707379..e7b9a4e32f 100644 --- a/packages/addons/addon-depends/system-tools-depends/getscancodes/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/getscancodes/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="1.0" PKG_SHA256="5f4e2ab22dc3890392ab8870fb79bbebdfd39b34dcd5bafcb51edee554855d34" PKG_LICENSE="GPL" PKG_SITE="http://keytouch.sourceforge.net" -PKG_URL="$SOURCEFORGE_SRC/keytouch/getscancodes-${PKG_VERSION}.tar.gz" +PKG_URL="${SOURCEFORGE_SRC}/keytouch/getscancodes-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Shows the scancode of the pressed or released key." PKG_BUILD_FLAGS="-sysroot" pre_configure_target() { - PKG_MAKE_OPTS_TARGET="CC=$CC" + PKG_MAKE_OPTS_TARGET="CC=${CC}" } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -p getscancodes $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -p getscancodes ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk b/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk index 1b89d09805..5057d18bd1 100644 --- a/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk @@ -14,6 +14,6 @@ PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--with-db-path=/storage/.kodi/addons/virtual.system-tools/data/hddtemp.db" post_makeinstall_target() { - mkdir -p $INSTALL/usr/share/misc - cp $PKG_DIR/db/* $INSTALL/usr/share/misc + mkdir -p ${INSTALL}/usr/share/misc + cp ${PKG_DIR}/db/* ${INSTALL}/usr/share/misc } diff --git a/packages/addons/addon-depends/system-tools-depends/hid_mapper/package.mk b/packages/addons/addon-depends/system-tools-depends/hid_mapper/package.mk index 5f62c30ea5..f115bd993d 100644 --- a/packages/addons/addon-depends/system-tools-depends/hid_mapper/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/hid_mapper/package.mk @@ -12,6 +12,6 @@ PKG_LONGDESC="A Generic HID mapper." PKG_BUILD_FLAGS="-sysroot" makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -p hid_mapper $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -p hid_mapper ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/system-tools-depends/htop/package.mk b/packages/addons/addon-depends/system-tools-depends/htop/package.mk index b6725123e1..4f85829ecb 100644 --- a/packages/addons/addon-depends/system-tools-depends/htop/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/htop/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="3.0.5" PKG_SHA256="4c2629bd50895bd24082ba2f81f8c972348aa2298cc6edc6a21a7fa18b73990c" PKG_LICENSE="GPL" PKG_SITE="https://hisham.hm/htop" -PKG_URL="https://github.com/htop-dev/htop/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/htop-dev/htop/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses" PKG_LONGDESC="An interactive process viewer for Unix." PKG_TOOLCHAIN="autotools" diff --git a/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk b/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk index af69152e10..ca04b2eaa5 100644 --- a/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/i2c-tools/package.mk @@ -6,22 +6,22 @@ PKG_VERSION="4.2" PKG_SHA256="37f2dabc7082d185903ff21d1f584b5dcb4dd2eb2c879bbd8d7c50ae900dacd6" PKG_LICENSE="GPL" PKG_SITE="https://i2c.wiki.kernel.org/index.php/I2C_Tools" -PKG_URL="https://www.kernel.org/pub/software/utils/i2c-tools/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://www.kernel.org/pub/software/utils/i2c-tools/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="A heterogeneous set of I2C tools for Linux." PKG_BUILD_FLAGS="-sysroot" pre_make_target() { - export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" - export LDSHARED="$CC -shared" + export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr" + export LDSHARED="${CC} -shared" } make_target() { make EXTRA="py-smbus" \ - CC="$CC" \ - AR="$AR" \ - CFLAGS="$TARGET_CFLAGS" \ - CPPFLAGS="$TARGET_CPPFLAGS -I${SYSROOT_PREFIX}/usr/include/$PKG_PYTHON_VERSION" \ + CC="${CC}" \ + AR="${AR}" \ + CFLAGS="${TARGET_CFLAGS}" \ + CPPFLAGS="${TARGET_CPPFLAGS} -I${SYSROOT_PREFIX}/usr/include/${PKG_PYTHON_VERSION}" \ PYTHON=${TOOLCHAIN}/bin/python3 } diff --git a/packages/addons/addon-depends/system-tools-depends/inotify-tools/package.mk b/packages/addons/addon-depends/system-tools-depends/inotify-tools/package.mk index 7674deb3fc..99e21da1fc 100644 --- a/packages/addons/addon-depends/system-tools-depends/inotify-tools/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/inotify-tools/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="3.20.11.0" PKG_SHA256="58a3cde89e4a5111a87ac16b56b06a8f885460fca0aea51b69c856ce30a37a14" PKG_LICENSE="GPLv2" PKG_SITE="http://wiki.github.com/inotify-tools/inotify-tools/" -PKG_URL="https://github.com/inotify-tools/inotify-tools/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/inotify-tools/inotify-tools/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A C library and a set of command-line programs for Linux providing a simple interface to inotify." PKG_TOOLCHAIN="autotools" @@ -15,5 +15,5 @@ PKG_BUILD_FLAGS="-sysroot" PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --disable-doxygen" pre_configure_target() { - CFLAGS="$CFLAGS -Wno-error=misleading-indentation" + CFLAGS+=" -Wno-error=misleading-indentation" } diff --git a/packages/addons/addon-depends/system-tools-depends/jq/package.mk b/packages/addons/addon-depends/system-tools-depends/jq/package.mk index 2cad7d63d3..ad41d1de3b 100644 --- a/packages/addons/addon-depends/system-tools-depends/jq/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/jq/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.6" PKG_SHA256="5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72" PKG_LICENSE="MIT" PKG_SITE="http://stedolan.github.io/jq/" -PKG_URL="https://github.com/stedolan/jq/releases/download/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/stedolan/jq/releases/download/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain oniguruma" PKG_LONGDESC="A like sed for JSON data." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk b/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk index 46b554082a..f9c287dc27 100644 --- a/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk @@ -13,12 +13,12 @@ PKG_LONGDESC="Provides user-space support for the hardware monitoring drivers." PKG_BUILD_FLAGS="-sysroot" pre_make_target() { - PKG_MAKE_OPTS_TARGET="PREFIX=/usr CC=$CC AR=$AR" + PKG_MAKE_OPTS_TARGET="PREFIX=/usr CC=${CC} AR=${AR}" - export CFLAGS="$TARGET_CFLAGS" - export CPPFLAGS="$TARGET_CPPFLAGS" + export CFLAGS="${TARGET_CFLAGS}" + export CPPFLAGS="${TARGET_CPPFLAGS}" } pre_makeinstall_target() { - PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr CC=$CC AR=$AR" + PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr CC=${CC} AR=${AR}" } diff --git a/packages/addons/addon-depends/system-tools-depends/lshw/package.mk b/packages/addons/addon-depends/system-tools-depends/lshw/package.mk index 7af4bd9371..0973d638f3 100644 --- a/packages/addons/addon-depends/system-tools-depends/lshw/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/lshw/package.mk @@ -12,5 +12,5 @@ PKG_LONGDESC="A small tool to provide detailed information on the hardware confi PKG_BUILD_FLAGS="-sysroot" make_target() { - make CXX=$CXX -C src/ + make CXX=${CXX} -C src/ } diff --git a/packages/addons/addon-depends/system-tools-depends/mc/package.mk b/packages/addons/addon-depends/system-tools-depends/mc/package.mk index 41dd4a402f..2e69fe4c83 100644 --- a/packages/addons/addon-depends/system-tools-depends/mc/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/mc/package.mk @@ -18,7 +18,7 @@ PKG_CONFIGURE_OPTS_TARGET=" \ --with-homedir=/storage/.kodi/userdata/addon_data/virtual.system-tools \ --sysconfdir=/storage/.kodi/addons/virtual.system-tools/etc \ --with-screen=ncurses \ - --with-sysroot=$SYSROOT_PREFIX \ + --with-sysroot=${SYSROOT_PREFIX} \ --disable-aspell \ --without-diff-viewer \ --disable-doxygen-doc \ @@ -37,13 +37,13 @@ PKG_CONFIGURE_OPTS_TARGET=" \ --without-x" pre_configure_target() { - LDFLAGS="$LDFLAGS -lcrypto -lssl" + LDFLAGS+=" -lcrypto -lssl" } post_makeinstall_target() { - rm -rf $INSTALL/storage/.kodi/addons/virtual.system-tools/data/locale - rm -rf $INSTALL/storage/.kodi/addons/virtual.system-tools/data/mc/help/mc.hlp.* - mv $INSTALL/usr/bin/mc $INSTALL/usr/bin/mc-bin - rm -f $INSTALL/usr/bin/{mcedit,mcview} - cp -p $PKG_DIR/wrapper/* $INSTALL/usr/bin + rm -rf ${INSTALL}/storage/.kodi/addons/virtual.system-tools/data/locale + rm -rf ${INSTALL}/storage/.kodi/addons/virtual.system-tools/data/mc/help/mc.hlp.* + mv ${INSTALL}/usr/bin/mc ${INSTALL}/usr/bin/mc-bin + rm -f ${INSTALL}/usr/bin/{mcedit,mcview} + cp -p ${PKG_DIR}/wrapper/* ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/system-tools-depends/nmon/package.mk b/packages/addons/addon-depends/system-tools-depends/nmon/package.mk index a82ada5b63..2b680fd3f6 100644 --- a/packages/addons/addon-depends/system-tools-depends/nmon/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/nmon/package.mk @@ -18,7 +18,7 @@ unpack() { } make_target() { - case $ARCH in + case ${ARCH} in x86_64) arch="X86" ;; @@ -28,12 +28,12 @@ make_target() { esac # original makefile is located at # - https://downloads.sourceforge.net/project/nmon/makefile - CFLAGS="$CFLAGS -g -O3 -Wall -D JFS -D GETUSER -D LARGEMEM" - LDFLAGS="$LDFLAGS -lncurses -lm -g" - $CC -o nmon nmon-${PKG_VERSION}.c $CFLAGS $LDFLAGS -D $arch -DUBUNTU + CFLAGS+=" -g -O3 -Wall -D JFS -D GETUSER -D LARGEMEM" + LDFLAGS+=" -lncurses -lm -g" + ${CC} -o nmon nmon-${PKG_VERSION}.c ${CFLAGS} ${LDFLAGS} -D ${arch} -DUBUNTU } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -p nmon $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -p nmon ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/system-tools-depends/patch/package.mk b/packages/addons/addon-depends/system-tools-depends/patch/package.mk index d90167ec39..e06545a118 100644 --- a/packages/addons/addon-depends/system-tools-depends/patch/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/patch/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="2.7.6" PKG_SHA256="ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd" PKG_LICENSE="GPL" PKG_SITE="http://savannah.gnu.org/projects/patch/" -PKG_URL="http://ftpmirror.gnu.org/patch/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftpmirror.gnu.org/patch/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Patch takes a patch file containing a difference listing produced by the diff." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/system-tools-depends/pv/package.mk b/packages/addons/addon-depends/system-tools-depends/pv/package.mk index 1f9428bfce..9a7eca3638 100644 --- a/packages/addons/addon-depends/system-tools-depends/pv/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/pv/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.6.6" PKG_SHA256="608ef935f7a377e1439c181c4fc188d247da10d51a19ef79bcdee5043b0973f1" PKG_LICENSE="GNU" PKG_SITE="http://www.ivarch.com/programs/pv.shtml" -PKG_URL="http://www.ivarch.com/programs/sources/pv-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.ivarch.com/programs/sources/pv-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Pipe Viwer can be inserted into any normal pipeline between two processes." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/system-tools-depends/screen/package.mk b/packages/addons/addon-depends/system-tools-depends/screen/package.mk index 00244d7db9..f871b24ec0 100644 --- a/packages/addons/addon-depends/system-tools-depends/screen/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/screen/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="4.8.0" PKG_SHA256="6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/screen/" -PKG_URL="http://ftpmirror.gnu.org/screen/$PKG_NAME-${PKG_VERSION}.tar.gz" +PKG_URL="http://ftpmirror.gnu.org/screen/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses" PKG_LONGDESC="Screen is a window manager that multiplexes a physical terminal between several processes" PKG_BUILD_FLAGS="-sysroot -parallel" diff --git a/packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk b/packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk index c184389536..28b1d9ee16 100644 --- a/packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="7.2" PKG_SHA256="5cd98a27e6393168bc6aaea070d9e1cd551b0f898c52f66b2ff2e5d274118cd6" PKG_LICENSE="GPL" PKG_SITE="https://www.smartmontools.org" -PKG_URL="https://downloads.sourceforge.net/sourceforge/smartmontools/smartmontools-$PKG_VERSION.tar.gz" +PKG_URL="https://downloads.sourceforge.net/sourceforge/smartmontools/smartmontools-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Control and monitor storage systems using S.M.A.R.T." PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/system-tools-depends/st/package.mk b/packages/addons/addon-depends/system-tools-depends/st/package.mk index 0e4792e223..d12eefc8fc 100644 --- a/packages/addons/addon-depends/system-tools-depends/st/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/st/package.mk @@ -13,8 +13,8 @@ PKG_LONGDESC="A simple terminal implementation for X" PKG_BUILD_FLAGS="-sysroot" PKG_MAKE_OPTS_TARGET="X11INC=$(get_build_dir libXft)/include \ - X11LIB=$(get_build_dir libXft)/.$TARGET_NAME/src/.libs" + X11LIB=$(get_build_dir libXft)/.${TARGET_NAME}/src/.libs" pre_configure_target() { - LDFLAGS="-lXrender $LDFLAGS" + LDFLAGS="-lXrender ${LDFLAGS}" } diff --git a/packages/addons/addon-depends/system-tools-depends/strace/package.mk b/packages/addons/addon-depends/system-tools-depends/strace/package.mk index 386d6c7a9e..0e3ea5a2d9 100644 --- a/packages/addons/addon-depends/system-tools-depends/strace/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/strace/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="5.10" PKG_SHA256="fe3982ea4cd9aeb3b4ba35f6279f0b577a37175d3282be24b9a5537b56b8f01c" PKG_LICENSE="BSD" PKG_SITE="https://strace.io/" -PKG_URL="https://strace.io/files/$PKG_VERSION/strace-$PKG_VERSION.tar.xz" +PKG_URL="https://strace.io/files/${PKG_VERSION}/strace-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="strace is a diagnostic, debugging and instructional userspace utility" PKG_TOOLCHAIN="autotools" diff --git a/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk b/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk index 178ffa8525..92d70e301b 100644 --- a/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.12.01" PKG_SHA256="d354bbbb1500cfe043c761014dc9c3f62779747fafea8a19af94402327f6d3fc" PKG_LICENSE="GPLv2" PKG_SITE="https://kernel.ubuntu.com/~cking/stress-ng/" -PKG_URL="https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-$PKG_VERSION.tar.xz" +PKG_URL="https://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain attr keyutils libaio libcap zlib" PKG_LONGDESC="stress-ng will stress test a computer system in various selectable ways" PKG_BUILD_FLAGS="-sysroot" diff --git a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk index b63a2aa2af..6d6397f1f7 100644 --- a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk @@ -13,24 +13,24 @@ PKG_TOOLCHAIN="manual" PKG_BUILD_FLAGS="+pic -sysroot -parallel" unpack() { - mkdir -p $PKG_BUILD/unrar lib - tar -xf $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz -C $PKG_BUILD/ - cp -a $PKG_BUILD/unrar $PKG_BUILD/lib + mkdir -p ${PKG_BUILD}/unrar lib + tar -xf ${SOURCES}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz -C ${PKG_BUILD}/ + cp -a ${PKG_BUILD}/unrar ${PKG_BUILD}/lib } make_target() { - make CXX="$CXX" \ - CXXFLAGS="$TARGET_CXXFLAGS" \ - RANLIB="$RANLIB" \ - AR="$AR" \ - STRIP="$STRIP" \ + make CXX="${CXX}" \ + CXXFLAGS="${TARGET_CXXFLAGS}" \ + RANLIB="${RANLIB}" \ + AR="${AR}" \ + STRIP="${STRIP}" \ -C unrar \ -f makefile - make CXX="$CXX" \ - CXXFLAGS="$TARGET_CXXFLAGS" \ - RANLIB="$RANLIB" \ - AR="$AR" \ + make CXX="${CXX}" \ + CXXFLAGS="${TARGET_CXXFLAGS}" \ + RANLIB="${RANLIB}" \ + AR="${AR}" \ -C lib \ -f makefile lib } @@ -40,8 +40,8 @@ post_make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/include/unrar $INSTALL/usr/lib $INSTALL/usr/bin - cp -p lib/*.hpp $INSTALL/usr/include/unrar/ - cp -p lib/libunrar.a $INSTALL/usr/lib/ - cp -p unrar/unrar $INSTALL/usr/bin/ + mkdir -p ${INSTALL}/usr/include/unrar ${INSTALL}/usr/lib ${INSTALL}/usr/bin + cp -p lib/*.hpp ${INSTALL}/usr/include/unrar/ + cp -p lib/libunrar.a ${INSTALL}/usr/lib/ + cp -p unrar/unrar ${INSTALL}/usr/bin/ } diff --git a/packages/addons/addon-depends/system-tools-depends/vim/package.mk b/packages/addons/addon-depends/system-tools-depends/vim/package.mk index 3a9bf7936a..88f5fdd603 100644 --- a/packages/addons/addon-depends/system-tools-depends/vim/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/vim/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="8.2.2293" PKG_SHA256="20f9bc8b170fd278a6f319fde0edf5698f2707a395ebaafa9b1de9327f5a0775" PKG_LICENSE="VIM" PKG_SITE="http://www.vim.org/" -PKG_URL="https://github.com/vim/vim/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/vim/vim/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses" PKG_LONGDESC="Vim is a highly configurable text editor built to enable efficient text editing." PKG_BUILD_FLAGS="-sysroot" @@ -34,7 +34,7 @@ PKG_MAKEINSTALL_OPTS_TARGET=VIMRTDIR= pre_configure_target() { cd .. - rm -rf .$TARGET_NAME + rm -rf .${TARGET_NAME} } make_target() { @@ -42,12 +42,12 @@ make_target() { } pre_makeinstall_target() { - mkdir -p $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin } post_makeinstall_target() { ( - cd $INSTALL/storage/.kodi/addons/virtual.system-tools/data/vim + cd ${INSTALL}/storage/.kodi/addons/virtual.system-tools/data/vim rm -r doc tutor gvimrc_example.vim mv vimrc_example.vim vimrc ) diff --git a/packages/addons/addon-depends/tinc-depends/miniupnpc/package.mk b/packages/addons/addon-depends/tinc-depends/miniupnpc/package.mk index 4ff188f4d5..6f7d45b98b 100644 --- a/packages/addons/addon-depends/tinc-depends/miniupnpc/package.mk +++ b/packages/addons/addon-depends/tinc-depends/miniupnpc/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="2.2.1" PKG_SHA256="3a3167e57727bf1d2a7b4861f7c7b57a663f58b9cf68227762ed2fc64e8ea11f" PKG_LICENSE="BSD" PKG_SITE="http://miniupnp.free.fr" -PKG_URL="http://miniupnp.free.fr/files/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://miniupnp.free.fr/files/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The MiniUPnP project offers software which supports the UPnP Internet Gateway Device (IGD) specifications" diff --git a/packages/addons/addon-depends/tini/package.mk b/packages/addons/addon-depends/tini/package.mk index 781880a896..ec5520e4dd 100644 --- a/packages/addons/addon-depends/tini/package.mk +++ b/packages/addons/addon-depends/tini/package.mk @@ -14,7 +14,7 @@ PKG_LONGDESC="Tini is a simplest init system." PKG_MAKE_OPTS_TARGET="tini-static" pre_configure_target(){ - sed -i "s|@tini_VERSION_GIT@| - git.${PKG_VERSION}|" $PKG_BUILD/src/tiniConfig.h.in + sed -i "s|@tini_VERSION_GIT@| - git.${PKG_VERSION}|" ${PKG_BUILD}/src/tiniConfig.h.in } makeinstall_target() { diff --git a/packages/addons/addon-depends/tntnet/package.mk b/packages/addons/addon-depends/tntnet/package.mk index 3e4003025f..719fa228b6 100644 --- a/packages/addons/addon-depends/tntnet/package.mk +++ b/packages/addons/addon-depends/tntnet/package.mk @@ -20,7 +20,7 @@ PKG_CONFIGURE_OPTS_HOST="--disable-unittest \ --with-stressjob=no" PKG_CONFIGURE_OPTS_TARGET="--disable-unittest \ - --with-sysroot=$SYSROOT_PREFIX \ + --with-sysroot=${SYSROOT_PREFIX} \ --with-server=no \ --with-sdk=no \ --with-demos=no \ @@ -29,8 +29,8 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-unittest \ --with-stressjob=no" post_makeinstall_target() { - sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/tntnet-config + sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/tntnet-config - rm -rf $INSTALL/usr/bin - rm -rf $INSTALL/usr/share + rm -rf ${INSTALL}/usr/bin + rm -rf ${INSTALL}/usr/share } diff --git a/packages/addons/addon-depends/tslib/package.mk b/packages/addons/addon-depends/tslib/package.mk index af593b2016..36f74ff91c 100644 --- a/packages/addons/addon-depends/tslib/package.mk +++ b/packages/addons/addon-depends/tslib/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.1" PKG_SHA256="fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kergoth/tslib" -PKG_URL="https://github.com/kergoth/tslib/releases/download/1.1/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://github.com/kergoth/tslib/releases/download/1.1/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain evtest" PKG_LONGDESC="Touchscreen access library with ts_uinput_touch daemon." PKG_TOOLCHAIN="autotools" @@ -18,24 +18,24 @@ TSLIB_BUILD_STATIC="yes" # no .so files (easy to manage) pre_configure_target() { local OPTS_MODULES="" - if [ "$TSLIB_BUILD_STATIC" = "yes" ]; then + if [ "${TSLIB_BUILD_STATIC}" = "yes" ]; then OPTS_MODULES="--enable-static --disable-shared" - for module in $TSLIB_MODULES_ENABLED; do - OPTS_MODULES="$OPTS_MODULES --enable-$module=static" + for module in ${TSLIB_MODULES_ENABLED}; do + OPTS_MODULES+=" --enable-${module}=static" done fi - for module in $TSLIB_MODULES_DISABLED; do - OPTS_MODULES="$OPTS_MODULES --disable-$module" + for module in ${TSLIB_MODULES_DISABLED}; do + OPTS_MODULES+=" --disable-${module}" done - PKG_CONFIGURE_OPTS_TARGET="$OPTS_MODULES \ + PKG_CONFIGURE_OPTS_TARGET="${OPTS_MODULES} \ --sysconfdir=/storage/.kodi/userdata/addon_data/service.touchscreen" } post_makeinstall_target() { - rm -fr $INSTALL/etc - rm -fr $INSTALL/storage + rm -fr ${INSTALL}/etc + rm -fr ${INSTALL}/storage - debug_strip $INSTALL/usr/bin + debug_strip ${INSTALL}/usr/bin } diff --git a/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk b/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk index fc2c34def4..dd9b7983e7 100644 --- a/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk +++ b/packages/addons/addon-depends/ttyd-depends/libwebsockets/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="4.1.6" PKG_SHA256="402e9a8df553c9cd2aff5d7a9758e9e5285bf3070c82539082864633db3deb83" PKG_LICENSE="MIT" PKG_SITE="https://libwebsockets.org" -PKG_URL="https://github.com/warmcat/libwebsockets/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/warmcat/libwebsockets/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain openssl json-c libuv" PKG_LONGDESC="Library for implementing network protocols with a tiny footprint." diff --git a/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk b/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk index 029af8190b..a0e136f661 100644 --- a/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk +++ b/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="6bb0a70a0dcb97d5457c1ef4a7ccce634ea419b0" PKG_SHA256="a5f375d28e52ff3f527fecb7968f3ede6bc2e128d1ad78537ab4f0f7844edb45" PKG_LICENSE="GPL" PKG_SITE="https://github.com/tvheadend" -PKG_URL="https://github.com/tvheadend/dtv-scan-tables/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/tvheadend/dtv-scan-tables/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Digital TV scan tables, a fork from Tvh to support more recent tables." PKG_TOOLCHAIN="manual" PKG_BUILD_FLAGS="-sysroot" makeinstall_target() { - make install DATADIR=$INSTALL/usr/share + make install DATADIR=${INSTALL}/usr/share } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-ddci2/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-ddci2/package.mk index 829f904f3b..cd2711a47a 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-ddci2/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-ddci2/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="05dd98824092859afd2aa7a4996c8f258affd975" PKG_SHA256="b8ed2787e9140eb00a68397eaeb14862ba88a6e73480dc3220a098faffb14833" PKG_LICENSE="GPL" PKG_SITE="https://github.com/jasmin-j/vdr-plugin-ddci2" -PKG_URL="https://github.com/jasmin-j/vdr-plugin-ddci2/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/jasmin-j/vdr-plugin-ddci2/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain vdr" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="Support for stand alone CI by Digital Devices." @@ -14,8 +14,8 @@ PKG_TOOLCHAIN="manual" make_target() { VDR_DIR=$(get_build_dir vdr) - export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH - export CPLUS_INCLUDE_PATH=$VDR_DIR/include + export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH} + export CPLUS_INCLUDE_PATH=${VDR_DIR}/include make \ LIBDIR="." \ @@ -25,9 +25,9 @@ make_target() { post_make_target() { VDR_DIR=$(get_build_dir vdr) - VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h` + VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h) LIB_NAME=lib${PKG_NAME/-plugin/} - cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION} - $STRIP libvdr-*.so* + cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION} + ${STRIP} libvdr-*.so* } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dummydevice/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dummydevice/package.mk index 969279302b..bca3e14f02 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dummydevice/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dummydevice/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.0.0" PKG_SHA256="5c0049824415bd463d3abc728a3136ee064b60a37b5d3a1986cf282b0d757085" PKG_LICENSE="GPL" PKG_SITE="http://www.vdr-wiki.de/wiki/index.php/Dummydevice-plugin" -PKG_URL="http://phivdr.dyndns.org/vdr/vdr-dummydevice/${PKG_NAME/-plugin/}-$PKG_VERSION.tgz" +PKG_URL="http://phivdr.dyndns.org/vdr/vdr-dummydevice/${PKG_NAME/-plugin/}-${PKG_VERSION}.tgz" PKG_DEPENDS_TARGET="toolchain vdr" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="This plugin can be used to run vdr as recording server without any output devices." @@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual" make_target() { VDR_DIR=$(get_build_dir vdr) - export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH - export CPLUS_INCLUDE_PATH=$VDR_DIR/include + export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH} + export CPLUS_INCLUDE_PATH=${VDR_DIR}/include make \ LIBDIR="." \ @@ -26,7 +26,7 @@ make_target() { post_make_target() { VDR_DIR=$(get_build_dir vdr) - VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h` + VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h) LIB_NAME=lib${PKG_NAME/-plugin/} cp --remove-destination ${LIB_NAME}.so ${LIB_NAME}.so.${VDR_APIVERSION} diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk index 64c4825c3e..01d79d4d95 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-dvbapi/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="197e7524e563923d4b86e74a121f7174373818d9" PKG_SHA256="6eee60d524c185f1f72c4413e79a80619934508b75aa27f213b2f481182ec6fb" PKG_LICENSE="GPL" PKG_SITE="https://github.com/manio/vdr-plugin-dvbapi" -PKG_URL="https://github.com/manio/vdr-plugin-dvbapi/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/manio/vdr-plugin-dvbapi/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain vdr libdvbcsa" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="VDR dvbapi plugin for use with OSCam" @@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual" make_target() { VDR_DIR=$(get_build_dir vdr) - export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH - export CPLUS_INCLUDE_PATH=$VDR_DIR/include + export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH} + export CPLUS_INCLUDE_PATH=${VDR_DIR}/include make \ LIBDIR="." \ @@ -27,8 +27,8 @@ make_target() { post_make_target() { VDR_DIR=$(get_build_dir vdr) - VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h` + VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h) LIB_NAME=lib${PKG_NAME/-plugin/} - cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION} + cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION} } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk index 177fc6680a..d3a50cdb66 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-eepg/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="c46be443988489780f993a47d23a42936b49d6c0" PKG_SHA256="08b343caa392bddefeb6e8cfe6f341b4e11e120046dce05961a335a06e9bee6c" PKG_LICENSE="GPL" PKG_SITE="http://projects.vdr-developer.org/projects/plg-eepg" -PKG_URL="https://github.com/vdr-projects/vdr-plugin-eepg/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/vdr-projects/vdr-plugin-eepg/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain vdr" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="This plugin parses the Extended EPG data which is send by providers on their portal channels." @@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual" make_target() { VDR_DIR=$(get_build_dir vdr) - export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH - export CPLUS_INCLUDE_PATH=$VDR_DIR/include + export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH} + export CPLUS_INCLUDE_PATH=${VDR_DIR}/include make \ LIBDIR="." \ @@ -26,8 +26,8 @@ make_target() { post_make_target() { VDR_DIR=$(get_build_dir vdr) - VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h` + VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h) LIB_NAME=lib${PKG_NAME/-plugin/} - cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION} + cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION} } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk index 9cd2718dcf..a07cbb205b 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgfixer/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="354f28b0112ba27f08f6509243b410899f74b6ed" PKG_SHA256="15bd73116f3bda9afc274bee97eff829b98f38b13043be32d7bb7f81af294715" PKG_LICENSE="GPL" PKG_SITE="http://projects.vdr-developer.org/projects/plg-epgfixer" -PKG_URL="https://github.com/vdr-projects/vdr-plugin-epgfixer/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/vdr-projects/vdr-plugin-epgfixer/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain vdr pcre" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="Plugin for modifying EPG data using regular expressions." @@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual" make_target() { VDR_DIR=$(get_build_dir vdr) - export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH - export CPLUS_INCLUDE_PATH=$VDR_DIR/include + export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH} + export CPLUS_INCLUDE_PATH=${VDR_DIR}/include make \ LIBDIR="." \ @@ -26,8 +26,8 @@ make_target() { post_make_target() { VDR_DIR=$(get_build_dir vdr) - VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h` + VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h) LIB_NAME=lib${PKG_NAME/-plugin/} - cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION} + cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION} } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk index 82ac3e881e..3b459bff61 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-epgsearch/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="770de32f1908b1f9c60f66bf288a4c8a03f97d52" PKG_SHA256="8b6144ee3d22b0c13ba81be94920b421b05fd9b921dfe8245ed582db407acac8" PKG_LICENSE="GPL" PKG_SITE="http://winni.vdr-developer.org/epgsearch/" -PKG_URL="https://github.com/vdr-projects/vdr-plugin-epgsearch/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/vdr-projects/vdr-plugin-epgsearch/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain vdr" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="EPGSearch is a plugin for the Video-Disc-Recorder (VDR)." @@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual" make_target() { VDR_DIR=$(get_build_dir vdr) - export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH - export CPLUS_INCLUDE_PATH=$VDR_DIR/include + export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH} + export CPLUS_INCLUDE_PATH=${VDR_DIR}/include make \ LIBDIR="." \ @@ -26,8 +26,8 @@ make_target() { post_make_target() { VDR_DIR=$(get_build_dir vdr) - VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h` + VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h) LIB_NAME=lib${PKG_NAME/-plugin/} - cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION} + cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION} } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk index cd4aac24a2..af90a2793b 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-iptv/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="f7369c9578c1437c7a19cf11e21424844f42a341" PKG_SHA256="9045ec034182d19535ab3478152ef6a7fd2640478c78d697d2f2c93f11482316" PKG_LICENSE="GPL" PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/iptv/" -PKG_URL="https://github.com/rofafor/vdr-plugin-iptv/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/rofafor/vdr-plugin-iptv/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain vdr curl" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="vdr-iptv is an IPTV plugin for the Video Disk Recorder (VDR)" @@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual" make_target() { VDR_DIR=$(get_build_dir vdr) - export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH - export CPLUS_INCLUDE_PATH=$VDR_DIR/include + export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH} + export CPLUS_INCLUDE_PATH=${VDR_DIR}/include make \ LIBDIR="." \ @@ -26,8 +26,8 @@ make_target() { post_make_target() { VDR_DIR=$(get_build_dir vdr) - VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h` + VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h) LIB_NAME=lib${PKG_NAME/-plugin/} - cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION} + cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION} } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk index b03e870457..1430fed11e 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-live/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="e582514ede475574842b44ca6792335ff141172d" PKG_SHA256="74deb2ca43ffb5779b3f9ff6f34c8b53898a226fcf92605d7ede0401cb62601c" PKG_LICENSE="GPL" PKG_SITE="http://live.vdr-developer.org/en/index.php" -PKG_URL="https://github.com/vdr-projects/vdr-plugin-live/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/vdr-projects/vdr-plugin-live/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain vdr tntnet pcre:host pcre" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="Allows a comfortable operation of VDR and some of its plugins trough a web interface." @@ -15,18 +15,18 @@ PKG_TOOLCHAIN="manual" PKG_BUILD_FLAGS="+pic -parallel" pre_configure_target() { - export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib/iconv" + export LDFLAGS="${LDFLAGS} -L${SYSROOT_PREFIX}/usr/lib/iconv" } make_target() { VDR_DIR=$(get_build_dir vdr) - export CPLUS_INCLUDE_PATH=$VDR_DIR/include - VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h` + export CPLUS_INCLUDE_PATH=${VDR_DIR}/include + VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h) LIB_NAME=lib${PKG_NAME/-plugin/} - make VDRDIR=$VDR_DIR \ + make VDRDIR=${VDR_DIR} \ LIBDIR="." \ LOCALEDIR="./locale" - cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION} + cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION} } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk index 0cf91616b8..69c221ae18 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-restfulapi/package.mk @@ -14,13 +14,13 @@ PKG_LONGDESC="Allows to access many internals of the VDR via a restful API." PKG_TOOLCHAIN="manual" pre_build_target() { - cp $(get_build_dir vdr-plugin-wirbelscan)/wirbelscan_services.h $PKG_BUILD/wirbelscan/ + cp $(get_build_dir vdr-plugin-wirbelscan)/wirbelscan_services.h ${PKG_BUILD}/wirbelscan/ } make_target() { VDR_DIR=$(get_build_dir vdr) - export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH - export CPLUS_INCLUDE_PATH=$VDR_DIR/include + export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH} + export CPLUS_INCLUDE_PATH=${VDR_DIR}/include make \ LIBDIR="." \ @@ -31,8 +31,8 @@ make_target() { post_make_target() { VDR_DIR=$(get_build_dir vdr) - VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h` + VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h) LIB_NAME=lib${PKG_NAME/-plugin/} - cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION} + cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION} } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk index 5721010085..26dd05d612 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-robotv/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="e06dd3942a17bf622f625b6e51f24e95cfa3877e" PKG_SHA256="4f9d5092107d34b2036d56f858a0a744a21f38df8bf6698532c8dcad0157f316" PKG_LICENSE="GPL" PKG_SITE="https://github.com/pipelka/roboTV" -PKG_URL="https://github.com/pipelka/vdr-plugin-robotv/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/pipelka/vdr-plugin-robotv/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain vdr avahi" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="RoboTV is a Android TV based frontend for VDR." @@ -14,15 +14,15 @@ PKG_TOOLCHAIN="cmake" pre_configure_target() { VDR_DIR=$(get_build_dir vdr) - export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH - export CPLUS_INCLUDE_PATH=$VDR_DIR/include - export VDRDIR=$VDR_DIR + export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH} + export CPLUS_INCLUDE_PATH=${VDR_DIR}/include + export VDRDIR=${VDR_DIR} } post_make_target() { VDR_DIR=$(get_build_dir vdr) - VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h` + VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h) LIB_NAME=lib${PKG_NAME/-plugin/} - cp --remove-destination $PKG_BUILD/.$TARGET_NAME/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION} + cp --remove-destination ${PKG_BUILD}/.${TARGET_NAME}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION} } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk index 1e268da334..cfd7bda747 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-satip/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="a7625c028c460b8350a023db495e2b6b0bc93607" PKG_SHA256="49955757df436393b1ae3ef1ce05a13ea80d5de87dd1222cad9e71045e3ab26e" PKG_LICENSE="GPL" PKG_SITE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/" -PKG_URL="https://github.com/rofafor/vdr-plugin-satip/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/rofafor/vdr-plugin-satip/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain vdr curl tinyxml" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="This is an SAT>IP plugin for the Video Disk Recorder (VDR)." @@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual" make_target() { VDR_DIR=$(get_build_dir vdr) - export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH - export CPLUS_INCLUDE_PATH=$VDR_DIR/include + export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH} + export CPLUS_INCLUDE_PATH=${VDR_DIR}/include make \ SATIP_USE_TINYXML=1 \ @@ -27,8 +27,8 @@ make_target() { post_make_target() { VDR_DIR=$(get_build_dir vdr) - VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h` + VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h) LIB_NAME=lib${PKG_NAME/-plugin/} - cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION} + cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION} } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk index 0d23c2c52f..25872c30c1 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-streamdev/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="e2a9b979d3fb92967c7a6a8221e674eb7e55c813" PKG_SHA256="adcc08ac19cf98122576bedf63be3396d8b81ee4196c00df0e25c9fb8b7e11b8" PKG_LICENSE="GPL" PKG_SITE="http://projects.vdr-developer.org/projects/plg-streamdev" -PKG_URL="https://github.com/vdr-projects/vdr-plugin-streamdev/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/vdr-projects/vdr-plugin-streamdev/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain vdr openssl" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="This PlugIn is a VDR implementation of Video Transfer and a basic HTTP Streaming Protocol." @@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual" make_target() { VDR_DIR=$(get_build_dir vdr) - export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH - export CPLUS_INCLUDE_PATH=$VDR_DIR/include + export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH} + export CPLUS_INCLUDE_PATH=${VDR_DIR}/include make \ LIBDIR="." \ @@ -26,8 +26,8 @@ make_target() { post_make_target() { VDR_DIR=$(get_build_dir vdr) - VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h` + VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h) LIB_NAME=lib${PKG_NAME/-plugin/} - cp --remove-destination $PKG_BUILD/server/${LIB_NAME}-server.so $PKG_BUILD/server/${LIB_NAME}-server.so.${VDR_APIVERSION} - cp --remove-destination $PKG_BUILD/client/${LIB_NAME}-client.so $PKG_BUILD/client/${LIB_NAME}-client.so.${VDR_APIVERSION} + cp --remove-destination ${PKG_BUILD}/server/${LIB_NAME}-server.so ${PKG_BUILD}/server/${LIB_NAME}-server.so.${VDR_APIVERSION} + cp --remove-destination ${PKG_BUILD}/client/${LIB_NAME}-client.so ${PKG_BUILD}/client/${LIB_NAME}-client.so.${VDR_APIVERSION} } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk index 1cdf7eaf1a..d959671963 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-vnsiserver/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="908684b58a3ebd4a447bc4b0a82b0bd8059bf605" PKG_SHA256="6c39a2e9854632274cec2b11e4eaaea9edc4095856941672f40d0633ece506df" PKG_LICENSE="GPL" PKG_SITE="https://github.com/mdre77/vdr-plugin-vnsiserver" -PKG_URL="https://github.com/mdre77/vdr-plugin-vnsiserver/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/mdre77/vdr-plugin-vnsiserver/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain vdr" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="VDR plugin to handle Kodi clients." @@ -15,8 +15,8 @@ PKG_TOOLCHAIN="manual" make_target() { VDR_DIR=$(get_build_dir vdr) - export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH - export CPLUS_INCLUDE_PATH=$VDR_DIR/include + export PKG_CONFIG_PATH=${VDR_DIR}:${PKG_CONFIG_PATH} + export CPLUS_INCLUDE_PATH=${VDR_DIR}/include make \ LIBDIR="." \ @@ -26,8 +26,8 @@ make_target() { post_make_target() { VDR_DIR=$(get_build_dir vdr) - VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h` + VDR_APIVERSION=$(sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' ${VDR_DIR}/config.h) LIB_NAME=lib${PKG_NAME/-plugin/} - cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION} + cp --remove-destination ${PKG_BUILD}/${LIB_NAME}.so ${PKG_BUILD}/${LIB_NAME}.so.${VDR_APIVERSION} } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk index 5070a75a24..82fd2b0811 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscan/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2018.11.04" PKG_SHA256="62c2848aefdb768c165310f70b3746665f57b96a95ebae96761febbb07e942e3" PKG_LICENSE="GPL" PKG_SITE="http://wirbel.htpc-forum.de/wirbelscan/index2.html" -PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-$PKG_VERSION.tgz" +PKG_URL="http://wirbel.htpc-forum.de/wirbelscan/vdr-wirbelscan-${PKG_VERSION}.tgz" PKG_DEPENDS_TARGET="toolchain vdr" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="Performs a channel scans for DVB-T, DVB-C and DVB-S" @@ -16,7 +16,7 @@ PKG_BUILD_FLAGS="+pic" make_target() { VDR_DIR=$(get_build_dir vdr) - make VDRDIR=$VDR_DIR \ + make VDRDIR=${VDR_DIR} \ LIBDIR="." \ LOCALEDIR="./locale" } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk index b1cc143419..a2d726b09b 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-wirbelscancontrol/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.0.2" PKG_SHA256="178c5768dd47355a42409a2cb2629f0762da1297865e3a84963684649145cb13" PKG_LICENSE="GPL" PKG_SITE="http://wirbel.htpc-forum.de/wirbelscancontrol/index2.html" -PKG_URL="http://wirbel.htpc-forum.de/wirbelscancontrol/${PKG_NAME/-plugin/}-$PKG_VERSION.tgz" +PKG_URL="http://wirbel.htpc-forum.de/wirbelscancontrol/${PKG_NAME/-plugin/}-${PKG_VERSION}.tgz" PKG_DEPENDS_TARGET="toolchain vdr vdr-plugin-wirbelscan" PKG_NEED_UNPACK="$(get_pkg_directory vdr)" PKG_LONGDESC="Adds menu entry for wirbelscan at VDR." @@ -16,12 +16,12 @@ PKG_BUILD_FLAGS="+pic" pre_build_target() { WIRBELSCAN_DIR=$(get_build_dir vdr-plugin-wirbelscan) - ln -sf $WIRBELSCAN_DIR/wirbelscan_services.h $PKG_BUILD + ln -sf ${WIRBELSCAN_DIR}/wirbelscan_services.h ${PKG_BUILD} } make_target() { VDR_DIR=$(get_build_dir vdr) - make VDRDIR=$VDR_DIR \ + make VDRDIR=${VDR_DIR} \ LIBDIR="." \ LOCALEDIR="./locale" } diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk index 382de18c5b..8830133152 100644 --- a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk +++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-xmltv2vdr/package.mk @@ -15,13 +15,13 @@ PKG_TOOLCHAIN="manual" PKG_BUILD_FLAGS="+pic" pre_configure_target() { - export CXXFLAGS="$CXXFLAGS -Wno-narrowing" - export LIBS="-L$SYSROOT_PREFIX/usr/lib/iconv -lpcre -lpcrecpp -lssl -lcrypto -lbz2" + export CXXFLAGS="${CXXFLAGS} -Wno-narrowing" + export LIBS="-L${SYSROOT_PREFIX}/usr/lib/iconv -lpcre -lpcrecpp -lssl -lcrypto -lbz2" } make_target() { VDR_DIR=$(get_build_dir vdr) - make VDRDIR=$VDR_DIR \ + make VDRDIR=${VDR_DIR} \ LIBDIR="." \ LOCALEDIR="./locale" } @@ -30,5 +30,5 @@ post_make_target() { cd dist/epgdata2xmltv make -j1 cd - - $STRIP dist/epgdata2xmltv/epgdata2xmltv + ${STRIP} dist/epgdata2xmltv/epgdata2xmltv } diff --git a/packages/addons/addon-depends/vdr/package.mk b/packages/addons/addon-depends/vdr/package.mk index 84559abd73..4477b1b8b3 100644 --- a/packages/addons/addon-depends/vdr/package.mk +++ b/packages/addons/addon-depends/vdr/package.mk @@ -8,17 +8,17 @@ PKG_VERSION="2.4.6" PKG_SHA256="c8993babf2a878a0fba84558de1e35f042c3c66f7c1ec569eea00a3af1014e4b" PKG_LICENSE="GPL" PKG_SITE="http://www.tvdr.de" -PKG_URL="http://ftp.tvdr.de/vdr-$PKG_VERSION.tar.bz2" +PKG_URL="http://ftp.tvdr.de/vdr-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain bzip2 fontconfig freetype libcap libiconv libjpeg-turbo" PKG_LONGDESC="A DVB TV server application." PKG_TOOLCHAIN="manual" post_unpack() { - rm -rf $PKG_BUILD/PLUGINS/src/skincurses + rm -rf ${PKG_BUILD}/PLUGINS/src/skincurses } pre_configure_target() { - export LDFLAGS="$(echo $LDFLAGS | sed -e "s|-Wl,--as-needed||") -L$SYSROOT_PREFIX/usr/lib/iconv" + export LDFLAGS="$(echo ${LDFLAGS} | sed -e "s|-Wl,--as-needed||") -L${SYSROOT_PREFIX}/usr/lib/iconv" } pre_make_target() { diff --git a/packages/addons/addon-depends/whois/package.mk b/packages/addons/addon-depends/whois/package.mk index dbed07326e..fc46410ae0 100644 --- a/packages/addons/addon-depends/whois/package.mk +++ b/packages/addons/addon-depends/whois/package.mk @@ -17,5 +17,5 @@ make_target() { } makeinstall_target() { - make install BASEDIR=$INSTALL + make install BASEDIR=${INSTALL} } diff --git a/packages/addons/browser/chrome/package.mk b/packages/addons/browser/chrome/package.mk index b59736a364..448c98db8f 100644 --- a/packages/addons/browser/chrome/package.mk +++ b/packages/addons/browser/chrome/package.mk @@ -28,16 +28,16 @@ make_target() { } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/{bin,config,gdk-pixbuf-modules,lib} + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,config,gdk-pixbuf-modules,lib} # config - cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config + cp -P ${PKG_DIR}/config/* ${ADDON_BUILD}/${PKG_ADDON_ID}/config # gdk-pixbuf modules - cp -PL $(get_install_dir gdk-pixbuf)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/* $ADDON_BUILD/$PKG_ADDON_ID/gdk-pixbuf-modules + cp -PL $(get_install_dir gdk-pixbuf)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/* ${ADDON_BUILD}/${PKG_ADDON_ID}/gdk-pixbuf-modules # unclutter - cp -P $(get_install_dir unclutter)/usr/bin/unclutter $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir unclutter)/usr/bin/unclutter ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # libs cp -PL $(get_install_dir atk)/usr/lib/libatk-1.0.so.0 \ @@ -59,7 +59,7 @@ addon() { $(get_install_dir libxss)/usr/lib/libXss.so.1 \ $(get_install_dir chrome-libXtst)/usr/lib/libXtst.so.6 \ $(get_install_dir pango)/usr/lib/{libpangocairo-1.0.so.0,libpango-1.0.so.0,libpangoft2-1.0.so.0} \ - $ADDON_BUILD/$PKG_ADDON_ID/lib + ${ADDON_BUILD}/${PKG_ADDON_ID}/lib } post_install_addon() { diff --git a/packages/addons/driver/hdhomerun/package.mk b/packages/addons/driver/hdhomerun/package.mk index 924d5678bd..f9840ddd9d 100644 --- a/packages/addons/driver/hdhomerun/package.mk +++ b/packages/addons/driver/hdhomerun/package.mk @@ -19,7 +19,7 @@ PKG_ADDON_NAME="HDHomeRun" PKG_ADDON_TYPE="xbmc.python.script" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/ - cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/ - cp -P $PKG_DIR/settings-default.xml $ADDON_BUILD/$PKG_ADDON_ID/ + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config/ + cp -P ${PKG_DIR}/config/* ${ADDON_BUILD}/${PKG_ADDON_ID}/config/ + cp -P ${PKG_DIR}/settings-default.xml ${ADDON_BUILD}/${PKG_ADDON_ID}/ } diff --git a/packages/addons/driver/sundtek-mediatv/package.mk b/packages/addons/driver/sundtek-mediatv/package.mk index 7418095100..cc628e50fd 100644 --- a/packages/addons/driver/sundtek-mediatv/package.mk +++ b/packages/addons/driver/sundtek-mediatv/package.mk @@ -20,10 +20,10 @@ PKG_ADDON_NAME="Sundtek MediaTV" PKG_ADDON_TYPE="xbmc.service" make_target() { - mkdir -p $PKG_BUILD - cd $PKG_BUILD + mkdir -p ${PKG_BUILD} + cd ${PKG_BUILD} - case $TARGET_ARCH in + case ${TARGET_ARCH} in x86_64) INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz" ;; @@ -35,7 +35,7 @@ make_target() { ;; esac - wget -O installer.tar.gz $INSTALLER_URL + wget -O installer.tar.gz ${INSTALLER_URL} tar -xzf installer.tar.gz @@ -49,10 +49,10 @@ make_target() { } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/ - cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/ - cp -P $PKG_DIR/settings-default.xml $ADDON_BUILD/$PKG_ADDON_ID/ - cp -Pa $PKG_BUILD/opt/bin $ADDON_BUILD/$PKG_ADDON_ID/ - cp -Pa $PKG_BUILD/opt/lib $ADDON_BUILD/$PKG_ADDON_ID/ - cp $PKG_BUILD/version.used $ADDON_BUILD/$PKG_ADDON_ID/ + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config/ + cp -P ${PKG_DIR}/config/* ${ADDON_BUILD}/${PKG_ADDON_ID}/config/ + cp -P ${PKG_DIR}/settings-default.xml ${ADDON_BUILD}/${PKG_ADDON_ID}/ + cp -Pa ${PKG_BUILD}/opt/bin ${ADDON_BUILD}/${PKG_ADDON_ID}/ + cp -Pa ${PKG_BUILD}/opt/lib ${ADDON_BUILD}/${PKG_ADDON_ID}/ + cp ${PKG_BUILD}/version.used ${ADDON_BUILD}/${PKG_ADDON_ID}/ } diff --git a/packages/addons/libraries/adafruit-libraries/package.mk b/packages/addons/libraries/adafruit-libraries/package.mk index 7b74cc9cda..c15e6d190a 100644 --- a/packages/addons/libraries/adafruit-libraries/package.mk +++ b/packages/addons/libraries/adafruit-libraries/package.mk @@ -20,22 +20,22 @@ PKG_ADDON_TYPE="xbmc.python.module" PKG_ADDON_REQUIRES="virtual.rpi-tools:8.0.102" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -PR $(get_build_dir Adafruit_Python_ADS1x15)/Adafruit_ADS1x15 $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_ADXL345)/Adafruit_ADXL345 $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_BMP)/Adafruit_BMP $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_CharLCD)/Adafruit_CharLCD $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_DHT)/build/lib/Adafruit_DHT $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_GPIO)/Adafruit_GPIO $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_LED_Backpack)/Adafruit_LED_Backpack $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_LSM303)/Adafruit_LSM303 $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_MCP3008)/Adafruit_MCP3008 $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_MCP4725)/Adafruit_MCP4725 $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_PCA9685)/Adafruit_PCA9685 $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_PureIO)/Adafruit_PureIO $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_SI1145)/SI1145 $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_SSD1306)/Adafruit_SSD1306 $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_TCS34725)/Adafruit_TCS34725 $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_VCNL40xx)/Adafruit_VCNL40xx $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp -PR $(get_build_dir Adafruit_Python_WS2801)/Adafruit_WS2801 $ADDON_BUILD/$PKG_ADDON_ID/lib/ + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + cp -PR $(get_build_dir Adafruit_Python_ADS1x15)/Adafruit_ADS1x15 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_ADXL345)/Adafruit_ADXL345 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_BMP)/Adafruit_BMP ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_CharLCD)/Adafruit_CharLCD ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_DHT)/build/lib/Adafruit_DHT ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_GPIO)/Adafruit_GPIO ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_LED_Backpack)/Adafruit_LED_Backpack ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_LSM303)/Adafruit_LSM303 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_MCP3008)/Adafruit_MCP3008 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_MCP4725)/Adafruit_MCP4725 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_PCA9685)/Adafruit_PCA9685 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_PureIO)/Adafruit_PureIO ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_SI1145)/SI1145 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_SSD1306)/Adafruit_SSD1306 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_TCS34725)/Adafruit_TCS34725 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_VCNL40xx)/Adafruit_VCNL40xx ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ + cp -PR $(get_build_dir Adafruit_Python_WS2801)/Adafruit_WS2801 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ } diff --git a/packages/addons/repository/repository.linuxserver.docker/package.mk b/packages/addons/repository/repository.linuxserver.docker/package.mk index 800d057faf..1a16c48793 100644 --- a/packages/addons/repository/repository.linuxserver.docker/package.mk +++ b/packages/addons/repository/repository.linuxserver.docker/package.mk @@ -19,12 +19,12 @@ PKG_ADDON_NAME="LinuxServer.io Repository" PKG_ADDON_TYPE="xbmc.addon.repository" make_target() { - sed -e "s|@PKG_VERSION@|$PKG_VERSION|g" \ - -e "s|@PKG_REV@|$PKG_REV|g" \ + sed -e "s|@PKG_VERSION@|${PKG_VERSION}|g" \ + -e "s|@PKG_REV@|${PKG_REV}|g" \ -i addon.xml } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID - cp -R $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID} + cp -R ${PKG_BUILD}/* ${ADDON_BUILD}/${PKG_ADDON_ID} } diff --git a/packages/addons/script/driverselect/package.mk b/packages/addons/script/driverselect/package.mk index 371ebcee46..01447cb777 100644 --- a/packages/addons/script/driverselect/package.mk +++ b/packages/addons/script/driverselect/package.mk @@ -8,7 +8,7 @@ PKG_REV="100" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="https://libreelec.tv" -PKG_URL="https://github.com/b-jesch/script.program.driverselect/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/b-jesch/script.program.driverselect/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_SECTION="script.program" PKG_SHORTDESC="script.program.driverselect" diff --git a/packages/addons/script/script.config.vdr/package.mk b/packages/addons/script/script.config.vdr/package.mk index 77eab52076..c240128d9e 100644 --- a/packages/addons/script/script.config.vdr/package.mk +++ b/packages/addons/script/script.config.vdr/package.mk @@ -9,7 +9,7 @@ PKG_REV="104" PKG_ARCH="any" PKG_LICENSE="OSS" PKG_SITE="https://libreelec.tv" -PKG_URL="https://github.com/LibreELEC/script.config.vdr/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/LibreELEC/script.config.vdr/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="xmlstarlet:host p7zip:host" PKG_SECTION="" PKG_SHORTDESC="script.config.vdr" @@ -20,13 +20,13 @@ PKG_IS_ADDON="yes" PKG_ADDON_TYPE="dummy" make_target() { - sed -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \ + sed -e "s|@ADDON_VERSION@|${ADDON_VERSION}|g" \ -i addon.xml } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID - cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID - cp $PKG_DIR/changelog.txt $ADDON_BUILD/$PKG_ADDON_ID - cp $PKG_DIR/icon/icon.png $ADDON_BUILD/$PKG_ADDON_ID/resources + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID} + cp -PR ${PKG_BUILD}/* ${ADDON_BUILD}/${PKG_ADDON_ID} + cp ${PKG_DIR}/changelog.txt ${ADDON_BUILD}/${PKG_ADDON_ID} + cp ${PKG_DIR}/icon/icon.png ${ADDON_BUILD}/${PKG_ADDON_ID}/resources } diff --git a/packages/addons/service/boblightd/package.mk b/packages/addons/service/boblightd/package.mk index 2336ec6129..1cf66f1f34 100644 --- a/packages/addons/service/boblightd/package.mk +++ b/packages/addons/service/boblightd/package.mk @@ -8,53 +8,53 @@ PKG_REV="101" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://code.google.com/p/boblight" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libusb" PKG_SECTION="service/multimedia" PKG_SHORTDESC="Boblight: an AmbiLight controller" -PKG_LONGDESC="Boblight($PKG_VERSION) is an opensource AmbiLight implementation." +PKG_LONGDESC="Boblight(${PKG_VERSION}) is an opensource AmbiLight implementation." PKG_IS_ADDON="yes" PKG_ADDON_NAME="Boblight" PKG_ADDON_TYPE="xbmc.service" PKG_TOOLCHAIN="autotools" -if [ "$DISPLAYSERVER" = "x11" ] ; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXext libXrender" +if [ "${DISPLAYSERVER}" = "x11" ]; then + PKG_DEPENDS_TARGET+=" libX11 libXext libXrender" fi -if [ "$OPENGL_SUPPORT" = "yes" ] ; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mesa glu" +if [ "${OPENGL_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" mesa glu" fi -if [ "$OPENGL" = "no" ]; then +if [ "${OPENGL}" = "no" ]; then EXTRAOPTS="--without-opengl" fi -if [ ! "$DISPLAYSERVER" = "x11" ] ; then - EXTRAOPTS="$EXTRAOPTS --without-x11" +if [ ! "${DISPLAYSERVER}" = "x11" ]; then + EXTRAOPTS+=" --without-x11" fi -PKG_CONFIGURE_OPTS_TARGET="$EXTRAOPTS --without-portaudio" +PKG_CONFIGURE_OPTS_TARGET="${EXTRAOPTS} --without-portaudio" makeinstall_target() { : # nothing to do here } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -P $PKG_BUILD/.$TARGET_NAME/src/.libs/libboblight.so* $ADDON_BUILD/$PKG_ADDON_ID/lib + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/.libs/libboblight.so* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_BUILD/.$TARGET_NAME/src/boblightd $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_BUILD/.$TARGET_NAME/src/boblight-constant $ADDON_BUILD/$PKG_ADDON_ID/bin - if [ "$DISPLAYSERVER" = "x11" ] ; then - cp -P $PKG_BUILD/.$TARGET_NAME/src/boblight-X11 $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/boblightd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/boblight-constant ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + if [ "${DISPLAYSERVER}" = "x11" ]; then + cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/boblight-X11 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin fi - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config - cp -R $PKG_DIR/config/boblight.conf $ADDON_BUILD/$PKG_ADDON_ID/config - if [ "$DISPLAYSERVER" = "x11" ] ; then - cp -R $PKG_DIR/config/boblight.X11.sample $ADDON_BUILD/$PKG_ADDON_ID/config + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config + cp -R ${PKG_DIR}/config/boblight.conf ${ADDON_BUILD}/${PKG_ADDON_ID}/config + if [ "${DISPLAYSERVER}" = "x11" ]; then + cp -R ${PKG_DIR}/config/boblight.X11.sample ${ADDON_BUILD}/${PKG_ADDON_ID}/config fi } diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index ac4b00933c..9f87421aac 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -37,7 +37,7 @@ configure_target() { PKG_GOPATH_CLI=${GOPATH}_cli export GOPATH=${PKG_GOPATH_CLI}:${PKG_GOPATH_ENGINE} - export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld $CC" + export LDFLAGS="-w -linkmode external -extldflags -Wl,--unresolved-symbols=ignore-in-shared-libs -extld ${CC}" mkdir -p ${PKG_GOPATH_ENGINE} mkdir -p ${PKG_GOPATH_CLI} @@ -74,11 +74,11 @@ configure_target() { mkdir -p ${PKG_GOPATH_CLI}/src/github.com/docker/docker/builder cp -rf ${PKG_ENGINE_PATH}/builder/* ${PKG_GOPATH_CLI}/src/github.com/docker/docker/builder - if [ ! -L ${PKG_GOPATH_ENGINE}/src/github.com/docker/docker ];then + if [ ! -L ${PKG_GOPATH_ENGINE}/src/github.com/docker/docker ]; then ln -fs ${PKG_ENGINE_PATH} ${PKG_GOPATH_ENGINE}/src/github.com/docker/docker fi - if [ ! -L ${PKG_GOPATH_CLI}/src/github.com/docker/cli ];then + if [ ! -L ${PKG_GOPATH_CLI}/src/github.com/docker/cli ]; then ln -fs ${PKG_CLI_PATH} ${PKG_GOPATH_CLI}/src/github.com/docker/cli fi @@ -95,8 +95,8 @@ configure_target() { make_target() { mkdir -p bin PKG_CLI_FLAGS="-X 'github.com/docker/cli/cli/version.Version=${VERSION}'" - PKG_CLI_FLAGS="${PKG_CLI_FLAGS} -X 'github.com/docker/cli/cli/version.GitCommit=${GITCOMMIT}'" - PKG_CLI_FLAGS="${PKG_CLI_FLAGS} -X 'github.com/docker/cli/cli/version.BuildTime=${BUILDTIME}'" + PKG_CLI_FLAGS+=" -X 'github.com/docker/cli/cli/version.GitCommit=${GITCOMMIT}'" + PKG_CLI_FLAGS+=" -X 'github.com/docker/cli/cli/version.BuildTime=${BUILDTIME}'" ${GOLANG} build -v -o bin/docker -a -tags "${PKG_DOCKER_BUILDTAGS}" -ldflags "${LDFLAGS} ${PKG_CLI_FLAGS}" ./components/cli/cmd/docker ${GOLANG} build -v -o bin/dockerd -a -tags "${PKG_DOCKER_BUILDTAGS}" -ldflags "${LDFLAGS}" ./components/engine/cmd/dockerd } diff --git a/packages/addons/service/hyperion/package.mk b/packages/addons/service/hyperion/package.mk index b898846381..db1dd799ba 100644 --- a/packages/addons/service/hyperion/package.mk +++ b/packages/addons/service/hyperion/package.mk @@ -10,12 +10,12 @@ PKG_REV="112" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/hyperion-project/hyperion" -PKG_URL="https://github.com/hyperion-project/hyperion/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/hyperion-project/hyperion/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 libusb qtbase protobuf rpi_ws281x" PKG_DEPENDS_UNPACK="rpi_ws281x" PKG_SECTION="service" PKG_SHORTDESC="Hyperion: an AmbiLight controller" -PKG_LONGDESC="Hyperion($PKG_VERSION_DATE) is an modern opensource AmbiLight implementation." +PKG_LONGDESC="Hyperion(${PKG_VERSION_DATE}) is an modern opensource AmbiLight implementation." PKG_BUILD_FLAGS="-sysroot" PKG_IS_ADDON="yes" @@ -26,16 +26,16 @@ PKG_DISPMANX_SUPPORT="-DENABLE_DISPMANX=OFF" PKG_FB_SUPPORT="-DENABLE_FB=ON" PKG_X11_SUPPORT="-DENABLE_X11=OFF" -if [ "$DISPLAYSERVER" = "x11" ]; then +if [ "${DISPLAYSERVER}" = "x11" ]; then PKG_DEPENDS_TARGET+=" xorg-server xrandr" PKG_X11_SUPPORT="-DENABLE_X11=ON" fi PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \ - -DHYPERION_VERSION_ID="$PKG_VERSION" \ + -DHYPERION_VERSION_ID="${PKG_VERSION}" \ -DENABLE_AMLOGIC=OFF \ - $PKG_DISPMANX_SUPPORT \ - $PKG_FB_SUPPORT \ + ${PKG_DISPMANX_SUPPORT} \ + ${PKG_FB_SUPPORT} \ -DENABLE_OSX=OFF \ -DUSE_SYSTEM_PROTO_LIBS=ON \ -DENABLE_SPIDEV=ON \ @@ -43,13 +43,13 @@ PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \ -DENABLE_V4L2=ON \ -DENABLE_WS2812BPWM=OFF \ -DENABLE_WS281XPWM=ON \ - $PKG_X11_SUPPORT \ + ${PKG_X11_SUPPORT} \ -DENABLE_QT5=ON \ -DENABLE_TESTS=OFF \ -Wno-dev" pre_build_target() { - cp -a $(get_build_dir rpi_ws281x)/* $PKG_BUILD/dependencies/external/rpi_ws281x + cp -a $(get_build_dir rpi_ws281x)/* ${PKG_BUILD}/dependencies/external/rpi_ws281x } pre_configure_target() { @@ -57,9 +57,9 @@ pre_configure_target() { } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_INSTALL/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp ${PKG_INSTALL}/usr/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin - cp -PR $PKG_INSTALL/usr/share/hyperion/webconfig $ADDON_BUILD/$PKG_ADDON_ID - cp -PR $PKG_INSTALL/usr/share/hyperion/effects $ADDON_BUILD/$PKG_ADDON_ID + cp -PR ${PKG_INSTALL}/usr/share/hyperion/webconfig ${ADDON_BUILD}/${PKG_ADDON_ID} + cp -PR ${PKG_INSTALL}/usr/share/hyperion/effects ${ADDON_BUILD}/${PKG_ADDON_ID} } diff --git a/packages/addons/service/inadyn/package.mk b/packages/addons/service/inadyn/package.mk index acc2114c11..975d8fcaae 100644 --- a/packages/addons/service/inadyn/package.mk +++ b/packages/addons/service/inadyn/package.mk @@ -8,11 +8,11 @@ PKG_REV="106" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="http://troglobit.com/inadyn.html" -PKG_URL="https://github.com/troglobit/inadyn/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/troglobit/inadyn/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libconfuse openssl" PKG_SECTION="service/system" PKG_SHORTDESC="Inadyn: a small and simple Dynamic Domain Name System client" -PKG_LONGDESC="Inadyn ($PKG_VERSION) is a small and simple Dynamic Domain Name System (DDNS) client with HTTPS support. It is commonly available in many GNU/Linux distributions, used in off-the-shelf routers and Internet gateways to automate the task of keeping your DNS record up to date with any IP address changes from your ISP. It can also be used in installations with redundant (backup) connections to the Internet." +PKG_LONGDESC="Inadyn (${PKG_VERSION}) is a small and simple Dynamic Domain Name System (DDNS) client with HTTPS support. It is commonly available in many GNU/Linux distributions, used in off-the-shelf routers and Internet gateways to automate the task of keeping your DNS record up to date with any IP address changes from your ISP. It can also be used in installations with redundant (backup) connections to the Internet." PKG_TOOLCHAIN="autotools" PKG_IS_ADDON="yes" @@ -27,6 +27,6 @@ makeinstall_target() { } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_BUILD/.$TARGET_NAME/src/inadyn $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp ${PKG_BUILD}/.${TARGET_NAME}/src/inadyn ${ADDON_BUILD}/${PKG_ADDON_ID}/bin } diff --git a/packages/addons/service/lcdd/package.mk b/packages/addons/service/lcdd/package.mk index 03d5c10756..2b48dceb6f 100644 --- a/packages/addons/service/lcdd/package.mk +++ b/packages/addons/service/lcdd/package.mk @@ -9,11 +9,11 @@ PKG_REV="108" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://lcdproc.org/" -PKG_URL="https://github.com/lcdproc/lcdproc/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/lcdproc/lcdproc/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain freetype libftdi1 libhid libugpio libusb ncurses serdisplib" PKG_SECTION="service" PKG_SHORTDESC="LCDproc: Software to display system information from your Linux/*BSD box on a LCD" -PKG_LONGDESC="LCDproc ($PKG_VERSION) is a piece of software that displays real-time system information from your Linux/*BSD box on a LCD. The server supports several serial devices: Matrix Orbital, Crystal Fontz, Bayrad, LB216, LCDM001 (kernelconcepts.de), Wirz-SLI, Cwlinux(.com) and PIC-an-LCD; and some devices connected to the LPT port: HD44780, STV5730, T6963, SED1520 and SED1330. Various clients are available that display things like CPU load, system load, memory usage, uptime, and a lot more." +PKG_LONGDESC="LCDproc (${PKG_VERSION}) is a piece of software that displays real-time system information from your Linux/*BSD box on a LCD. The server supports several serial devices: Matrix Orbital, Crystal Fontz, Bayrad, LB216, LCDM001 (kernelconcepts.de), Wirz-SLI, Cwlinux(.com) and PIC-an-LCD; and some devices connected to the LPT port: HD44780, STV5730, T6963, SED1520 and SED1330. Various clients are available that display things like CPU load, system load, memory usage, uptime, and a lot more." PKG_TOOLCHAIN="autotools" PKG_BUILD_FLAGS="-parallel" @@ -21,7 +21,7 @@ PKG_IS_ADDON="yes" PKG_ADDON_NAME="LCDproc" PKG_ADDON_TYPE="xbmc.service" -PKG_CONFIGURE_OPTS_TARGET="--with-ft-prefix=$SYSROOT_PREFIX/usr \ +PKG_CONFIGURE_OPTS_TARGET="--with-ft-prefix=${SYSROOT_PREFIX}/usr \ --enable-libusb \ --enable-libftdi \ --disable-libX11 \ @@ -30,21 +30,21 @@ PKG_CONFIGURE_OPTS_TARGET="--with-ft-prefix=$SYSROOT_PREFIX/usr \ --enable-drivers=all" pre_configure_target() { - CFLAGS="$CFLAGS -O3" + CFLAGS+=" -O3" } addon() { - drivers="none|$(cat $PKG_BUILD/.$TARGET_NAME/config.log | sed -n "s|^DRIVERS=' \(.*\)'|\1|p" | sed "s|.so||g" | tr ' ' '|')" + drivers="none|$(cat ${PKG_BUILD}/.${TARGET_NAME}/config.log | sed -n "s|^DRIVERS=' \(.*\)'|\1|p" | sed "s|.so||g" | tr ' ' '|')" - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config - cp -PR $PKG_DIR/resources $ADDON_BUILD/$PKG_ADDON_ID + cp -PR ${PKG_DIR}/resources ${ADDON_BUILD}/${PKG_ADDON_ID} - 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/ - cp -PR $PKG_INSTALL/usr/sbin $ADDON_BUILD/$PKG_ADDON_ID/bin/ + 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/ + cp -PR ${PKG_INSTALL}/usr/sbin ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ - cp -L $(get_install_dir serdisplib)/usr/lib/libserdisp.so.2 $ADDON_BUILD/$PKG_ADDON_ID/lib/ + cp -L $(get_install_dir serdisplib)/usr/lib/libserdisp.so.2 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ sed -e "s|^DriverPath=.*$|DriverPath=/storage/.kodi/addons/service.lcdd/lib/lcdproc/|" \ -e "s|^#Foreground=.*$|Foreground=no|" \ @@ -53,13 +53,13 @@ addon() { -e "s|^#Heartbeat=.*$|Heartbeat=open|" \ -e "s|^#TitleSpeed=.*$|TitleSpeed=4|" \ -e "s|^#Hello=\" Welcome to\"|Hello=\"Welcome to\"|" \ - -e "s|^#Hello=\" LCDproc!\"|Hello=\"$DISTRONAME\"|" \ + -e "s|^#Hello=\" LCDproc!\"|Hello=\"${DISTRONAME}\"|" \ -e "s|^#GoodBye=\"Thanks for using\"|GoodBye=\"Thanks for using\"|" \ - -e "s|^#GoodBye=\" LCDproc!\"|GoodBye=\"$DISTRONAME\"|" \ + -e "s|^#GoodBye=\" LCDproc!\"|GoodBye=\"${DISTRONAME}\"|" \ -e "s|^#normal_font=.*$|normal_font=/usr/share/fonts/liberation/LiberationMono-Bold.ttf|" \ - -i $ADDON_BUILD/$PKG_ADDON_ID/config/LCDd.conf + -i ${ADDON_BUILD}/${PKG_ADDON_ID}/config/LCDd.conf - sed -e "s/@DRIVERS@/$drivers/" \ - -i $ADDON_BUILD/$PKG_ADDON_ID/resources/settings.xml + sed -e "s/@DRIVERS@/${drivers}/" \ + -i ${ADDON_BUILD}/${PKG_ADDON_ID}/resources/settings.xml } diff --git a/packages/addons/service/librespot/package.mk b/packages/addons/service/librespot/package.mk index 49916a0065..42e3d8ca06 100644 --- a/packages/addons/service/librespot/package.mk +++ b/packages/addons/service/librespot/package.mk @@ -9,11 +9,11 @@ PKG_REV="125" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/librespot-org/librespot/" -PKG_URL="https://github.com/librespot-org/librespot/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/librespot-org/librespot/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain alsa-lib avahi libvorbis pulseaudio rust" PKG_SECTION="service" PKG_SHORTDESC="Librespot: play Spotify through Kodi using a Spotify app as a remote" -PKG_LONGDESC="Librespot ($PKG_VERSION_DATE) lets you play Spotify through Kodi using a Spotify app as a remote." +PKG_LONGDESC="Librespot (${PKG_VERSION_DATE}) lets you play Spotify through Kodi using a Spotify app as a remote." PKG_TOOLCHAIN="manual" PKG_IS_ADDON="yes" @@ -28,15 +28,15 @@ make_target() { --release \ --no-default-features \ --features "alsa-backend pulseaudio-backend with-dns-sd with-vorbis" - $STRIP $PKG_BUILD/.$TARGET_NAME/*/release/librespot + ${STRIP} ${PKG_BUILD}/.${TARGET_NAME}/*/release/librespot } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_BUILD/.$TARGET_NAME/*/release/librespot \ - $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp ${PKG_BUILD}/.${TARGET_NAME}/*/release/librespot \ + ${ADDON_BUILD}/${PKG_ADDON_ID}/bin - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib cp $(get_build_dir avahi)/avahi-compat-libdns_sd/.libs/libdns_sd.so.1 \ - $ADDON_BUILD/$PKG_ADDON_ID/lib + ${ADDON_BUILD}/${PKG_ADDON_ID}/lib } diff --git a/packages/addons/service/locale/package.mk b/packages/addons/service/locale/package.mk index edb718e256..e4afc309f8 100644 --- a/packages/addons/service/locale/package.mk +++ b/packages/addons/service/locale/package.mk @@ -7,7 +7,7 @@ PKG_ARCH="any" PKG_DEPENDS_TARGET="toolchain glibc" PKG_SECTION="service" PKG_SHORTDESC="Locale: allows users to set a custom locale to override the POSIX default" -PKG_LONGDESC="Locale ($PKG_REV) allows users to set a custom locale in the OS to override the POSIX default" +PKG_LONGDESC="Locale (${PKG_REV}) allows users to set a custom locale in the OS to override the POSIX default" PKG_TOOLCHAIN="manual" PKG_IS_ADDON="yes" @@ -15,29 +15,29 @@ PKG_ADDON_NAME="Locale" PKG_ADDON_TYPE="xbmc.service" addon() { - mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin" + mkdir -p "${ADDON_BUILD}/${PKG_ADDON_ID}/bin" cp -PR "$(get_install_dir glibc)/.noinstall/localedef" \ - "$ADDON_BUILD/$PKG_ADDON_ID/bin" + "${ADDON_BUILD}/${PKG_ADDON_ID}/bin" - mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/i18n" + mkdir -p "${ADDON_BUILD}/${PKG_ADDON_ID}/i18n" cp -PR "$(get_install_dir glibc)/.noinstall/charmaps" \ "$(get_install_dir glibc)/.noinstall/locales" \ - "$ADDON_BUILD/$PKG_ADDON_ID/i18n" + "${ADDON_BUILD}/${PKG_ADDON_ID}/i18n" - mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/locpath" + mkdir -p "${ADDON_BUILD}/${PKG_ADDON_ID}/locpath" - cp -PR $PKG_DIR/resources $ADDON_BUILD/$PKG_ADDON_ID + cp -PR ${PKG_DIR}/resources ${ADDON_BUILD}/${PKG_ADDON_ID} locales="" - for p in "$ADDON_BUILD/$PKG_ADDON_ID/i18n/locales"/*; do - l="$(basename $p)" - if [ "$l" = "POSIX" ]; then + for p in "${ADDON_BUILD}/${PKG_ADDON_ID}/i18n/locales"/*; do + l="$(basename ${p})" + if [ "${l}" = "POSIX" ]; then continue fi - locales="$locales|$l" + locales+="|${l}" done locales="${locales:1}" - sed -e "s/@LOCALES@/$locales/" \ - -i $ADDON_BUILD/$PKG_ADDON_ID/resources/settings.xml + sed -e "s/@LOCALES@/${locales}/" \ + -i ${ADDON_BUILD}/${PKG_ADDON_ID}/resources/settings.xml } diff --git a/packages/addons/service/minidlna/package.mk b/packages/addons/service/minidlna/package.mk index 463e4a1f24..ada608f125 100644 --- a/packages/addons/service/minidlna/package.mk +++ b/packages/addons/service/minidlna/package.mk @@ -8,11 +8,11 @@ PKG_REV="102" PKG_ARCH="any" PKG_LICENSE="BSD-3c/GPLv2" PKG_SITE="https://sourceforge.net/projects/minidlna/" -PKG_URL="https://downloads.sourceforge.net/project/minidlna/minidlna/1.3.0/minidlna-$PKG_VERSION.tar.gz" +PKG_URL="https://downloads.sourceforge.net/project/minidlna/minidlna/1.3.0/minidlna-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain ffmpeg flac libexif libiconv libid3tag libjpeg-turbo libogg libvorbis sqlite" PKG_SECTION="service" PKG_SHORTDESC="MiniDLNA (ReadyMedia): a fully compliant DLNA/UPnP-AV server" -PKG_LONGDESC="MiniDLNA ($PKG_VERSION_DATE) (ReadyMedia) is a media server, with the aim of being fully compliant with DLNA/UPnP-AV clients." +PKG_LONGDESC="MiniDLNA (${PKG_VERSION_DATE}) (ReadyMedia) is a media server, with the aim of being fully compliant with DLNA/UPnP-AV clients." PKG_TOOLCHAIN="autotools" PKG_IS_ADDON="yes" @@ -23,19 +23,19 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-static \ --disable-nls \ --without-libiconv-prefix \ --without-libintl-prefix \ - --with-os-name="$DISTRONAME" \ + --with-os-name="${DISTRONAME}" \ --with-db-path="/storage/.kodi/userdata/addon_data/service.minidlna/db" \ --with-os-url="https://libreelec.tv"" pre_configure_target() { - export LDFLAGS="$LDFLAGS -L$(get_install_dir ffmpeg)/usr/lib" - export LIBS="$LIBS -lid3tag -lFLAC -logg -lz -lpthread -ldl -lm" + export LDFLAGS="${LDFLAGS} -L$(get_install_dir ffmpeg)/usr/lib" + export LIBS="${LIBS} -lid3tag -lFLAC -logg -lz -lpthread -ldl -lm" } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_INSTALL/usr/sbin/minidlnad $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P ${PKG_INSTALL}/usr/sbin/minidlnad ${ADDON_BUILD}/${PKG_ADDON_ID}/bin - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -p $(get_install_dir libexif)/usr/lib/libexif.so.12 $ADDON_BUILD/$PKG_ADDON_ID/lib + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + cp -p $(get_install_dir libexif)/usr/lib/libexif.so.12 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib } diff --git a/packages/addons/service/minisatip/package.mk b/packages/addons/service/minisatip/package.mk index cd45e4b036..f6cabdb082 100644 --- a/packages/addons/service/minisatip/package.mk +++ b/packages/addons/service/minisatip/package.mk @@ -8,11 +8,11 @@ PKG_REV="103" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/catalinii/minisatip" -PKG_URL="https://github.com/catalinii/minisatip/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/catalinii/minisatip/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain dvb-apps libdvbcsa libxml2 openssl" PKG_SECTION="service" PKG_SHORTDESC="minisatip: a Sat>IP streaming server for Linux" -PKG_LONGDESC="minisatip($PKG_VERSION_NUMBER): is a Sat>IP streaming server for Linux supporting DVB-C, DVB-S/S2, DVB-T/T2, ATSC and ISDB-T" +PKG_LONGDESC="minisatip(${PKG_VERSION_NUMBER}): is a Sat>IP streaming server for Linux supporting DVB-C, DVB-S/S2, DVB-T/T2, ATSC and ISDB-T" PKG_BUILD_FLAGS="-sysroot" PKG_IS_ADDON="yes" @@ -27,8 +27,8 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --with-xml2=$(get_install_dir libxml2)/usr/include/libxml2" pre_configure_target() { - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} # enables Common Interface (DVBEN50221) CFLAGS+=" -I$(get_install_dir dvb-apps)/usr/include" @@ -40,8 +40,8 @@ makeinstall_target() { } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_BUILD/minisatip $ADDON_BUILD/$PKG_ADDON_ID/bin - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/webif - cp -PR $PKG_BUILD/html/* $ADDON_BUILD/$PKG_ADDON_ID/webif + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P ${PKG_BUILD}/minisatip ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/webif + cp -PR ${PKG_BUILD}/html/* ${ADDON_BUILD}/${PKG_ADDON_ID}/webif } diff --git a/packages/addons/service/mpd/package.mk b/packages/addons/service/mpd/package.mk index bf95cc050c..b5fb026f41 100644 --- a/packages/addons/service/mpd/package.mk +++ b/packages/addons/service/mpd/package.mk @@ -14,7 +14,7 @@ PKG_DEPENDS_TARGET="toolchain alsa-lib avahi boost curl faad2 ffmpeg flac glib l libmad libmpdclient libsamplerate libvorbis libnfs libogg mpd-mpc opus pulseaudio samba yajl libgcrypt" PKG_SECTION="service.multimedia" PKG_SHORTDESC="Music Player Daemon (MPD): a free and open Music Player Server" -PKG_LONGDESC="Music Player Daemon ($PKG_VERSION) is a flexible and powerful server-side application for playing music" +PKG_LONGDESC="Music Player Daemon (${PKG_VERSION}) is a flexible and powerful server-side application for playing music" PKG_BUILD_FLAGS="-sysroot" PKG_IS_ADDON="yes" @@ -98,12 +98,12 @@ PKG_MESON_OPTS_TARGET=" \ -Dzzip=disabled" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_INSTALL/usr/bin/mpd $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P ${PKG_INSTALL}/usr/bin/mpd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # copy mpd cli binary - cp -P $(get_install_dir mpd-mpc)/usr/bin/mpc $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir mpd-mpc)/usr/bin/mpc ${ADDON_BUILD}/${PKG_ADDON_ID}/bin - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -p $(get_install_dir libmpdclient)/usr/lib/libmpdclient.so $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -p $(get_install_dir libmpdclient)/usr/lib/libmpdclient.so.2 $ADDON_BUILD/$PKG_ADDON_ID/lib + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + cp -p $(get_install_dir libmpdclient)/usr/lib/libmpdclient.so ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + cp -p $(get_install_dir libmpdclient)/usr/lib/libmpdclient.so.2 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib } diff --git a/packages/addons/service/net-snmp/package.mk b/packages/addons/service/net-snmp/package.mk index 65b8093be8..595a95484f 100644 --- a/packages/addons/service/net-snmp/package.mk +++ b/packages/addons/service/net-snmp/package.mk @@ -8,7 +8,7 @@ PKG_REV="107" PKG_ARCH="any" PKG_LICENSE="BSD" PKG_SITE="http://www.net-snmp.org" -PKG_URL="https://sourceforge.net/projects/net-snmp/files/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://sourceforge.net/projects/net-snmp/files/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libnl openssl" PKG_SECTION="service" PKG_SHORTDESC="Simple Network Management Protocol utilities." @@ -41,7 +41,7 @@ configure_package() { --sbindir=/storage/.kodi/addons/${PKG_ADDON_ID}/bin \ --libdir=/storage/.kodi/addons/${PKG_ADDON_ID}/lib \ --disable-embedded-perl \ - --with-sysroot=$SYSROOT_PREFIX" + --with-sysroot=${SYSROOT_PREFIX}" } make_target() { @@ -49,10 +49,10 @@ make_target() { } makeinstall_target() { - make install INSTALL_PREFIX=$INSTALL + make install INSTALL_PREFIX=${INSTALL} } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -r $PKG_INSTALL/storage/.kodi/addons/${PKG_ADDON_ID}/bin $PKG_INSTALL/storage/.kodi/userdata/addon_data/${PKG_ADDON_ID}/share $ADDON_BUILD/$PKG_ADDON_ID/ + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + cp -r ${PKG_INSTALL}/storage/.kodi/addons/${PKG_ADDON_ID}/bin ${PKG_INSTALL}/storage/.kodi/userdata/addon_data/${PKG_ADDON_ID}/share ${ADDON_BUILD}/${PKG_ADDON_ID}/ } diff --git a/packages/addons/service/oscam/package.mk b/packages/addons/service/oscam/package.mk index c56894ff16..50d66e6aa0 100644 --- a/packages/addons/service/oscam/package.mk +++ b/packages/addons/service/oscam/package.mk @@ -9,11 +9,11 @@ PKG_REV="110" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.streamboard.tv/oscam/wiki" -PKG_URL="http://repo.or.cz/oscam.git/snapshot/$PKG_VERSION.tar.gz" +PKG_URL="http://repo.or.cz/oscam.git/snapshot/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain openssl pcsc-lite" PKG_SECTION="service.softcam" PKG_SHORTDESC="OSCam: an Open Source Conditional Access Modul" -PKG_LONGDESC="OSCam($PKG_VERSION_NUMBER) is a software to be used to decrypt digital television channels, as an alternative for a conditional access module." +PKG_LONGDESC="OSCam(${PKG_VERSION_NUMBER}) is a software to be used to decrypt digital television channels, as an alternative for a conditional access module." PKG_IS_ADDON="yes" PKG_ADDON_NAME="OSCam" @@ -21,8 +21,8 @@ PKG_ADDON_TYPE="xbmc.service" PKG_CMAKE_OPTS_TARGET="\ `#Building` \ - -DLIBUSBDIR=$SYSROOT_PREFIX/usr \ - -DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \ + -DLIBUSBDIR=${SYSROOT_PREFIX}/usr \ + -DOPTIONAL_INCLUDE_DIR=${SYSROOT_PREFIX}/usr/include \ \ `#Readers` \ -DCARDREADER_DB2COM=OFF \ @@ -68,7 +68,7 @@ PKG_CMAKE_OPTS_TARGET="\ -DWITH_STAPI=0" pre_configure_target() { - export OSCAM_ADDON_VERSION="$PKG_VERSION_NUMBER" + export OSCAM_ADDON_VERSION="${PKG_VERSION_NUMBER}" } makeinstall_target() { @@ -76,7 +76,7 @@ makeinstall_target() { } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_BUILD/.$TARGET_NAME/oscam $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_BUILD/.$TARGET_NAME/utils/list_smargo $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P ${PKG_BUILD}/.${TARGET_NAME}/oscam ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P ${PKG_BUILD}/.${TARGET_NAME}/utils/list_smargo ${ADDON_BUILD}/${PKG_ADDON_ID}/bin } diff --git a/packages/addons/service/pcscd/package.mk b/packages/addons/service/pcscd/package.mk index fa677a60f3..975889681b 100644 --- a/packages/addons/service/pcscd/package.mk +++ b/packages/addons/service/pcscd/package.mk @@ -21,11 +21,11 @@ PKG_ADDON_NAME="PC/SC Smart Card Daemon" PKG_ADDON_TYPE="xbmc.service" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ - cp -Pa $(get_install_dir pcsc-lite)/usr/sbin/pcscd $ADDON_BUILD/$PKG_ADDON_ID/bin/pcscd.bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ + cp -Pa $(get_install_dir pcsc-lite)/usr/sbin/pcscd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/pcscd.bin - cp -a $(get_install_dir ccid)/storage/.kodi/addons/$PKG_ADDON_ID/drivers $ADDON_BUILD/$PKG_ADDON_ID + cp -a $(get_install_dir ccid)/storage/.kodi/addons/${PKG_ADDON_ID}/drivers ${ADDON_BUILD}/${PKG_ADDON_ID} - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config - cp -Pa $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/ + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config + cp -Pa ${PKG_DIR}/config/* ${ADDON_BUILD}/${PKG_ADDON_ID}/config/ } diff --git a/packages/addons/service/proftpd/package.mk b/packages/addons/service/proftpd/package.mk index 0b56c8d487..2d880f7d15 100644 --- a/packages/addons/service/proftpd/package.mk +++ b/packages/addons/service/proftpd/package.mk @@ -9,11 +9,11 @@ PKG_REV="103" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.proftpd.org/" -PKG_URL="https://github.com/proftpd/proftpd/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/proftpd/proftpd/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libcap openssl ncurses pcre whois" PKG_SECTION="service" PKG_SHORTDESC="ProFTPD: a FTP server for linux" -PKG_LONGDESC="ProFTPD ($PKG_VERSION): is a secure and configurable FTP server with SSL/TLS support" +PKG_LONGDESC="ProFTPD (${PKG_VERSION}): is a secure and configurable FTP server with SSL/TLS support" PKG_BUILD_FLAGS="-sysroot" PKG_IS_ADDON="yes" @@ -26,7 +26,7 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --enable-openssl \ --with-modules=mod_tls \ --enable-nls \ - --localedir=$ADDON_DIR/locale \ + --localedir=${ADDON_DIR}/locale \ --enable-sendfile \ --enable-facl \ --enable-autoshadow \ @@ -39,21 +39,21 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ install_group=$(id -g)" pre_configure_target() { - export CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" + export CFLAGS="${CFLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" cd .. - rm -rf .$TARGET_NAME + rm -rf .${TARGET_NAME} } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_INSTALL/usr/sbin/proftpd $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_INSTALL/usr/bin/ftpwho $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_INSTALL/usr/bin/ftptop $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp ${PKG_INSTALL}/usr/sbin/proftpd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp ${PKG_INSTALL}/usr/bin/ftpwho ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp ${PKG_INSTALL}/usr/bin/ftptop ${ADDON_BUILD}/${PKG_ADDON_ID}/bin - cp $(get_install_dir whois)/usr/bin/mkpasswd $ADDON_BUILD/$PKG_ADDON_ID/bin + cp $(get_install_dir whois)/usr/bin/mkpasswd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/locale - for i in $PKG_INSTALL/storage/.kodi/addons/$PKG_ADDON_ID/locale/*; do - cp $i/LC_MESSAGES/proftpd.mo $ADDON_BUILD/$PKG_ADDON_ID/locale/$(basename $i).mo + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/locale + for i in ${PKG_INSTALL}/storage/.kodi/addons/${PKG_ADDON_ID}/locale/*; do + cp ${i}/LC_MESSAGES/proftpd.mo ${ADDON_BUILD}/${PKG_ADDON_ID}/locale/$(basename ${i}).mo done } diff --git a/packages/addons/service/rsyslog/package.mk b/packages/addons/service/rsyslog/package.mk index ac8503b735..e2208b6d37 100644 --- a/packages/addons/service/rsyslog/package.mk +++ b/packages/addons/service/rsyslog/package.mk @@ -8,11 +8,11 @@ PKG_REV="105" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/rsyslog" -PKG_URL="http://www.rsyslog.com/files/download/rsyslog/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://www.rsyslog.com/files/download/rsyslog/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain curl libestr libfastjson libgcrypt liblogging liblognorm librelp util-linux zlib" PKG_SECTION="service" PKG_SHORTDESC="Rsyslog: a rocket-fast system for log processing." -PKG_LONGDESC="Rsyslog ($PKG_VERSION) offers high-performance, great security features and a modular design." +PKG_LONGDESC="Rsyslog (${PKG_VERSION}) offers high-performance, great security features and a modular design." PKG_BUILD_FLAGS="-sysroot" PKG_IS_ADDON="yes" @@ -27,20 +27,20 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-default-tests \ ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes" -export LIBGCRYPT_CONFIG="$SYSROOT_PREFIX/usr/bin/libgcrypt-config" +export LIBGCRYPT_CONFIG="${SYSROOT_PREFIX}/usr/bin/libgcrypt-config" pre_configure_target() { - CFLAGS="$CFLAGS -fcommon" + CFLAGS+=" -fcommon" } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_INSTALL/usr/sbin/rsyslogd \ - $ADDON_BUILD/$PKG_ADDON_ID/bin/ + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp ${PKG_INSTALL}/usr/sbin/rsyslogd \ + ${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) + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/rsyslog + for l in $(find ${PKG_INSTALL}/usr/lib -name *.so) do - cp $l $ADDON_BUILD/$PKG_ADDON_ID/lib/rsyslog/ + cp ${l} ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/rsyslog/ done } diff --git a/packages/addons/service/snapclient/package.mk b/packages/addons/service/snapclient/package.mk index dd7ed292c0..410def061c 100644 --- a/packages/addons/service/snapclient/package.mk +++ b/packages/addons/service/snapclient/package.mk @@ -9,7 +9,7 @@ PKG_LICENSE="GPLv3" PKG_DEPENDS_TARGET="toolchain alsa-plugins snapcast" PKG_SECTION="service" PKG_SHORTDESC="Snapclient: Synchronous multi-room audio client" -PKG_LONGDESC="Snapclient ($PKG_VERSION) is a Snapcast client. Snapcast is a multi-room client-server audio system, where all clients are time synchronized with the server to play perfectly synced audioplays." +PKG_LONGDESC="Snapclient (${PKG_VERSION}) is a Snapcast client. Snapcast is a multi-room client-server audio system, where all clients are time synchronized with the server to play perfectly synced audioplays." PKG_TOOLCHAIN="manual" PKG_IS_ADDON="yes" @@ -18,11 +18,11 @@ PKG_ADDON_TYPE="xbmc.service.library" PKG_MAINTAINER="Anton Voyl (awiouy)" addon() { - mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin" + mkdir -p "${ADDON_BUILD}/${PKG_ADDON_ID}/bin" cp "$(get_install_dir snapcast)/usr/bin/snapclient" \ - "$ADDON_BUILD/$PKG_ADDON_ID/bin" + "${ADDON_BUILD}/${PKG_ADDON_ID}/bin" - mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/lib" + mkdir -p "${ADDON_BUILD}/${PKG_ADDON_ID}/lib" cp "$(get_install_dir alsa-plugins)/usr/lib/alsa"/*.so \ - "$ADDON_BUILD/$PKG_ADDON_ID/lib" + "${ADDON_BUILD}/${PKG_ADDON_ID}/lib" } diff --git a/packages/addons/service/snapserver/package.mk b/packages/addons/service/snapserver/package.mk index 45f9509ec1..f0aae4f499 100644 --- a/packages/addons/service/snapserver/package.mk +++ b/packages/addons/service/snapserver/package.mk @@ -9,7 +9,7 @@ PKG_LICENSE="GPLv3" PKG_DEPENDS_TARGET="toolchain shairport-sync snapcast" PKG_SECTION="service" PKG_SHORTDESC="Snapserver: Synchronous multi-room audio server" -PKG_LONGDESC="Snapclient ($PKG_VERSION) is a Snapcast server. Snapcast is a multi-room client-server audio system, where all clients are time synchronized with the server to play perfectly synced audioplays." +PKG_LONGDESC="Snapclient (${PKG_VERSION}) is a Snapcast server. Snapcast is a multi-room client-server audio system, where all clients are time synchronized with the server to play perfectly synced audioplays." PKG_TOOLCHAIN="manual" PKG_IS_ADDON="yes" @@ -19,8 +19,8 @@ PKG_ADDON_REQUIRES="service.librespot:0.0.0" PKG_MAINTAINER="Anton Voyl (awiouy)" addon() { - mkdir -p "$ADDON_BUILD/$PKG_ADDON_ID/bin" + mkdir -p "${ADDON_BUILD}/${PKG_ADDON_ID}/bin" cp "$(get_install_dir shairport-sync)/usr/bin/shairport-sync" \ "$(get_install_dir snapcast)/usr/bin/snapserver" \ - "$ADDON_BUILD/$PKG_ADDON_ID/bin" + "${ADDON_BUILD}/${PKG_ADDON_ID}/bin" } diff --git a/packages/addons/service/tigervnc/package.mk b/packages/addons/service/tigervnc/package.mk index d3fc2d1b1d..b23db21ab1 100644 --- a/packages/addons/service/tigervnc/package.mk +++ b/packages/addons/service/tigervnc/package.mk @@ -8,11 +8,11 @@ PKG_REV="105" PKG_ARCH="x86_64" PKG_LICENSE="GPLv2" PKG_SITE="http://www.tigervnc.org" -PKG_URL="https://github.com/TigerVNC/tigervnc/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/TigerVNC/tigervnc/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain cmake:host libX11 libXdamage libXext libXtst zlib libjpeg-turbo" PKG_SECTION="service" -PKG_SHORTDESC="$PKG_ADDON_NAME server" -PKG_LONGDESC="$PKG_ADDON_NAME ($PKG_VERSION) is a high-performance, platform-neutral implementation of Virtual Network Computing, a client/server application that allows users to launch and interact with graphical applications on remote machines" +PKG_SHORTDESC="${PKG_ADDON_NAME} server" +PKG_LONGDESC="${PKG_ADDON_NAME} (${PKG_VERSION}) is a high-performance, platform-neutral implementation of Virtual Network Computing, a client/server application that allows users to launch and interact with graphical applications on remote machines" PKG_IS_ADDON="yes" PKG_ADDON_NAME="TigerVNC" @@ -25,9 +25,9 @@ makeinstall_target() { } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_BUILD/.$TARGET_NAME/unix/vncconfig/vncconfig \ - $PKG_BUILD/.$TARGET_NAME/unix/vncpasswd/vncpasswd \ - $PKG_BUILD/.$TARGET_NAME/unix/x0vncserver/x0vncserver \ - $ADDON_BUILD/$PKG_ADDON_ID/bin/ + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp ${PKG_BUILD}/.${TARGET_NAME}/unix/vncconfig/vncconfig \ + ${PKG_BUILD}/.${TARGET_NAME}/unix/vncpasswd/vncpasswd \ + ${PKG_BUILD}/.${TARGET_NAME}/unix/x0vncserver/x0vncserver \ + ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ } diff --git a/packages/addons/service/tinc/package.mk b/packages/addons/service/tinc/package.mk index d3fafb024e..0cf3af36ed 100644 --- a/packages/addons/service/tinc/package.mk +++ b/packages/addons/service/tinc/package.mk @@ -8,11 +8,11 @@ PKG_REV="105" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="http://www.tinc-vpn.org/" -PKG_URL="https://github.com/gsliepen/tinc/archive/release-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/gsliepen/tinc/archive/release-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain lzo miniupnpc ncurses openssl readline zlib" PKG_SECTION="service/system" PKG_SHORTDESC="tinc: a Virtual Private Network daemon" -PKG_LONGDESC="tinc ($PKG_VERSION) is a Virtual Private Network (VPN) daemon that uses tunnelling and encryption to create a secure private network between hosts on the Internet. Because the VPN appears to the IP level network code as a normal network device, there is no need to adapt any existing software. This allows VPN sites to share information with each other over the Internet without exposing any information to others." +PKG_LONGDESC="tinc (${PKG_VERSION}) is a Virtual Private Network (VPN) daemon that uses tunnelling and encryption to create a secure private network between hosts on the Internet. Because the VPN appears to the IP level network code as a normal network device, there is no need to adapt any existing software. This allows VPN sites to share information with each other over the Internet without exposing any information to others." PKG_TOOLCHAIN="autotools" PKG_BUILD_FLAGS="+pic" @@ -31,7 +31,7 @@ make_target() { } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $PKG_INSTALL/usr/sbin/* \ - $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp ${PKG_INSTALL}/usr/sbin/* \ + ${ADDON_BUILD}/${PKG_ADDON_ID}/bin } diff --git a/packages/addons/service/touchscreen/package.mk b/packages/addons/service/touchscreen/package.mk index 8f9f8bcca8..eacd6d361d 100644 --- a/packages/addons/service/touchscreen/package.mk +++ b/packages/addons/service/touchscreen/package.mk @@ -22,14 +22,14 @@ PKG_ADDON_NAME="Touchscreen" PKG_ADDON_TYPE="xbmc.service" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin - cp $PKG_DIR/addon.xml $ADDON_BUILD/$PKG_ADDON_ID + cp ${PKG_DIR}/addon.xml ${ADDON_BUILD}/${PKG_ADDON_ID} # set only version (revision will be added by buildsystem) - sed -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \ - -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml + sed -e "s|@ADDON_VERSION@|${ADDON_VERSION}|g" \ + -i ${ADDON_BUILD}/${PKG_ADDON_ID}/addon.xml - cp $(get_install_dir tslib)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin - cp $(get_install_dir evtest)/usr/bin/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin + cp $(get_install_dir tslib)/usr/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp $(get_install_dir evtest)/usr/bin/evtest ${ADDON_BUILD}/${PKG_ADDON_ID}/bin } diff --git a/packages/addons/service/ttyd/package.mk b/packages/addons/service/ttyd/package.mk index aee563f218..f3514fc50a 100644 --- a/packages/addons/service/ttyd/package.mk +++ b/packages/addons/service/ttyd/package.mk @@ -8,22 +8,22 @@ PKG_REV="102" PKG_ARCH="any" PKG_LICENSE="MIT" PKG_SITE="https://github.com/tsl0922/ttyd" -PKG_URL="https://github.com/tsl0922/ttyd/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/tsl0922/ttyd/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libwebsockets" PKG_SECTION="service" PKG_SHORTDESC="ttyd: a tool for accessing the terminal over a browser" -PKG_LONGDESC="ttyd ($PKG_VERSION): is a simple command-line tool for sharing terminal over the web" +PKG_LONGDESC="ttyd (${PKG_VERSION}): is a simple command-line tool for sharing terminal over the web" PKG_IS_ADDON="yes" PKG_ADDON_NAME="Web SSH Terminal" PKG_ADDON_TYPE="xbmc.service" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_INSTALL/usr/bin/ttyd $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P ${PKG_INSTALL}/usr/bin/ttyd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -p $(get_install_dir json-c)/usr/lib/libjson-c.so.5 $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -p $(get_install_dir libwebsockets)/usr/lib/libwebsockets.so.17 $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -p $(get_install_dir libuv)/usr/lib/libuv.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + cp -p $(get_install_dir json-c)/usr/lib/libjson-c.so.5 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + cp -p $(get_install_dir libwebsockets)/usr/lib/libwebsockets.so.17 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib + cp -p $(get_install_dir libuv)/usr/lib/libuv.so.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib } diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk index 3bf0a68bec..2075f85c30 100644 --- a/packages/addons/service/tvheadend42/package.mk +++ b/packages/addons/service/tvheadend42/package.mk @@ -9,13 +9,13 @@ PKG_REV="125" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.tvheadend.org" -PKG_URL="https://github.com/tvheadend/tvheadend/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/tvheadend/tvheadend/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain avahi comskip curl dvb-apps ffmpegx libdvbcsa libhdhomerun \ libiconv openssl pngquant:host Python3:host tvh-dtv-scan-tables" PKG_DEPENDS_CONFIG="ffmpegx" PKG_SECTION="service" PKG_SHORTDESC="Tvheadend: a TV streaming server for Linux" -PKG_LONGDESC="Tvheadend ($PKG_VERSION_NUMBER): is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV, SAT>IP, ATSC and ISDB-T" +PKG_LONGDESC="Tvheadend (${PKG_VERSION_NUMBER}): is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV, SAT>IP, ATSC and ISDB-T" PKG_BUILD_FLAGS="-sysroot" PKG_IS_ADDON="yes" @@ -42,23 +42,23 @@ PKG_TVH_TRANSCODING="\ --enable-libx265" # specific transcoding options -if [[ "$TARGET_ARCH" != "x86_64" ]]; then - PKG_TVH_TRANSCODING="$PKG_TVH_TRANSCODING \ +if [[ "${TARGET_ARCH}" != "x86_64" ]]; then + PKG_TVH_TRANSCODING="${PKG_TVH_TRANSCODING} \ --disable-libvpx \ --disable-libx265" fi post_unpack() { - sed -e 's/VER="0.0.0~unknown"/VER="'$PKG_VERSION_NUMBER' ~ LibreELEC Tvh-addon v'$ADDON_VERSION'.'$PKG_REV'"/g' -i $PKG_BUILD/support/version - sed -e 's|'/usr/bin/pngquant'|'$TOOLCHAIN/bin/pngquant'|g' -i $PKG_BUILD/support/mkbundle + sed -e 's/VER="0.0.0~unknown"/VER="'${PKG_VERSION_NUMBER}' ~ LibreELEC Tvh-addon v'${ADDON_VERSION}'.'${PKG_REV}'"/g' -i ${PKG_BUILD}/support/version + sed -e 's|'/usr/bin/pngquant'|'${TOOLCHAIN}/bin/pngquant'|g' -i ${PKG_BUILD}/support/mkbundle } pre_configure_target() { PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \ - --arch=$TARGET_ARCH \ - --cpu=$TARGET_CPU \ - --cc=$CC \ - $PKG_TVH_TRANSCODING \ + --arch=${TARGET_ARCH} \ + --cpu=${TARGET_CPU} \ + --cc=${CC} \ + ${PKG_TVH_TRANSCODING} \ --enable-avahi \ --enable-bundle \ --disable-dbus_1 \ @@ -77,47 +77,47 @@ pre_configure_target() { --enable-trace \ --nowerror \ --disable-bintray_cache \ - --python=$TOOLCHAIN/bin/python" + --python=${TOOLCHAIN}/bin/python" # fails to build in subdirs - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} # pass ffmpegx to build CFLAGS+=" -I$(get_install_dir ffmpegx)/usr/local/include" LDFLAGS+=" -L$(get_install_dir ffmpegx)/usr/local/lib" # pass libhdhomerun to build - CFLAGS+=" -I$SYSROOT_PREFIX/usr/include/hdhomerun" + CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/hdhomerun" - export CROSS_COMPILE="$TARGET_PREFIX" - export CFLAGS+=" -I$SYSROOT_PREFIX/usr/include/iconv -L$SYSROOT_PREFIX/usr/lib/iconv" + export CROSS_COMPILE="${TARGET_PREFIX}" + export CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/iconv -L${SYSROOT_PREFIX}/usr/lib/iconv" } post_make_target() { - $CC -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl + ${CC} -O -fbuiltin -fomit-frame-pointer -fPIC -shared -o capmt_ca.so src/extra/capmt_ca.c -ldl } post_makeinstall_target() { - mkdir -p $INSTALL/usr/lib - cp -p capmt_ca.so $INSTALL/usr/lib + mkdir -p ${INSTALL}/usr/lib + cp -p capmt_ca.so ${INSTALL}/usr/lib } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin - cp $PKG_DIR/addon.xml $ADDON_BUILD/$PKG_ADDON_ID + cp ${PKG_DIR}/addon.xml ${ADDON_BUILD}/${PKG_ADDON_ID} # set only version (revision will be added by buildsystem) - sed -e "s|@ADDON_VERSION@|$ADDON_VERSION|g" \ - -i $ADDON_BUILD/$PKG_ADDON_ID/addon.xml + sed -e "s|@ADDON_VERSION@|${ADDON_VERSION}|g" \ + -i ${ADDON_BUILD}/${PKG_ADDON_ID}/addon.xml - cp -P $PKG_INSTALL/usr/bin/tvheadend $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_INSTALL/usr/lib/capmt_ca.so $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir comskip)/usr/bin/comskip $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P ${PKG_INSTALL}/usr/bin/tvheadend ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P ${PKG_INSTALL}/usr/lib/capmt_ca.so ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir comskip)/usr/bin/comskip ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # dvb-scan files - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/dvb-scan + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/dvb-scan cp -r $(get_install_dir tvh-dtv-scan-tables)/usr/share/dvbv5/* \ - $ADDON_BUILD/$PKG_ADDON_ID/dvb-scan + ${ADDON_BUILD}/${PKG_ADDON_ID}/dvb-scan } diff --git a/packages/addons/service/usbmuxd/package.mk b/packages/addons/service/usbmuxd/package.mk index b29fcfe54b..f81459dcdb 100644 --- a/packages/addons/service/usbmuxd/package.mk +++ b/packages/addons/service/usbmuxd/package.mk @@ -28,6 +28,6 @@ makeinstall_target() { } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $PKG_BUILD/.$TARGET_NAME/src/usbmuxd $ADDON_BUILD/$PKG_ADDON_ID/bin/ + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P ${PKG_BUILD}/.${TARGET_NAME}/src/usbmuxd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ } diff --git a/packages/addons/service/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk index 0e47e94df1..38582ea253 100644 --- a/packages/addons/service/vdr-addon/package.mk +++ b/packages/addons/service/vdr-addon/package.mk @@ -25,41 +25,41 @@ PKG_ADDON_REQUIRES="pvr.vdr.vnsi:0.0.0 script.config.vdr:0.0.0" addon() { # create dirs - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/{bin,lib,plugin} - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/{eepg,epgfixer,epgsearch,streamdev-server,vnsiserver} - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/{live,restfulapi} + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib,plugin} + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config/epgsources + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/config/plugins/{eepg,epgfixer,epgsearch,streamdev-server,vnsiserver} + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/res/plugins/{live,restfulapi} # configs - cp -P $(get_build_dir vdr)/{diseqc.conf,keymacros.conf,scr.conf,sources.conf,svdrphosts.conf} $ADDON_BUILD/$PKG_ADDON_ID/config - cp -P $(get_build_dir vdr-plugin-epgfixer)/epgfixer/*.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgfixer - cp -P $(get_build_dir vdr-plugin-streamdev)/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server - cp -P $(get_build_dir vdr-plugin-vnsiserver)/vnsiserver/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/vnsiserver + cp -P $(get_build_dir vdr)/{diseqc.conf,keymacros.conf,scr.conf,sources.conf,svdrphosts.conf} ${ADDON_BUILD}/${PKG_ADDON_ID}/config + cp -P $(get_build_dir vdr-plugin-epgfixer)/epgfixer/*.conf ${ADDON_BUILD}/${PKG_ADDON_ID}/config/plugins/epgfixer + cp -P $(get_build_dir vdr-plugin-streamdev)/streamdev-server/streamdevhosts.conf ${ADDON_BUILD}/${PKG_ADDON_ID}/config/plugins/streamdev-server + cp -P $(get_build_dir vdr-plugin-vnsiserver)/vnsiserver/allowed_hosts.conf ${ADDON_BUILD}/${PKG_ADDON_ID}/config/plugins/vnsiserver - touch $ADDON_BUILD/$PKG_ADDON_ID/config/channels.conf - echo '0.0.0.0/0' >> $ADDON_BUILD/$PKG_ADDON_ID/config/svdrphosts.conf + touch ${ADDON_BUILD}/${PKG_ADDON_ID}/config/channels.conf + echo '0.0.0.0/0' >> ${ADDON_BUILD}/${PKG_ADDON_ID}/config/svdrphosts.conf # copy static files cp -PR $(get_build_dir vdr-plugin-restfulapi)/web/* \ $(get_build_dir vdr-plugin-restfulapi)/API.html \ - $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/restfulapi + ${ADDON_BUILD}/${PKG_ADDON_ID}/res/plugins/restfulapi - cp -PR $(get_build_dir vdr-plugin-live)/live/* $ADDON_BUILD/$PKG_ADDON_ID/res/plugins/live + cp -PR $(get_build_dir vdr-plugin-live)/live/* ${ADDON_BUILD}/${PKG_ADDON_ID}/res/plugins/live - cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv + cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv.dist ${ADDON_BUILD}/${PKG_ADDON_ID}/config/epgsources/epgdata2xmltv # copy binaries for pkg in ddci2 dummydevice dvbapi eepg epgfixer epgsearch iptv live restfulapi robotv satip vnsiserver wirbelscan wirbelscancontrol xmltv2vdr; do - cp -PR $(get_build_dir vdr-plugin-$pkg)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin + cp -PR $(get_build_dir vdr-plugin-${pkg})/libvdr*.so.* ${ADDON_BUILD}/${PKG_ADDON_ID}/plugin done cp -P $(get_build_dir vdr-plugin-streamdev)/client/libvdr*.so.* \ $(get_build_dir vdr-plugin-streamdev)/server/libvdr*.so.* \ - $ADDON_BUILD/$PKG_ADDON_ID/plugin + ${ADDON_BUILD}/${PKG_ADDON_ID}/plugin - cp -PL $(get_install_dir tntnet)/usr/lib/libtntnet.so.12 $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -PL $(get_install_dir tntnet)/usr/lib/libtntnet.so.12 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib - cp -P $(get_build_dir vdr)/vdr $ADDON_BUILD/$PKG_ADDON_ID/bin/vdr.bin + cp -P $(get_build_dir vdr)/vdr ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/vdr.bin - cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_build_dir vdr-plugin-xmltv2vdr)/dist/epgdata2xmltv/epgdata2xmltv ${ADDON_BUILD}/${PKG_ADDON_ID}/bin } diff --git a/packages/addons/skin/estouchy/package.mk b/packages/addons/skin/estouchy/package.mk index c8e38a70fd..b506e2c686 100644 --- a/packages/addons/skin/estouchy/package.mk +++ b/packages/addons/skin/estouchy/package.mk @@ -19,6 +19,6 @@ PKG_ADDON_NAME="Estouchy" PKG_ADDON_TYPE="xbmc.gui.skin" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID - cp -a $(get_install_dir kodi)/.noinstall/skin.estouchy/* $ADDON_BUILD/$PKG_ADDON_ID + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID} + cp -a $(get_install_dir kodi)/.noinstall/skin.estouchy/* ${ADDON_BUILD}/${PKG_ADDON_ID} } diff --git a/packages/addons/tools/btrfs-progs/package.mk b/packages/addons/tools/btrfs-progs/package.mk index 27d1af5cce..76eb13eba4 100644 --- a/packages/addons/tools/btrfs-progs/package.mk +++ b/packages/addons/tools/btrfs-progs/package.mk @@ -8,7 +8,7 @@ PKG_REV="102" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://btrfs.wiki.kernel.org/index.php/Main_Page" -PKG_URL="https://github.com/kdave/btrfs-progs/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kdave/btrfs-progs/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain util-linux zlib lzo zstd" PKG_SECTION="tools" PKG_SHORTDESC="tools for the btrfs filesystem" @@ -30,6 +30,6 @@ pre_configure_target() { } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ - cp -P $PKG_INSTALL/usr/bin/{btrfs,btrfsck,btrfstune,btrfs-zero-log,fsck.btrfs,mkfs.btrfs} $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ + cp -P ${PKG_INSTALL}/usr/bin/{btrfs,btrfsck,btrfstune,btrfs-zero-log,fsck.btrfs,mkfs.btrfs} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin } diff --git a/packages/addons/tools/dotnet-runtime/package.mk b/packages/addons/tools/dotnet-runtime/package.mk index 215d729850..0178df7867 100644 --- a/packages/addons/tools/dotnet-runtime/package.mk +++ b/packages/addons/tools/dotnet-runtime/package.mk @@ -10,7 +10,7 @@ PKG_SITE="https://dotnet.github.io/" PKG_DEPENDS_TARGET="toolchain icu" PKG_SECTION="tools" PKG_SHORTDESC=".NET Core Runtime" -PKG_LONGDESC=".NET Core Runtime ($PKG_VERSION) runs applications built with .NET Core, a cross-platform .NET implementation." +PKG_LONGDESC=".NET Core Runtime (${PKG_VERSION}) runs applications built with .NET Core, a cross-platform .NET implementation." PKG_TOOLCHAIN="manual" PKG_IS_ADDON="yes" @@ -36,11 +36,11 @@ esac PKG_SOURCE_NAME="aspnetcore-runtime_${PKG_VERSION}_${ARCH}.tar.gz" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -r $PKG_BUILD/* \ - $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -r ${PKG_BUILD}/* \ + ${ADDON_BUILD}/${PKG_ADDON_ID}/bin - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib cp -L $(get_install_dir icu)/usr/lib/lib*.so.?? \ - $ADDON_BUILD/$PKG_ADDON_ID/lib/ + ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ } diff --git a/packages/addons/tools/dvb-tools/package.mk b/packages/addons/tools/dvb-tools/package.mk index 1b944108b7..81fa9bf30c 100644 --- a/packages/addons/tools/dvb-tools/package.mk +++ b/packages/addons/tools/dvb-tools/package.mk @@ -29,42 +29,42 @@ PKG_DEPENDS_TARGET="toolchain \ w_scan" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ # blindscan-s2 - cp -P $(get_install_dir blindscan-s2)/usr/bin/blindscan-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir blindscan-s2)/usr/bin/blindscan-s2 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # dvb-apps - cp -P $(get_install_dir dvb-apps)/usr/bin/dvbdate $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir dvb-apps)/usr/bin/dvbnet $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir dvb-apps)/usr/bin/dvbscan $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir dvb-apps)/usr/bin/dvbtraffic $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir dvb-apps)/usr/bin/femon $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir dvb-apps)/usr/bin/scan $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir dvb-apps)/usr/bin/azap $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir dvb-apps)/usr/bin/czap $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir dvb-apps)/usr/bin/szap $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir dvb-apps)/usr/bin/tzap $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir dvb-apps)/usr/bin/zap $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/dvbdate ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/dvbnet ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/dvbscan ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/dvbtraffic ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/femon ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/scan ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/azap ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/czap ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/szap ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/tzap ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir dvb-apps)/usr/bin/zap ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # dvblast - cp -P $(get_install_dir dvblast)/usr/bin/dvblast $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvblast)/usr/bin/dvblast ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # dvbsnoop - cp -P $(get_install_dir dvbsnoop)/usr/bin/dvbsnoop $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dvbsnoop)/usr/bin/dvbsnoop ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # mumudvb - cp -P $(get_install_dir mumudvb)/usr/bin/mumudvb $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir mumudvb)/usr/bin/mumudvb ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # szap-s2 - cp -P $(get_install_dir szap-s2)/usr/bin/szap-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir szap-s2)/usr/bin/szap-s2 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # tune-s2 - cp -P $(get_install_dir tune-s2)/usr/bin/tune-s2 $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir tune-s2)/usr/bin/tune-s2 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # t2scan - cp -P $(get_install_dir t2scan)/usr/bin/t2scan $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir t2scan)/usr/bin/t2scan ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # w_scan - cp -P $(get_install_dir w_scan)/usr/bin/w_scan $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir w_scan)/usr/bin/w_scan ${ADDON_BUILD}/${PKG_ADDON_ID}/bin } diff --git a/packages/addons/tools/ffmpeg-tools/package.mk b/packages/addons/tools/ffmpeg-tools/package.mk index ce20ab9e1a..a7977f8d52 100644 --- a/packages/addons/tools/ffmpeg-tools/package.mk +++ b/packages/addons/tools/ffmpeg-tools/package.mk @@ -18,6 +18,6 @@ PKG_ADDON_NAME="FFmpeg Tools" PKG_ADDON_TYPE="xbmc.python.script" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ - cp -L $(get_install_dir ffmpegx)/usr/local/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ + cp -L $(get_install_dir ffmpegx)/usr/local/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin } diff --git a/packages/addons/tools/game-tools/package.mk b/packages/addons/tools/game-tools/package.mk index 0153a268f3..8d4ba7507c 100644 --- a/packages/addons/tools/game-tools/package.mk +++ b/packages/addons/tools/game-tools/package.mk @@ -24,19 +24,19 @@ PKG_DEPENDS_TARGET="toolchain \ linuxconsoletools" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ # bchunk - cp -P $(get_install_dir bchunk)/usr/bin/bchunk $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir bchunk)/usr/bin/bchunk ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # ecm-tools - cp -P $(get_install_dir ecm-tools)/usr/bin/bin2ecm $ADDON_BUILD/$PKG_ADDON_ID/bin - ln -s bin2ecm $ADDON_BUILD/$PKG_ADDON_ID/bin/ecm2bin + cp -P $(get_install_dir ecm-tools)/usr/bin/bin2ecm ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + ln -s bin2ecm ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ecm2bin # iat - cp -P $(get_install_dir iat)/usr/bin/iat $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir iat)/usr/bin/iat ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # linuxconsoletools - cp -P $(get_install_dir linuxconsoletools)/usr/bin/fftest $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir linuxconsoletools)/usr/bin/jscal $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir linuxconsoletools)/usr/bin/jstest $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir linuxconsoletools)/usr/bin/fftest ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir linuxconsoletools)/usr/bin/jscal ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir linuxconsoletools)/usr/bin/jstest ${ADDON_BUILD}/${PKG_ADDON_ID}/bin } diff --git a/packages/addons/tools/jre.zulu/package.mk b/packages/addons/tools/jre.zulu/package.mk index 8185b4508e..7ee16e1ccb 100644 --- a/packages/addons/tools/jre.zulu/package.mk +++ b/packages/addons/tools/jre.zulu/package.mk @@ -9,26 +9,26 @@ PKG_DEPENDS_TARGET="jre-libbluray libXext chrome-libXtst chrome-libXi chrome-lib PKG_DEPENDS_UNPACK="jdk-${TARGET_ARCH}-zulu" PKG_SECTION="tools" PKG_SHORTDESC="Java Runtime Environment 8 for Blu-ray Disc Java menus from Azul Systems." -PKG_LONGDESC="$PKG_SHORTDESC" +PKG_LONGDESC="${PKG_SHORTDESC}" PKG_TOOLCHAIN="manual" PKG_IS_ADDON="yes" PKG_ADDON_NAME="JRE for BD-J menus" PKG_ADDON_TYPE="xbmc.python.script" -# find $1.so.[0-9]* in $2 and copy it to dest +# find ${1}.so.[0-9]* in ${2} and copy it to dest _pkg_copy_lib() { - find "$2/usr/lib" -regextype sed -regex ".*/$1\.so\.[0-9]*" \ - -exec cp {} "$ADDON_BUILD/$PKG_ADDON_ID/lib" \; + find "${2}/usr/lib" -regextype sed -regex ".*/${1}\.so\.[0-9]*" \ + -exec cp {} "${ADDON_BUILD}/${PKG_ADDON_ID}/lib" \; } addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib cp -a $(get_build_dir jdk-${TARGET_ARCH}-zulu)/jre \ $(get_install_dir jre-libbluray)/usr/share/java/*.jar \ ${PKG_DIR}/profile.d \ - $ADDON_BUILD/$PKG_ADDON_ID + ${ADDON_BUILD}/${PKG_ADDON_ID} # copy required libraries for JRE _pkg_copy_lib libXtst $(get_install_dir chrome-libXtst) @@ -36,7 +36,7 @@ addon() { _pkg_copy_lib libXrender $(get_install_dir chrome-libXrender) _pkg_copy_lib libXinerama $(get_install_dir jre-libXinerama) - if [ "$TARGET_ARCH" = "arm" ]; then + if [ "${TARGET_ARCH}" = "arm" ]; then _pkg_copy_lib libX11 $(get_install_dir libX11) _pkg_copy_lib libXext $(get_install_dir libXext) fi diff --git a/packages/addons/tools/multimedia-tools/package.mk b/packages/addons/tools/multimedia-tools/package.mk index 6a4c0aa318..693c41c907 100644 --- a/packages/addons/tools/multimedia-tools/package.mk +++ b/packages/addons/tools/multimedia-tools/package.mk @@ -27,25 +27,25 @@ PKG_DEPENDS_TARGET="toolchain \ tstools" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ # alsamixer - cp -P $(get_install_dir alsa-utils)/.noinstall/alsamixer $ADDON_BUILD/$PKG_ADDON_ID/bin/ + cp -P $(get_install_dir alsa-utils)/.noinstall/alsamixer ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ # mediainfo - cp -P $(get_install_dir mediainfo)/usr/bin/mediainfo $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir mediainfo)/usr/bin/mediainfo ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # mpg123 - cp -P $(get_install_dir mpg123)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/ + cp -P $(get_install_dir mpg123)/usr/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ # opencaster - cp -P $(get_install_dir opencaster)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/ + cp -P $(get_install_dir opencaster)/usr/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ # squeezelite - cp -P $(get_install_dir squeezelite)/usr/bin/squeezelite $ADDON_BUILD/$PKG_ADDON_ID/bin/ + cp -P $(get_install_dir squeezelite)/usr/bin/squeezelite ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ # tsdecrypt - cp -P $(get_install_dir tsdecrypt)/usr/bin/tsdecrypt $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir tsdecrypt)/usr/bin/tsdecrypt ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # tstools - cp -P $(get_install_dir tstools)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/ + cp -P $(get_install_dir tstools)/usr/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ } diff --git a/packages/addons/tools/network-tools/package.mk b/packages/addons/tools/network-tools/package.mk index 86c606cccb..5431960438 100644 --- a/packages/addons/tools/network-tools/package.mk +++ b/packages/addons/tools/network-tools/package.mk @@ -34,56 +34,56 @@ PKG_DEPENDS_TARGET="toolchain \ wireless_tools" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # bwm-ng - cp -P $(get_install_dir bwm-ng)/usr/bin/bwm-ng $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir bwm-ng)/usr/bin/bwm-ng ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # iftop - cp -P $(get_install_dir iftop)/usr/sbin/iftop $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir iftop)/usr/sbin/iftop ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # iperf - cp -P $(get_install_dir iperf)/usr/bin/iperf3 $ADDON_BUILD/$PKG_ADDON_ID/bin - ln -s iperf3 $ADDON_BUILD/$PKG_ADDON_ID/bin/iperf + cp -P $(get_install_dir iperf)/usr/bin/iperf3 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + ln -s iperf3 ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iperf # irssi - cp -P $(get_install_dir irssi)/usr/bin/irssi $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir irssi)/usr/bin/irssi ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # lftp - cp -P $(get_install_dir lftp)/usr/bin/lftp $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir lftp)/usr/bin/lftp ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # ncftp - cp -P $(get_install_dir ncftp)/usr/bin/ncftp $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir ncftp)/usr/bin/ncftpbatch $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir ncftp)/usr/bin/ncftpget $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir ncftp)/usr/bin/ncftpls $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir ncftp)/usr/bin/ncftpput $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir ncftp)/usr/bin/ncftp ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir ncftp)/usr/bin/ncftpbatch ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir ncftp)/usr/bin/ncftpget ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir ncftp)/usr/bin/ncftpls ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir ncftp)/usr/bin/ncftpput ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # ngrep - cp -P $(get_install_dir ngrep)/usr/bin/ngrep $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir ngrep)/usr/bin/ngrep ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # nmap - cp -P $(get_install_dir nmap)/usr/bin/nmap $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir nmap)/usr/bin/nmap ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # rar2fs - cp -P $(get_install_dir rar2fs)/usr/bin/mkr2i $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir rar2fs)/usr/bin/rar2fs $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir rar2fs)/usr/bin/mkr2i ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir rar2fs)/usr/bin/rar2fs ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # rsync - cp -P $(get_install_dir rsync)/usr/bin/rsync $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir rsync)/usr/bin/rsync ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # sshfs - cp -P $(get_install_dir sshfs)/usr/bin/sshfs $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir sshfs)/usr/bin/sshfs ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # tcpdump - cp -P $(get_install_dir tcpdump)/usr/bin/tcpdump $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir tcpdump)/usr/bin/tcpdump ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # udpxy - cp -P $(get_install_dir udpxy)/usr/bin/udpxy $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir udpxy)/usr/bin/udpxy ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # wireless_tools - cp -P $(get_install_dir wireless_tools)/usr/sbin/iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin - ln -s iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin/iwgetid - ln -s iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin/iwlist - ln -s iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin/iwspy - ln -s iwconfig $ADDON_BUILD/$PKG_ADDON_ID/bin/iwpriv + cp -P $(get_install_dir wireless_tools)/usr/sbin/iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwgetid + ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwlist + ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwspy + ln -s iwconfig ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/iwpriv } diff --git a/packages/addons/tools/rpi-tools/package.mk b/packages/addons/tools/rpi-tools/package.mk index 8bebe66d6e..44b7517b6c 100644 --- a/packages/addons/tools/rpi-tools/package.mk +++ b/packages/addons/tools/rpi-tools/package.mk @@ -21,10 +21,10 @@ PKG_ADDON_PROJECTS="RPi ARM" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/RPi/ - cp -PR $(get_build_dir RPi.GPIO)/build/lib.linux-*/RPi/* $ADDON_BUILD/$PKG_ADDON_ID/lib/RPi - cp -PR $(get_build_dir gpiozero)/gpiozero $ADDON_BUILD/$PKG_ADDON_ID/lib/ + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/RPi/ + cp -PR $(get_build_dir RPi.GPIO)/build/lib.linux-*/RPi/* ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/RPi + cp -PR $(get_build_dir gpiozero)/gpiozero ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/ - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ - cp -P $(get_build_dir lan951x-led-ctl)/lan951x-led-ctl $ADDON_BUILD/$PKG_ADDON_ID/bin + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ + cp -P $(get_build_dir lan951x-led-ctl)/lan951x-led-ctl ${ADDON_BUILD}/${PKG_ADDON_ID}/bin } diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk index 62d806989d..555b309196 100644 --- a/packages/addons/tools/system-tools/package.mk +++ b/packages/addons/tools/system-tools/package.mk @@ -50,117 +50,117 @@ PKG_DEPENDS_TARGET="toolchain \ usb-modeswitch \ vim" -if [ "$TARGET_ARCH" = "x86_64" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET efibootmgr st" +if [ "${TARGET_ARCH}" = "x86_64" ]; then + PKG_DEPENDS_TARGET+=" efibootmgr st" fi addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/{bin,data,lib} + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,data,lib} # autossh - cp -P $(get_install_dir autossh)/usr/bin/autossh $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir autossh)/usr/bin/autossh ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # diffutils - cp -P $(get_install_dir diffutils)/usr/bin/{cmp,diff,diff3,sdiff} $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir diffutils)/usr/bin/{cmp,diff,diff3,sdiff} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # dstat - cp -P $(get_install_dir dstat)/usr/bin/dstat $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dstat)/usr/bin/dstat ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # dtach - cp -P $(get_install_dir dtach)/usr/bin/dtach $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir dtach)/usr/bin/dtach ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # efibootmgr - cp -P $(get_install_dir efibootmgr)/usr/bin/efibootmgr $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || : + cp -P $(get_install_dir efibootmgr)/usr/bin/efibootmgr ${ADDON_BUILD}/${PKG_ADDON_ID}/bin 2>/dev/null || : # encfs - cp -P $(get_install_dir encfs)/usr/bin/{encfs,encfsctl} $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir encfs)/usr/bin/{encfs,encfsctl} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # evtest - cp -P $(get_install_dir evtest)/usr/bin/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir evtest)/usr/bin/evtest ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # fdupes - cp -P $(get_install_dir fdupes)/usr/bin/fdupes $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir fdupes)/usr/bin/fdupes ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # file - cp -P $(get_install_dir file)/usr/bin/file $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir file)/usr/share/misc/magic.mgc $ADDON_BUILD/$PKG_ADDON_ID/data + cp -P $(get_install_dir file)/usr/bin/file ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir file)/usr/share/misc/magic.mgc ${ADDON_BUILD}/${PKG_ADDON_ID}/data # getscancodes - cp -P $(get_install_dir getscancodes)/usr/bin/getscancodes $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir getscancodes)/usr/bin/getscancodes ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # hddtemp - cp -P $(get_install_dir hddtemp)/usr/sbin/hddtemp $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir hddtemp)/usr/share/misc/hddtemp.db $ADDON_BUILD/$PKG_ADDON_ID/data + cp -P $(get_install_dir hddtemp)/usr/sbin/hddtemp ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir hddtemp)/usr/share/misc/hddtemp.db ${ADDON_BUILD}/${PKG_ADDON_ID}/data # hd-idle - cp -P $(get_install_dir hd-idle)/usr/sbin/hd-idle $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir hd-idle)/usr/sbin/hd-idle ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # hid_mapper - cp -P $(get_install_dir hid_mapper)/usr/bin/hid_mapper $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir hid_mapper)/usr/bin/hid_mapper ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # htop - cp -P $(get_install_dir htop)/usr/bin/htop $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir htop)/usr/bin/htop ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # i2c-tools - 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 + 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 # inotify-tools - cp -P $(get_install_dir inotify-tools)/usr/bin/{inotifywait,inotifywatch} $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir inotify-tools)/usr/bin/{inotifywait,inotifywatch} ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # jq - cp -P $(get_install_dir jq)/usr/bin/jq $ADDON_BUILD/$PKG_ADDON_ID/bin - cp -P $(get_install_dir oniguruma)/usr/lib/{libonig.so,libonig.so.5,libonig.so.5.1.0} $ADDON_BUILD/$PKG_ADDON_ID/lib + cp -P $(get_install_dir jq)/usr/bin/jq ${ADDON_BUILD}/${PKG_ADDON_ID}/bin + cp -P $(get_install_dir oniguruma)/usr/lib/{libonig.so,libonig.so.5,libonig.so.5.1.0} ${ADDON_BUILD}/${PKG_ADDON_ID}/lib # lm_sensors - cp -P $(get_install_dir lm_sensors)/usr/bin/sensors $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || : + cp -P $(get_install_dir lm_sensors)/usr/bin/sensors ${ADDON_BUILD}/${PKG_ADDON_ID}/bin 2>/dev/null || : # lshw - cp -P $(get_install_dir lshw)/usr/sbin/lshw $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir lshw)/usr/sbin/lshw ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # mc - cp -Pa $(get_install_dir mc)/usr/bin/* $ADDON_BUILD/$PKG_ADDON_ID/bin/ - cp -Pa $(get_install_dir mc)/storage/.kodi/addons/virtual.system-tools/* $ADDON_BUILD/$PKG_ADDON_ID + cp -Pa $(get_install_dir mc)/usr/bin/* ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ + cp -Pa $(get_install_dir mc)/storage/.kodi/addons/virtual.system-tools/* ${ADDON_BUILD}/${PKG_ADDON_ID} # mtpfs - cp -P $(get_install_dir mtpfs)/usr/bin/mtpfs $ADDON_BUILD/$PKG_ADDON_ID/bin/ + cp -P $(get_install_dir mtpfs)/usr/bin/mtpfs ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ # nmon - cp -P $(get_install_dir nmon)/usr/bin/nmon $ADDON_BUILD/$PKG_ADDON_ID/bin/ + cp -P $(get_install_dir nmon)/usr/bin/nmon ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/ # p7zip - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/p7zip - cp -P $(get_install_dir p7zip)/usr/bin/{7z,7za,7z.so} $ADDON_BUILD/$PKG_ADDON_ID/lib/p7zip - cp -PR $(get_install_dir p7zip)/usr/bin/Codecs $ADDON_BUILD/$PKG_ADDON_ID/lib/p7zip + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/p7zip + cp -P $(get_install_dir p7zip)/usr/bin/{7z,7za,7z.so} ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/p7zip + cp -PR $(get_install_dir p7zip)/usr/bin/Codecs ${ADDON_BUILD}/${PKG_ADDON_ID}/lib/p7zip # patch - cp -P $(get_install_dir patch)/usr/bin/patch $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir patch)/usr/bin/patch ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # pv - cp -P $(get_install_dir pv)/usr/bin/pv $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir pv)/usr/bin/pv ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # screen - cp -L $(get_install_dir screen)/usr/bin/screen $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -L $(get_install_dir screen)/usr/bin/screen ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # smartmontools - cp -P $(get_install_dir smartmontools)/usr/sbin/smartctl $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir smartmontools)/usr/sbin/smartctl ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # st - cp -P $(get_build_dir st)/st $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || : + cp -P $(get_build_dir st)/st ${ADDON_BUILD}/${PKG_ADDON_ID}/bin 2>/dev/null || : # strace - cp -P $(get_install_dir strace)/usr/bin/strace $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir strace)/usr/bin/strace ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # stress-ng - cp -P $(get_install_dir stress-ng)/usr/bin/stress-ng $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir stress-ng)/usr/bin/stress-ng ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # unrar - cp -P $(get_install_dir unrar)/usr/bin/unrar $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir unrar)/usr/bin/unrar ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # usb-modeswitch - cp -P $(get_install_dir usb-modeswitch)/usr/sbin/usb_modeswitch $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_install_dir usb-modeswitch)/usr/sbin/usb_modeswitch ${ADDON_BUILD}/${PKG_ADDON_ID}/bin # vim - 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 + 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 } From d758cd47284921390ee4292637af76115669a1b0 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:33:42 +0000 Subject: [PATCH 02/27] audio: automated code cleanup Signed-off-by: Ian Leonard --- packages/audio/alsa-lib/package.mk | 10 ++--- packages/audio/alsa-topology-conf/package.mk | 2 +- packages/audio/alsa-ucm-conf/package.mk | 2 +- packages/audio/alsa-utils/package.mk | 20 +++++----- packages/audio/flac/package.mk | 10 ++--- packages/audio/fluidsynth/package.mk | 2 +- packages/audio/lame/package.mk | 2 +- packages/audio/libcdio/package.mk | 4 +- packages/audio/libmodplug/package.mk | 2 +- packages/audio/libogg/package.mk | 2 +- packages/audio/libsamplerate/package.mk | 4 +- packages/audio/libsndfile/package.mk | 4 +- packages/audio/libvorbis/package.mk | 4 +- packages/audio/openal-soft/package.mk | 4 +- packages/audio/pulseaudio/package.mk | 40 ++++++++++---------- packages/audio/rpi-cirrus-config/package.mk | 18 ++++----- packages/audio/sbc/package.mk | 2 +- packages/audio/sidplay-libs/package.mk | 8 ++-- packages/audio/soxr/package.mk | 4 +- packages/audio/speex/package.mk | 2 +- packages/audio/speexdsp/package.mk | 2 +- packages/audio/taglib/package.mk | 14 +++---- 22 files changed, 81 insertions(+), 81 deletions(-) diff --git a/packages/audio/alsa-lib/package.mk b/packages/audio/alsa-lib/package.mk index a69f5636c8..da8dda0bfc 100644 --- a/packages/audio/alsa-lib/package.mk +++ b/packages/audio/alsa-lib/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.2.4" PKG_SHA256="f7554be1a56cdff468b58fc1c29b95b64864c590038dd309c7a978c7116908f7" PKG_LICENSE="GPL" PKG_SITE="http://www.alsa-project.org/" -PKG_URL="ftp://ftp.alsa-project.org/pub/lib/alsa-lib-$PKG_VERSION.tar.bz2" +PKG_URL="ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="ALSA (Advanced Linux Sound Architecture) is the next generation Linux Sound API." PKG_TOOLCHAIN="autotools" @@ -19,7 +19,7 @@ else PKG_ALSA_DEBUG=--without-debug fi -PKG_CONFIGURE_OPTS_TARGET="$PKG_ALSA_DEBUG \ +PKG_CONFIGURE_OPTS_TARGET="${PKG_ALSA_DEBUG} \ --disable-dependency-tracking \ --with-plugindir=/usr/lib/alsa \ --disable-python" @@ -29,10 +29,10 @@ post_configure_target() { } post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin - mkdir -p $INSTALL/usr/config - cp -PR $PKG_DIR/config/modprobe.d $INSTALL/usr/config + mkdir -p ${INSTALL}/usr/config + cp -PR ${PKG_DIR}/config/modprobe.d ${INSTALL}/usr/config } post_install() { diff --git a/packages/audio/alsa-topology-conf/package.mk b/packages/audio/alsa-topology-conf/package.mk index d76b16405e..183ebe3202 100644 --- a/packages/audio/alsa-topology-conf/package.mk +++ b/packages/audio/alsa-topology-conf/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.2.4" PKG_SHA256="55e0e6e42eca4cc7656c257af2440cdc65b83689dca49fc60ca0194db079ed07" PKG_LICENSE="BSD-3c" PKG_SITE="http://www.alsa-project.org/" -PKG_URL="ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-$PKG_VERSION.tar.bz2" +PKG_URL="ftp://ftp.alsa-project.org/pub/lib/alsa-topology-conf-${PKG_VERSION}.tar.bz2" PKG_LONGDESC="ALSA topology configuration files" PKG_TOOLCHAIN="manual" diff --git a/packages/audio/alsa-ucm-conf/package.mk b/packages/audio/alsa-ucm-conf/package.mk index 43268c75a5..32769b3a7d 100644 --- a/packages/audio/alsa-ucm-conf/package.mk +++ b/packages/audio/alsa-ucm-conf/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.2.4" PKG_SHA256="2c3b535c77dcb9aaf62a61f4f8324f1ab184162f105f7ec9ed1e37c742fcd340" PKG_LICENSE="BSD-3c" PKG_SITE="http://www.alsa-project.org/" -PKG_URL="ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-$PKG_VERSION.tar.bz2" +PKG_URL="ftp://ftp.alsa-project.org/pub/lib/alsa-ucm-conf-${PKG_VERSION}.tar.bz2" PKG_LONGDESC="ALSA Use Case Manager configuration (and topologies)" PKG_TOOLCHAIN="manual" diff --git a/packages/audio/alsa-utils/package.mk b/packages/audio/alsa-utils/package.mk index 5e51403f67..aba3c36810 100644 --- a/packages/audio/alsa-utils/package.mk +++ b/packages/audio/alsa-utils/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.2.4" PKG_SHA256="98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426" PKG_LICENSE="GPL" PKG_SITE="http://www.alsa-project.org/" -PKG_URL="ftp://ftp.alsa-project.org/pub/utils/alsa-utils-$PKG_VERSION.tar.bz2" +PKG_URL="ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain alsa-lib ncurses systemd" PKG_LONGDESC="This package includes the utilities for ALSA, like alsamixer, aplay, arecord, alsactl, iecset and speaker-test." @@ -21,20 +21,20 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-alsaconf \ --disable-xmlto" post_makeinstall_target() { - rm -rf $INSTALL/lib $INSTALL/var - rm -rf $INSTALL/usr/share/alsa/speaker-test - rm -rf $INSTALL/usr/share/sounds - rm -rf $INSTALL/usr/lib/systemd/system + rm -rf ${INSTALL}/lib ${INSTALL}/var + rm -rf ${INSTALL}/usr/share/alsa/speaker-test + 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 - rm -rf $INSTALL/usr/lib/udev/rules.d/90-alsa-restore.rules + rm -rf ${INSTALL}/usr/lib/udev/rules.d/90-alsa-restore.rules - mkdir -p $INSTALL/.noinstall + mkdir -p ${INSTALL}/.noinstall for i in aconnect alsamixer amidi aplaymidi arecord arecordmidi aseqdump aseqnet iecset; do - mv $INSTALL/usr/bin/$i $INSTALL/.noinstall + mv ${INSTALL}/usr/bin/${i} ${INSTALL}/.noinstall done - mkdir -p $INSTALL/usr/lib/udev - cp $PKG_DIR/scripts/soundconfig $INSTALL/usr/lib/udev + mkdir -p ${INSTALL}/usr/lib/udev + cp ${PKG_DIR}/scripts/soundconfig ${INSTALL}/usr/lib/udev } diff --git a/packages/audio/flac/package.mk b/packages/audio/flac/package.mk index 54a843115c..551cdfdb19 100644 --- a/packages/audio/flac/package.mk +++ b/packages/audio/flac/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3.3" PKG_SHA256="213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748" PKG_LICENSE="GPLv2" PKG_SITE="https://xiph.org/flac/" -PKG_URL="http://downloads.xiph.org/releases/flac/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://downloads.xiph.org/releases/flac/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libogg" PKG_LONGDESC="An Free Lossless Audio Codec." PKG_TOOLCHAIN="autotools" @@ -24,15 +24,15 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-cpplibs \ --disable-xmms-plugin \ --disable-oggtest \ - --with-ogg=$SYSROOT_PREFIX/usr \ + --with-ogg=${SYSROOT_PREFIX}/usr \ --with-gnu-ld" if target_has_feature sse; then - PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-sse" + PKG_CONFIGURE_OPTS_TARGET+=" --enable-sse" else - PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-sse" + PKG_CONFIGURE_OPTS_TARGET+=" --disable-sse" fi post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/audio/fluidsynth/package.mk b/packages/audio/fluidsynth/package.mk index 628c934934..d56a877982 100644 --- a/packages/audio/fluidsynth/package.mk +++ b/packages/audio/fluidsynth/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.6" PKG_SHA256="d28b47dfbf7f8e426902ae7fa2981d821fbf84f41da9e1b85be933d2d748f601" PKG_LICENSE="GPL" PKG_SITE="http://fluidsynth.org/" -PKG_URL="$SOURCEFORGE_SRC/project/fluidsynth/fluidsynth-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="${SOURCEFORGE_SRC}/project/fluidsynth/fluidsynth-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain glib" PKG_LONGDESC="FluidSynth renders midi music files as raw audio data, for playing or conversion." PKG_BUILD_FLAGS="+pic" diff --git a/packages/audio/lame/package.mk b/packages/audio/lame/package.mk index 192229c267..f15b34b017 100644 --- a/packages/audio/lame/package.mk +++ b/packages/audio/lame/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="3.100" PKG_SHA256="ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e" PKG_LICENSE="LGPL" PKG_SITE="http://lame.sourceforge.net/" -PKG_URL="$SOURCEFORGE_SRC/lame/lame/3.100/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="${SOURCEFORGE_SRC}/lame/lame/3.100/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A high quality MPEG Audio Layer III (MP3) encoder." PKG_BUILD_FLAGS="-parallel +pic" diff --git a/packages/audio/libcdio/package.mk b/packages/audio/libcdio/package.mk index 9a50b688b2..727fb59a09 100644 --- a/packages/audio/libcdio/package.mk +++ b/packages/audio/libcdio/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.1.0" PKG_SHA256="8550e9589dbd594bfac93b81ecf129b1dc9d0d51e90f9696f1b2f9b2af32712b" PKG_LICENSE="GPLv3" PKG_SITE="https://www.gnu.org/software/libcdio/" -PKG_URL="http://ftpmirror.gnu.org/libcdio/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://ftpmirror.gnu.org/libcdio/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A CD-ROM reading and control library." PKG_BUILD_FLAGS="+pic" @@ -32,5 +32,5 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-cxx \ --with-gnu-ld" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/audio/libmodplug/package.mk b/packages/audio/libmodplug/package.mk index ee45fd2725..26651b2503 100644 --- a/packages/audio/libmodplug/package.mk +++ b/packages/audio/libmodplug/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.8.9.0" PKG_SHA256="457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de" PKG_LICENSE="GPL" PKG_SITE="http://modplug-xmms.sourceforge.net/" -PKG_URL="$SOURCEFORGE_SRC/modplug-xmms/libmodplug/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="${SOURCEFORGE_SRC}/modplug-xmms/libmodplug/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="libmodplug renders mod music files as raw audio data, for playing or conversion." PKG_BUILD_FLAGS="+pic" diff --git a/packages/audio/libogg/package.mk b/packages/audio/libogg/package.mk index b99029e84f..e0e1cf4dd1 100644 --- a/packages/audio/libogg/package.mk +++ b/packages/audio/libogg/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3.4" PKG_SHA256="c163bc12bc300c401b6aa35907ac682671ea376f13ae0969a220f7ddf71893fe" PKG_LICENSE="BSD" PKG_SITE="https://www.xiph.org/ogg/" -PKG_URL="http://downloads.xiph.org/releases/ogg/libogg-$PKG_VERSION.tar.xz" +PKG_URL="http://downloads.xiph.org/releases/ogg/libogg-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Libogg contains necessary functionality to create, decode, and work with Ogg bitstreams." PKG_BUILD_FLAGS="+pic" diff --git a/packages/audio/libsamplerate/package.mk b/packages/audio/libsamplerate/package.mk index 75194dc676..092c7c1bd4 100644 --- a/packages/audio/libsamplerate/package.mk +++ b/packages/audio/libsamplerate/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.1.9" PKG_SHA256="0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1" PKG_LICENSE="GPL" PKG_SITE="http://www.mega-nerd.com/SRC/" -PKG_URL="http://www.mega-nerd.com/SRC/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://www.mega-nerd.com/SRC/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A Sample Rate Converter for audio." @@ -19,5 +19,5 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared \ --disable-sndfile" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/audio/libsndfile/package.mk b/packages/audio/libsndfile/package.mk index f213523382..2843bc2108 100644 --- a/packages/audio/libsndfile/package.mk +++ b/packages/audio/libsndfile/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.0.28" PKG_SHA256="1ff33929f042fa333aed1e8923aa628c3ee9e1eb85512686c55092d1e5a9dfa9" PKG_LICENSE="LGPL" PKG_SITE="http://www.mega-nerd.com/libsndfile/" -PKG_URL="http://www.mega-nerd.com/$PKG_NAME/files/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://www.mega-nerd.com/${PKG_NAME}/files/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain alsa-lib" PKG_LONGDESC="A library for accessing various audio file formats." PKG_TOOLCHAIN="configure" @@ -24,5 +24,5 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared \ --with-pic" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/audio/libvorbis/package.mk b/packages/audio/libvorbis/package.mk index 1863c1df02..2b72481931 100644 --- a/packages/audio/libvorbis/package.mk +++ b/packages/audio/libvorbis/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3.7" PKG_SHA256="b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b" PKG_LICENSE="BSD" PKG_SITE="http://www.vorbis.com/" -PKG_URL="http://downloads.xiph.org/releases/vorbis/libvorbis-$PKG_VERSION.tar.xz" +PKG_URL="http://downloads.xiph.org/releases/vorbis/libvorbis-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libogg" PKG_LONGDESC="Lossless audio compression tools using the ogg-vorbis algorithms." PKG_TOOLCHAIN="autotools" @@ -15,7 +15,7 @@ PKG_BUILD_FLAGS="+pic" PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-shared \ - --with-ogg=$SYSROOT_PREFIX/usr \ + --with-ogg=${SYSROOT_PREFIX}/usr \ --disable-docs \ --disable-examples \ --disable-oggtest" diff --git a/packages/audio/openal-soft/package.mk b/packages/audio/openal-soft/package.mk index 1dfc804849..0f73a0549f 100644 --- a/packages/audio/openal-soft/package.mk +++ b/packages/audio/openal-soft/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.21.0" PKG_SHA256="cd3650530866f3906058225f4bfbe0052be19e0a29dcc6df185a460f9948feec" PKG_LICENSE="GPL" PKG_SITE="http://www.openal.org/" -PKG_URL="https://github.com/kcat/openal-soft/archive/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kcat/openal-soft/archive/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain openal-soft:host alsa-lib" PKG_LONGDESC="OpenAL the Open Audio Library" @@ -18,7 +18,7 @@ configure_package() { -DALSOFT_TESTS=off \ -DALSOFT_UTILS=off" - PKG_CMAKE_OPTS_TARGET="-DALSOFT_NATIVE_TOOLS_PATH=$PKG_BUILD/.$HOST_NAME/native-tools/ \ + PKG_CMAKE_OPTS_TARGET="-DALSOFT_NATIVE_TOOLS_PATH=${PKG_BUILD}/.${HOST_NAME}/native-tools/ \ -DALSOFT_BACKEND_OSS=off \ -DALSOFT_BACKEND_WAVE=off \ -DALSOFT_BACKEND_PULSEAUDIO=off \ diff --git a/packages/audio/pulseaudio/package.mk b/packages/audio/pulseaudio/package.mk index d1aa1e45a0..7b6dea28cf 100644 --- a/packages/audio/pulseaudio/package.mk +++ b/packages/audio/pulseaudio/package.mk @@ -7,20 +7,20 @@ PKG_VERSION="14.0" PKG_SHA256="a834775d9382b055504e5ee7625dc50768daac29329531deb6597bf05e06c261" PKG_LICENSE="GPL" PKG_SITE="http://pulseaudio.org/" -PKG_URL="http://www.freedesktop.org/software/pulseaudio/releases/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://www.freedesktop.org/software/pulseaudio/releases/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain alsa-lib dbus libcap libsndfile libtool openssl soxr speexdsp systemd glib:host glib" PKG_LONGDESC="PulseAudio is a sound system for POSIX OSes, meaning that it is a proxy for your sound applications." PKG_TOOLCHAIN="meson" -if [ "$BLUETOOTH_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET sbc" +if [ "${BLUETOOTH_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" sbc" PKG_PULSEAUDIO_BLUETOOTH="-Dbluez5=true" else PKG_PULSEAUDIO_BLUETOOTH="-Dbluez5=false" fi -if [ "$AVAHI_DAEMON" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi" +if [ "${AVAHI_DAEMON}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" avahi" PKG_PULSEAUDIO_AVAHI="-Davahi=enabled" else PKG_PULSEAUDIO_AVAHI="-Davahi=disabled" @@ -41,8 +41,8 @@ PKG_MESON_OPTS_TARGET="-Dgcov=false \ -Dudevrulesdir=/usr/lib/udev/rules.d \ -Dalsa=enabled \ -Dasyncns=disabled \ - $PKG_PULSEAUDIO_AVAHI \ - $PKG_PULSEAUDIO_BLUETOOTH \ + ${PKG_PULSEAUDIO_AVAHI} \ + ${PKG_PULSEAUDIO_BLUETOOTH} \ -Dbluez5-native-headset=false \ -Dbluez5-ofono-headset=false \ -Ddbus=enabled \ @@ -67,25 +67,25 @@ PKG_MESON_OPTS_TARGET="-Dgcov=false \ pre_configure_target() { sed -e 's|; remixing-use-all-sink-channels = yes|; remixing-use-all-sink-channels = no|' \ - -i $PKG_BUILD/src/daemon/daemon.conf.in + -i ${PKG_BUILD}/src/daemon/daemon.conf.in } post_makeinstall_target() { - safe_remove $INSTALL/usr/include - safe_remove $INSTALL/usr/lib/cmake - safe_remove $INSTALL/usr/lib/pkgconfig - safe_remove $INSTALL/usr/lib/systemd - safe_remove $INSTALL/usr/share/vala - safe_remove $INSTALL/usr/share/zsh - safe_remove $INSTALL/usr/share/bash-completion + safe_remove ${INSTALL}/usr/include + safe_remove ${INSTALL}/usr/lib/cmake + safe_remove ${INSTALL}/usr/lib/pkgconfig + safe_remove ${INSTALL}/usr/lib/systemd + safe_remove ${INSTALL}/usr/share/vala + safe_remove ${INSTALL}/usr/share/zsh + safe_remove ${INSTALL}/usr/share/bash-completion - cp $PKG_DIR/config/system.pa $INSTALL/etc/pulse/ - cp $PKG_DIR/config/pulseaudio-system.conf $INSTALL/etc/dbus-1/system.d/ + cp ${PKG_DIR}/config/system.pa ${INSTALL}/etc/pulse/ + cp ${PKG_DIR}/config/pulseaudio-system.conf ${INSTALL}/etc/dbus-1/system.d/ - mkdir -p $INSTALL/usr/config - cp -PR $PKG_DIR/config/pulse-daemon.conf.d $INSTALL/usr/config + mkdir -p ${INSTALL}/usr/config + cp -PR ${PKG_DIR}/config/pulse-daemon.conf.d ${INSTALL}/usr/config - ln -sf /storage/.config/pulse-daemon.conf.d $INSTALL/etc/pulse/daemon.conf.d + ln -sf /storage/.config/pulse-daemon.conf.d ${INSTALL}/etc/pulse/daemon.conf.d } post_install() { diff --git a/packages/audio/rpi-cirrus-config/package.mk b/packages/audio/rpi-cirrus-config/package.mk index d775489fdb..f0f6eccae6 100644 --- a/packages/audio/rpi-cirrus-config/package.mk +++ b/packages/audio/rpi-cirrus-config/package.mk @@ -6,21 +6,21 @@ PKG_VERSION="0.0.2" PKG_SHA256="cc11c47f1f2b6d5e72dcdea828ba57e0dcaf74161f675a4a9f395054f5d82d31" PKG_LICENSE="GPL" PKG_SITE="https://github.com/HiassofT/rpi-cirrus-config" -PKG_URL="https://github.com/HiassofT/rpi-cirrus-config/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/HiassofT/rpi-cirrus-config/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="alsa-utils" PKG_LONGDESC="Config scripts for the Wolfson/Cirrus Logic audio card" PKG_TOOLCHAIN="manual" makeinstall_target() { - mkdir -p $INSTALL/usr/lib/udev - install -m 0755 $PKG_DIR/scripts/rpi-cirrus-config $INSTALL/usr/lib/udev/rpi-cirrus-config + mkdir -p ${INSTALL}/usr/lib/udev + install -m 0755 ${PKG_DIR}/scripts/rpi-cirrus-config ${INSTALL}/usr/lib/udev/rpi-cirrus-config - mkdir -p $INSTALL/usr/share/alsa/cards - cp alsa/RPiCirrus.conf $INSTALL/usr/share/alsa/cards + mkdir -p ${INSTALL}/usr/share/alsa/cards + cp alsa/RPiCirrus.conf ${INSTALL}/usr/share/alsa/cards - mkdir -p $INSTALL/usr/lib/alsa - cp mixer-scripts/rpi-cirrus-functions.sh $INSTALL/usr/lib/alsa + mkdir -p ${INSTALL}/usr/lib/alsa + cp mixer-scripts/rpi-cirrus-functions.sh ${INSTALL}/usr/lib/alsa - mkdir -p $INSTALL/usr/config - cp -PR $PKG_DIR/config/* $INSTALL/usr/config + mkdir -p ${INSTALL}/usr/config + cp -PR ${PKG_DIR}/config/* ${INSTALL}/usr/config } diff --git a/packages/audio/sbc/package.mk b/packages/audio/sbc/package.mk index 769e4d2709..1ce5f02fb1 100644 --- a/packages/audio/sbc/package.mk +++ b/packages/audio/sbc/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.5" PKG_SHA256="51d4e385237e9d4780c7b20e660e30fb6a7a6d75ca069f1ed630fa6105232aba" PKG_LICENSE="GPL" PKG_SITE="http://www.bluez.org/" -PKG_URL="http://www.kernel.org/pub/linux/bluetooth/sbc-$PKG_VERSION.tar.gz" +PKG_URL="http://www.kernel.org/pub/linux/bluetooth/sbc-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="standalone SBC library" PKG_BUILD_FLAGS="+pic" diff --git a/packages/audio/sidplay-libs/package.mk b/packages/audio/sidplay-libs/package.mk index f958ed1c8c..7f98382ec6 100644 --- a/packages/audio/sidplay-libs/package.mk +++ b/packages/audio/sidplay-libs/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="2.1.1" PKG_SHA256="e9a24ada48215a46d2c232a70c5601bc9505e997f120e8f2ba3713e09e28d1f9" PKG_LICENSE="GPL" PKG_SITE="http://sidplay2.sourceforge.net/" -PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://mirrors.xbmc.org/build-deps/sources/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="sidplay-libs" PKG_BUILD_FLAGS="+pic" @@ -15,8 +15,8 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static" pre_configure_target() { # fails to build in subdirs - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} - export CXXFLAGS="$CXXFLAGS -Wno-narrowing" + export CXXFLAGS="${CXXFLAGS} -Wno-narrowing" } diff --git a/packages/audio/soxr/package.mk b/packages/audio/soxr/package.mk index 677ec5c675..847b5df52c 100644 --- a/packages/audio/soxr/package.mk +++ b/packages/audio/soxr/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.1.3" PKG_SHA256="b111c15fdc8c029989330ff559184198c161100a59312f5dc19ddeb9b5a15889" PKG_LICENSE="LGPL" PKG_SITE="https://sourceforge.net/projects/soxr/" -PKG_URL="$SOURCEFORGE_SRC/soxr/soxr-$PKG_VERSION-Source.tar.xz" +PKG_URL="${SOURCEFORGE_SRC}/soxr/soxr-${PKG_VERSION}-Source.tar.xz" PKG_DEPENDS_TARGET="toolchain cmake:host" PKG_LONGDESC="The SoX Resampler library performs one-dimensional sample-rate conversion. It may be used to resample PCM-encoded audio." PKG_BUILD_FLAGS="+pic" @@ -17,7 +17,7 @@ PKG_CMAKE_OPTS_TARGET="-DBUILD_EXAMPLES=OFF \ -DBUILD_TESTS=OFF \ -DWITH_AVFFT=OFF" -if [ "$TARGET_ARCH" = "arm" ]; then +if [ "${TARGET_ARCH}" = "arm" ]; then if target_has_feature neon; then PKG_CMAKE_OPTS_TARGET+=" -DWITH_CR32=OFF" else diff --git a/packages/audio/speex/package.mk b/packages/audio/speex/package.mk index c821495368..22ac83736d 100644 --- a/packages/audio/speex/package.mk +++ b/packages/audio/speex/package.mk @@ -7,6 +7,6 @@ PKG_VERSION="1.2.0" PKG_SHA256="eaae8af0ac742dc7d542c9439ac72f1f385ce838392dc849cae4536af9210094" PKG_LICENSE="BSD" PKG_SITE="https://speex.org" -PKG_URL="http://downloads.us.xiph.org/releases/speex/speex-$PKG_VERSION.tar.gz" +PKG_URL="http://downloads.us.xiph.org/releases/speex/speex-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="An Open Source Software patent-free audio compression format designed for speech." diff --git a/packages/audio/speexdsp/package.mk b/packages/audio/speexdsp/package.mk index 288ba6bb73..18accd9a2c 100644 --- a/packages/audio/speexdsp/package.mk +++ b/packages/audio/speexdsp/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="1.2.0" PKG_SHA256="682042fc6f9bee6294ec453f470dadc26c6ff29b9c9e9ad2ffc1f4312fd64771" PKG_LICENSE="BSD" PKG_SITE="https://speex.org" -PKG_URL="http://downloads.us.xiph.org/releases/speex/speexdsp-$PKG_VERSION.tar.gz" +PKG_URL="http://downloads.us.xiph.org/releases/speex/speexdsp-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Speex audio processing library" diff --git a/packages/audio/taglib/package.mk b/packages/audio/taglib/package.mk index 3f695bcada..244a52fd82 100644 --- a/packages/audio/taglib/package.mk +++ b/packages/audio/taglib/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.11.1" PKG_SHA256="b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b" PKG_LICENSE="LGPL" PKG_SITE="http://taglib.github.com/" -PKG_URL="http://taglib.github.io/releases/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://taglib.github.io/releases/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain cmake:host zlib" PKG_LONGDESC="TagLib is a library for reading and editing the meta-data of several popular audio formats." @@ -15,11 +15,11 @@ PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF \ -DWITH_ASF=ON" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin # pkgconf hack - sed -e "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/taglib-config - sed -e "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc - sed -e "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib.pc - sed -e "s:\([':\" ]\)-I/usr:\\1-I$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc - sed -e "s:\([':\" ]\)-L/usr:\\1-L$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/lib/pkgconfig/taglib_c.pc + sed -e "s:\(['=\" ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/taglib-config + sed -e "s:\([':\" ]\)-I/usr:\\1-I${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/lib/pkgconfig/taglib.pc + sed -e "s:\([':\" ]\)-L/usr:\\1-L${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/lib/pkgconfig/taglib.pc + sed -e "s:\([':\" ]\)-I/usr:\\1-I${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/lib/pkgconfig/taglib_c.pc + sed -e "s:\([':\" ]\)-L/usr:\\1-L${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/lib/pkgconfig/taglib_c.pc } From 34142fb3ead9eb2c79d594a13250e112bedfdedb Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:33:43 +0000 Subject: [PATCH 03/27] compress: automated code cleanup Signed-off-by: Ian Leonard --- packages/compress/bzip2/package.mk | 32 ++++++++++++------------- packages/compress/libarchive/package.mk | 6 ++--- packages/compress/lz4/package.mk | 6 ++--- packages/compress/lzo/package.mk | 4 ++-- packages/compress/p7zip/package.mk | 30 +++++++++++------------ packages/compress/pigz/package.mk | 2 +- packages/compress/xz/package.mk | 4 ++-- packages/compress/zip/package.mk | 10 ++++---- packages/compress/zlib/package.mk | 2 +- 9 files changed, 48 insertions(+), 48 deletions(-) diff --git a/packages/compress/bzip2/package.mk b/packages/compress/bzip2/package.mk index 4767dec9ab..ac9ac5d3ff 100644 --- a/packages/compress/bzip2/package.mk +++ b/packages/compress/bzip2/package.mk @@ -14,31 +14,31 @@ PKG_LONGDESC="A high-quality bzip2 data compressor." PKG_BUILD_FLAGS="+pic +pic:host" pre_build_host() { - mkdir -p $PKG_BUILD/.$HOST_NAME - cp -r $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME + mkdir -p ${PKG_BUILD}/.${HOST_NAME} + cp -r ${PKG_BUILD}/* ${PKG_BUILD}/.${HOST_NAME} } make_host() { - cd $PKG_BUILD/.$HOST_NAME - make -f Makefile-libbz2_so CC=$HOST_CC CFLAGS="$CFLAGS" + cd ${PKG_BUILD}/.${HOST_NAME} + make -f Makefile-libbz2_so CC=${HOST_CC} CFLAGS="${CFLAGS}" } makeinstall_host() { - make install PREFIX=$TOOLCHAIN + make install PREFIX=${TOOLCHAIN} } pre_build_target() { - mkdir -p $PKG_BUILD/.$TARGET_NAME - cp -r $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME + mkdir -p ${PKG_BUILD}/.${TARGET_NAME} + cp -r ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME} } pre_make_target() { - cd $PKG_BUILD/.$TARGET_NAME - sed -e "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$PKG_VERSION libbz2.so,g" -i Makefile-libbz2_so + cd ${PKG_BUILD}/.${TARGET_NAME} + sed -e "s,ln -s (lib.*),ln -snf \$${1}; ln -snf libbz2.so.${PKG_VERSION} libbz2.so,g" -i Makefile-libbz2_so } make_target() { - make -f Makefile-libbz2_so CC=$CC CFLAGS="$CFLAGS" + make -f Makefile-libbz2_so CC=${CC} CFLAGS="${CFLAGS}" } post_make_target() { @@ -46,11 +46,11 @@ post_make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/include - cp bzlib.h $SYSROOT_PREFIX/usr/include - mkdir -p $SYSROOT_PREFIX/usr/lib - cp -P libbz2.so* $SYSROOT_PREFIX/usr/lib + mkdir -p ${SYSROOT_PREFIX}/usr/include + cp bzlib.h ${SYSROOT_PREFIX}/usr/include + mkdir -p ${SYSROOT_PREFIX}/usr/lib + cp -P libbz2.so* ${SYSROOT_PREFIX}/usr/lib - mkdir -p $INSTALL/usr/lib - cp -P libbz2.so* $INSTALL/usr/lib + mkdir -p ${INSTALL}/usr/lib + cp -P libbz2.so* ${INSTALL}/usr/lib } diff --git a/packages/compress/libarchive/package.mk b/packages/compress/libarchive/package.mk index bc76394443..31e05445f6 100644 --- a/packages/compress/libarchive/package.mk +++ b/packages/compress/libarchive/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="3.5.1" PKG_SHA256="0e17d3a8d0b206018693b27f08029b598f6ef03600c2b5d10c94ce58692e299b" PKG_LICENSE="GPL" PKG_SITE="https://www.libarchive.org" -PKG_URL="https://www.libarchive.org/downloads/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://www.libarchive.org/downloads/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain" PKG_SHORTDESC="A multi-format archive and compression library." @@ -21,8 +21,8 @@ PKG_CMAKE_OPTS_TARGET="-DCMAKE_POSITION_INDEPENDENT_CODE=1 \ -DENABLE_WERROR=0" post_makeinstall_target() { - rm -rf $INSTALL + rm -rf ${INSTALL} # delete the shared library as we only want static - rm $SYSROOT_PREFIX/usr/lib/libarchive.so* + rm ${SYSROOT_PREFIX}/usr/lib/libarchive.so* } diff --git a/packages/compress/lz4/package.mk b/packages/compress/lz4/package.mk index c1729c88dc..bcc4b79aa2 100644 --- a/packages/compress/lz4/package.mk +++ b/packages/compress/lz4/package.mk @@ -6,18 +6,18 @@ PKG_VERSION="1.9.3" PKG_SHA256="030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1" PKG_LICENSE="GPL" PKG_SITE="https://github.com/lz4/lz4" -PKG_URL="https://github.com/lz4/lz4/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/lz4/lz4/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="lz4 data compressor/decompressor" PKG_TOOLCHAIN="cmake" configure_package() { - PKG_CMAKE_SCRIPT="$PKG_BUILD/build/cmake/CMakeLists.txt" + PKG_CMAKE_SCRIPT="${PKG_BUILD}/build/cmake/CMakeLists.txt" PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=0 -DCMAKE_POSITION_INDEPENDENT_CODE=0" } post_makeinstall_target() { - rm -rf $INSTALL + rm -rf ${INSTALL} } diff --git a/packages/compress/lzo/package.mk b/packages/compress/lzo/package.mk index 87f52fe1a8..dc0ed3bb7f 100644 --- a/packages/compress/lzo/package.mk +++ b/packages/compress/lzo/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="2.10" PKG_SHA256="c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072" PKG_LICENSE="GPL" PKG_SITE="http://www.oberhumer.com/opensource/lzo" -PKG_URL="http://www.oberhumer.com/opensource/lzo/download/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://www.oberhumer.com/opensource/lzo/download/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A data compression library which is suitable for data de-/compression." @@ -16,5 +16,5 @@ PKG_CMAKE_OPTS_HOST="-DENABLE_SHARED=OFF -DENABLE_STATIC=ON" PKG_CMAKE_OPTS_TARGET="-DENABLE_SHARED=OFF -DENABLE_STATIC=ON" post_makeinstall_target() { - rm -rf $INSTALL/usr/libexec + rm -rf ${INSTALL}/usr/libexec } diff --git a/packages/compress/p7zip/package.mk b/packages/compress/p7zip/package.mk index 2a78613249..3a539ceb5e 100644 --- a/packages/compress/p7zip/package.mk +++ b/packages/compress/p7zip/package.mk @@ -13,34 +13,34 @@ PKG_LONGDESC="p7zip is a port of 7za.exe for POSIX systems like Unix." PKG_TOOLCHAIN="manual" pre_build_host() { - rm -fr $PKG_BUILD/.$HOST_NAME - mkdir -p $PKG_BUILD/.$HOST_NAME - cp -RP $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME + rm -fr ${PKG_BUILD}/.${HOST_NAME} + mkdir -p ${PKG_BUILD}/.${HOST_NAME} + cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${HOST_NAME} } make_host() { - make CXX=$CXX CC=$CC -C $PKG_BUILD/.$HOST_NAME 7za + make CXX=${CXX} CC=${CC} -C ${PKG_BUILD}/.${HOST_NAME} 7za } makeinstall_host() { - mkdir -p $TOOLCHAIN/bin - cp $PKG_BUILD/.$HOST_NAME/bin/7za $TOOLCHAIN/bin + mkdir -p ${TOOLCHAIN}/bin + cp ${PKG_BUILD}/.${HOST_NAME}/bin/7za ${TOOLCHAIN}/bin } pre_build_target() { - rm -fr $PKG_BUILD/.$TARGET_NAME - mkdir -p $PKG_BUILD/.$TARGET_NAME - cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME + rm -fr ${PKG_BUILD}/.${TARGET_NAME} + mkdir -p ${PKG_BUILD}/.${TARGET_NAME} + cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME} } make_target() { - make CXX=$CXX CC=$CC -C $PKG_BUILD/.$TARGET_NAME 7z 7za + make CXX=${CXX} CC=${CC} -C ${PKG_BUILD}/.${TARGET_NAME} 7z 7za } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -p $PKG_BUILD/.$TARGET_NAME/bin/7z.so $INSTALL/usr/bin - cp -pr $PKG_BUILD/.$TARGET_NAME/bin/Codecs $INSTALL/usr/bin - cp -p $PKG_BUILD/.$TARGET_NAME/bin/7z $INSTALL/usr/bin - cp -p $PKG_BUILD/.$TARGET_NAME/bin/7za $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -p ${PKG_BUILD}/.${TARGET_NAME}/bin/7z.so ${INSTALL}/usr/bin + cp -pr ${PKG_BUILD}/.${TARGET_NAME}/bin/Codecs ${INSTALL}/usr/bin + cp -p ${PKG_BUILD}/.${TARGET_NAME}/bin/7z ${INSTALL}/usr/bin + cp -p ${PKG_BUILD}/.${TARGET_NAME}/bin/7za ${INSTALL}/usr/bin } diff --git a/packages/compress/pigz/package.mk b/packages/compress/pigz/package.mk index 4196cda0d7..738e3fbb17 100644 --- a/packages/compress/pigz/package.mk +++ b/packages/compress/pigz/package.mk @@ -20,6 +20,6 @@ make_host() { } makeinstall_host() { - mkdir -p $TOOLCHAIN/bin + mkdir -p ${TOOLCHAIN}/bin cp pigz ${TOOLCHAIN}/bin } diff --git a/packages/compress/xz/package.mk b/packages/compress/xz/package.mk index a1f7dff346..41b48c1acd 100644 --- a/packages/compress/xz/package.mk +++ b/packages/compress/xz/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="5.2.5" PKG_SHA256="5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df" PKG_LICENSE="GPL" PKG_SITE="http://tukaani.org/xz/" -PKG_URL="http://tukaani.org/xz/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://tukaani.org/xz/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_HOST="ccache:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A free general-purpose data compression software with high compression ratio." @@ -25,5 +25,5 @@ PKG_CONFIGURE_OPTS_HOST="--disable-shared --enable-static \ PKG_CONFIGURE_OPTS_TARGET="--disable-shared --enable-static" post_makeinstall_target() { - rm -rf $INSTALL + rm -rf ${INSTALL} } diff --git a/packages/compress/zip/package.mk b/packages/compress/zip/package.mk index 3e16fbfcc3..7f2204afd5 100644 --- a/packages/compress/zip/package.mk +++ b/packages/compress/zip/package.mk @@ -6,18 +6,18 @@ PKG_VERSION="3.0" PKG_SHA256="f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369" PKG_LICENSE="Info-ZIP" PKG_SITE="http://www.info-zip.org/pub/infozip/" -PKG_URL="$SOURCEFORGE_SRC/infozip/Zip%203.x%20%28latest%29/3.0/${PKG_NAME}${PKG_VERSION/./}.tar.gz" +PKG_URL="${SOURCEFORGE_SRC}/infozip/Zip%203.x%20%28latest%29/3.0/${PKG_NAME}${PKG_VERSION/./}.tar.gz" PKG_DEPENDS_TARGET="toolchain bzip2" PKG_LONGDESC="A compression and file packaging utility." PKG_TOOLCHAIN="manual" make_target() { - make CC=$CC CPP=$CPP RANLIB=$RANLIB AR=$AR STRIP=$STRIP LOCAL_ZIP="$CFLAGS" \ + make CC=${CC} CPP=${CPP} RANLIB=${RANLIB} AR=${AR} STRIP=${STRIP} LOCAL_ZIP="${CFLAGS}" \ -f unix/Makefile generic } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp zip $INSTALL/usr/bin - $STRIP $INSTALL/usr/bin/zip + mkdir -p ${INSTALL}/usr/bin + cp zip ${INSTALL}/usr/bin + ${STRIP} ${INSTALL}/usr/bin/zip } diff --git a/packages/compress/zlib/package.mk b/packages/compress/zlib/package.mk index 7a86e767b7..f39e64dee8 100644 --- a/packages/compress/zlib/package.mk +++ b/packages/compress/zlib/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.2.11" PKG_SHA256="4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066" PKG_LICENSE="OSS" PKG_SITE="http://www.zlib.net" -PKG_URL="http://zlib.net/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://zlib.net/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="cmake:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A general purpose (ZIP) data compression library." From 7a107279da1c8b441954ef4d59a9aa7ede0aa140 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:33:44 +0000 Subject: [PATCH 04/27] databases: automated code cleanup Signed-off-by: Ian Leonard --- packages/databases/mariadb-connector-c/package.mk | 4 ++-- packages/databases/sqlite/package.mk | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/databases/mariadb-connector-c/package.mk b/packages/databases/mariadb-connector-c/package.mk index 9e9e1d273c..020aab3d7c 100644 --- a/packages/databases/mariadb-connector-c/package.mk +++ b/packages/databases/mariadb-connector-c/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="3.1.11" PKG_SHA256="2cd769afea447231588580234523121268eae7576f75a7bee25a7e6ec04282f8" PKG_LICENSE="LGPL" PKG_SITE="https://mariadb.org/" -PKG_URL="https://github.com/MariaDB/mariadb-connector-c/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/MariaDB/mariadb-connector-c/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain zlib openssl" PKG_LONGDESC="mariadb-connector: library to conntect to mariadb/mysql database server" PKG_BUILD_FLAGS="-gold" @@ -20,5 +20,5 @@ PKG_CMAKE_OPTS_TARGET="-DWITH_EXTERNAL_ZLIB=ON post_makeinstall_target() { # drop all unneeded - rm -rf $INSTALL/usr + rm -rf ${INSTALL}/usr } diff --git a/packages/databases/sqlite/package.mk b/packages/databases/sqlite/package.mk index 55178cceaf..15c78baa5d 100644 --- a/packages/databases/sqlite/package.mk +++ b/packages/databases/sqlite/package.mk @@ -23,15 +23,15 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-static \ pre_configure_target() { # 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"` + 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. - CFLAGS="$CFLAGS -DSQLITE_ENABLE_STAT4" + 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 @@ -43,7 +43,7 @@ pre_configure_target() { # - sqlite3_column_origin_name() # - sqlite3_column_origin_name16() # - sqlite3_table_column_metadata() - CFLAGS="$CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1" + 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 @@ -51,5 +51,5 @@ pre_configure_target() { # 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="$CFLAGS -DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_MMAP_SIZE=268435456" + CFLAGS+=" -DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_MMAP_SIZE=268435456" } From 02d5330409810a2bbc60b4c83eebea4c90f89bb2 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:33:44 +0000 Subject: [PATCH 05/27] debug: automated code cleanup Signed-off-by: Ian Leonard --- packages/debug/edid-decode/package.mk | 10 +++++----- packages/debug/gdb/package.mk | 10 +++++----- packages/debug/libunwind/package.mk | 2 +- packages/debug/libva-utils/package.mk | 6 +++--- packages/debug/memtester/package.mk | 4 ++-- packages/debug/vadumpcaps/package.mk | 6 +++--- packages/debug/valgrind/package.mk | 6 +++--- packages/debug/vdpauinfo/package.mk | 2 +- packages/debug/xorg-intel-gpu-tools/package.mk | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/debug/edid-decode/package.mk b/packages/debug/edid-decode/package.mk index ab20880272..d3263f68f1 100644 --- a/packages/debug/edid-decode/package.mk +++ b/packages/debug/edid-decode/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="15df4aebf06da579241c58949493b866139d0e2b" PKG_SHA256="58743c8ba768134ef1421e1ce9f4edf0eafdae29377fe5b8f4cb285f16dc142e" PKG_LICENSE="None" PKG_SITE="https://git.linuxtv.org/edid-decode.git/" -PKG_URL="https://git.linuxtv.org/edid-decode.git/snapshot/$PKG_VERSION.tar.xz" +PKG_URL="https://git.linuxtv.org/edid-decode.git/snapshot/${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Decode EDID data in human-readable format" make_target() { - echo "$CC $CFLAGS -Wall $LDFLAGS -o edid-decode edid-decode.c -lm" - $CC $CFLAGS -Wall $LDFLAGS -o edid-decode edid-decode.c -lm + echo "${CC} ${CFLAGS} -Wall ${LDFLAGS} -o edid-decode edid-decode.c -lm" + ${CC} ${CFLAGS} -Wall ${LDFLAGS} -o edid-decode edid-decode.c -lm } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp edid-decode $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp edid-decode ${INSTALL}/usr/bin } diff --git a/packages/debug/gdb/package.mk b/packages/debug/gdb/package.mk index 4828267623..adaa370db2 100644 --- a/packages/debug/gdb/package.mk +++ b/packages/debug/gdb/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="10.1" PKG_SHA256="f82f1eceeec14a3afa2de8d9b0d3c91d5a3820e23e0a01bbb70ef9f0276b62c0" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/gdb/" -PKG_URL="https://ftp.gnu.org/gnu/gdb/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://ftp.gnu.org/gnu/gdb/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain zlib ncurses expat" PKG_DEPENDS_HOST="toolchain:host zlib:host ncurses:host expat:host" PKG_LONGDESC="GNU Project debugger, allows you to see what is going on inside another program while it executes." @@ -43,14 +43,14 @@ PKG_CONFIGURE_OPTS_HOST="${PKG_CONFIGURE_OPTS_COMMON} \ --target=${TARGET_NAME}" pre_configure_target() { - CC_FOR_BUILD="$HOST_CC" - CFLAGS_FOR_BUILD="$HOST_CFLAGS" + CC_FOR_BUILD="${HOST_CC}" + CFLAGS_FOR_BUILD="${HOST_CFLAGS}" } makeinstall_target() { - make DESTDIR=$INSTALL install + make DESTDIR=${INSTALL} install } post_makeinstall_target() { - rm -rf $INSTALL/usr/share/gdb/python + rm -rf ${INSTALL}/usr/share/gdb/python } diff --git a/packages/debug/libunwind/package.mk b/packages/debug/libunwind/package.mk index 7faae4cdf2..e45a6864ac 100644 --- a/packages/debug/libunwind/package.mk +++ b/packages/debug/libunwind/package.mk @@ -18,5 +18,5 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-tests" makeinstall_target() { - make DESTDIR=$SYSROOT_PREFIX install + make DESTDIR=${SYSROOT_PREFIX} install } diff --git a/packages/debug/libva-utils/package.mk b/packages/debug/libva-utils/package.mk index a96393a791..8850f31dd5 100644 --- a/packages/debug/libva-utils/package.mk +++ b/packages/debug/libva-utils/package.mk @@ -6,11 +6,11 @@ PKG_VERSION="2.10.0" PKG_SHA256="cbb7f9f6eae21d772e31b67bc8c311be6e35fe9c65e63acc57f9b16d72bf8dc0" PKG_LICENSE="GPL" PKG_SITE="https://github.com/01org/libva-utils" -PKG_URL="https://github.com/intel/libva-utils/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/intel/libva-utils/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Libva-utils is a collection of tests for VA-API (VIdeo Acceleration API)" PKG_TOOLCHAIN="meson" -if [ "$DISPLAYSERVER" = "x11" ]; then +if [ "${DISPLAYSERVER}" = "x11" ]; then PKG_DEPENDS_TARGET="toolchain libva libdrm libX11" DISPLAYSERVER_LIBVA="-Dx11=true" else @@ -19,7 +19,7 @@ else fi PKG_MESON_OPTS_TARGET="-Ddrm=true \ - $DISPLAYSERVER_LIBVA \ + ${DISPLAYSERVER_LIBVA} \ -Dwayland=false \ -Dtests=false" diff --git a/packages/debug/memtester/package.mk b/packages/debug/memtester/package.mk index 41604a7412..399579e7c7 100644 --- a/packages/debug/memtester/package.mk +++ b/packages/debug/memtester/package.mk @@ -16,6 +16,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp memtester $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp memtester ${INSTALL}/usr/bin } diff --git a/packages/debug/vadumpcaps/package.mk b/packages/debug/vadumpcaps/package.mk index bee3fbff41..14fc9bd850 100644 --- a/packages/debug/vadumpcaps/package.mk +++ b/packages/debug/vadumpcaps/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="fb4dfef76c0fa08f853af377d5d4945d5fb3001c" PKG_SHA256="4362084e366ef66dc6bd9336baa570a5b459dade57783b24001b2847818a8b69" PKG_LICENSE="GPL" PKG_SITE="https://github.com/fhvwy/vadumpcaps" -PKG_URL="https://github.com/fhvwy/vadumpcaps/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/fhvwy/vadumpcaps/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="This is a utility to show all capabilities of a VAAPI device/driver." PKG_DEPENDS_TARGET="toolchain libva" PKG_TOOLCHAIN="make" makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp vadumpcaps $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp vadumpcaps ${INSTALL}/usr/bin } diff --git a/packages/debug/valgrind/package.mk b/packages/debug/valgrind/package.mk index eba0afab2f..e9d5b9fb17 100644 --- a/packages/debug/valgrind/package.mk +++ b/packages/debug/valgrind/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="3.16.1" PKG_SHA256="c91f3a2f7b02db0f3bc99479861656154d241d2fdb265614ba918cc6720a33ca" PKG_LICENSE="GPL" PKG_SITE="http://valgrind.org/" -PKG_URL="ftp://sourceware.org/pub/valgrind/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="ftp://sourceware.org/pub/valgrind/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A tool to help find memory-management problems in programs" -if [ "$TARGET_ARCH" = "arm" ]; then +if [ "${TARGET_ARCH}" = "arm" ]; then PKG_CONFIGURE_OPTS_TARGET="--enable-only32bit" -elif [ "$TARGET_ARCH" = "aarch64" -o "$TARGET_ARCH" = "x86_64" ]; then +elif [ "${TARGET_ARCH}" = "aarch64" -o "${TARGET_ARCH}" = "x86_64" ]; then PKG_CONFIGURE_OPTS_TARGET="--enable-only64bit" fi diff --git a/packages/debug/vdpauinfo/package.mk b/packages/debug/vdpauinfo/package.mk index b8725e2164..6e373d1c3f 100644 --- a/packages/debug/vdpauinfo/package.mk +++ b/packages/debug/vdpauinfo/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="1.0" PKG_SHA256="4054960b7ae618c351ff1ce3e7831b5cbda964ae1fbf9969b7146404d3044bc4" PKG_LICENSE="GPL" PKG_SITE="http://freedesktop.org/wiki/Software/VDPAU" -PKG_URL="http://people.freedesktop.org/~aplattner/vdpau/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://people.freedesktop.org/~aplattner/vdpau/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libvdpau" PKG_LONGDESC="A tool to show vdpau infos." diff --git a/packages/debug/xorg-intel-gpu-tools/package.mk b/packages/debug/xorg-intel-gpu-tools/package.mk index 79b453aa8e..9918319e8e 100644 --- a/packages/debug/xorg-intel-gpu-tools/package.mk +++ b/packages/debug/xorg-intel-gpu-tools/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="2257a73d6a5d431dfbea4dec0dae07397b1e3269416049ced978550853616a2b" PKG_LICENSE="GPL" PKG_DEPENDS_TARGET="toolchain cairo procps-ng" PKG_SITE="https://github.com/freedesktop/xorg-intel-gpu-tools" -PKG_URL="https://github.com/freedesktop/xorg-intel-gpu-tools/archive/igt-gpu-tools-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/freedesktop/xorg-intel-gpu-tools/archive/igt-gpu-tools-${PKG_VERSION}.tar.gz" PKG_LONGDESC="Test suite and tools for DRM/KMS drivers" PKG_TOOLCHAIN="meson" From 78440702f112b512e42d62a49d24f046499f7104 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:33:48 +0000 Subject: [PATCH 06/27] devel: automated code cleanup Signed-off-by: Ian Leonard --- packages/devel/arm-mem/package.mk | 22 ++-- packages/devel/attr/package.mk | 14 +-- packages/devel/autoconf-archive/package.mk | 8 +- packages/devel/autoconf/package.mk | 8 +- packages/devel/automake/package.mk | 6 +- packages/devel/binutils/package.mk | 24 ++--- packages/devel/bison/package.mk | 4 +- packages/devel/boost/package.mk | 24 ++--- packages/devel/ccache/package.mk | 22 ++-- packages/devel/configtools/package.mk | 6 +- packages/devel/crossguid/package.mk | 14 +-- packages/devel/dbus-glib/package.mk | 4 +- packages/devel/elfutils/package.mk | 2 +- packages/devel/fakeroot/package.mk | 2 +- packages/devel/flatbuffers/package.mk | 8 +- packages/devel/flex/package.mk | 6 +- packages/devel/fribidi/package.mk | 10 +- packages/devel/gettext/package.mk | 2 +- packages/devel/glib/package.mk | 12 +-- packages/devel/glibc/package.mk | 118 ++++++++++----------- packages/devel/gmp/package.mk | 4 +- packages/devel/gnulib/package.mk | 2 +- packages/devel/heimdal/package.mk | 8 +- packages/devel/intltool/package.mk | 6 +- packages/devel/libaio/package.mk | 8 +- packages/devel/libcap/package.mk | 60 +++++------ packages/devel/libcec/package.mk | 20 ++-- packages/devel/libdaemon/package.mk | 2 +- packages/devel/libffi/package.mk | 4 +- packages/devel/libfmt/package.mk | 2 +- packages/devel/libfstrcmp/package.mk | 6 +- packages/devel/libftdi1/package.mk | 12 +-- packages/devel/libirman/package.mk | 4 +- packages/devel/libplist/package.mk | 2 +- packages/devel/libpthread-stubs/package.mk | 2 +- packages/devel/libtool/package.mk | 6 +- packages/devel/m4/package.mk | 6 +- packages/devel/make/package.mk | 6 +- packages/devel/mpc/package.mk | 8 +- packages/devel/mpfr/package.mk | 10 +- packages/devel/ncurses/package.mk | 10 +- packages/devel/pcre/package.mk | 8 +- packages/devel/pkg-config/package.mk | 6 +- packages/devel/popt/package.mk | 10 +- packages/devel/rapidjson/package.mk | 2 +- packages/devel/readline/package.mk | 4 +- packages/devel/slang/package.mk | 10 +- packages/devel/spdlog/package.mk | 2 +- packages/devel/swig/package.mk | 6 +- packages/devel/yajl/package.mk | 10 +- 50 files changed, 281 insertions(+), 281 deletions(-) diff --git a/packages/devel/arm-mem/package.mk b/packages/devel/arm-mem/package.mk index 5080f48a9d..5836689ad9 100644 --- a/packages/devel/arm-mem/package.mk +++ b/packages/devel/arm-mem/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="93240defef3abba7d42a7420e55ae4f8b90cc99ef16044fdfb8b5820a17e766d" PKG_ARCH="arm" PKG_LICENSE="GPL" PKG_SITE="https://github.com/bavison/arm-mem" -PKG_URL="https://github.com/bavison/arm-mem/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/bavison/arm-mem/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_INIT="toolchain arm-mem" PKG_LONGDESC="arm-mem is a ARM-accelerated versions of selected functions from string.h" @@ -20,10 +20,10 @@ else PKG_LIB_ARM_MEM="libarmmem-v6l.so" fi -PKG_MAKE_OPTS_TARGET="$PKG_LIB_ARM_MEM" +PKG_MAKE_OPTS_TARGET="${PKG_LIB_ARM_MEM}" pre_make_target() { - export CROSS_COMPILE=$TARGET_PREFIX + export CROSS_COMPILE=${TARGET_PREFIX} } make_init() { @@ -31,17 +31,17 @@ make_init() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib - cp -P $PKG_LIB_ARM_MEM $INSTALL/usr/lib + mkdir -p ${INSTALL}/usr/lib + 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 + mkdir -p ${INSTALL}/etc + echo "/usr/lib/${PKG_LIB_ARM_MEM}" >> ${INSTALL}/etc/ld.so.preload } makeinstall_init() { - mkdir -p $INSTALL/usr/lib - cp -P $PKG_LIB_ARM_MEM $INSTALL/usr/lib + mkdir -p ${INSTALL}/usr/lib + 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 + mkdir -p ${INSTALL}/etc + echo "/usr/lib/${PKG_LIB_ARM_MEM}" >> ${INSTALL}/etc/ld.so.preload } diff --git a/packages/devel/attr/package.mk b/packages/devel/attr/package.mk index 6efffd49e2..12a624ee91 100644 --- a/packages/devel/attr/package.mk +++ b/packages/devel/attr/package.mk @@ -8,7 +8,7 @@ PKG_VERSION="2.4.48" PKG_SHA256="5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7" PKG_LICENSE="GPL" PKG_SITE="https://savannah.nongnu.org/projects/attr" -PKG_URL="http://download.savannah.nongnu.org/releases/attr/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://download.savannah.nongnu.org/releases/attr/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Extended Attributes Of Filesystem Objects." PKG_BUILD_FLAGS="+pic" @@ -19,15 +19,15 @@ PKG_CONFIGURE_OPTS_TARGET="OPTIMIZER= \ --disable-shared --enable-static" if build_with_debug; then - PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET DEBUG=-DDEBUG" + PKG_CONFIGURE_OPTS_TARGET+=" DEBUG=-DDEBUG" else - PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET DEBUG=-DNDEBUG" + PKG_CONFIGURE_OPTS_TARGET+=" DEBUG=-DNDEBUG" fi makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/ - cp .libs/libattr.a $SYSROOT_PREFIX/usr/lib/ + mkdir -p ${SYSROOT_PREFIX}/usr/lib/ + cp .libs/libattr.a ${SYSROOT_PREFIX}/usr/lib/ - mkdir -p $SYSROOT_PREFIX/usr/include/attr - cp include/*.h $SYSROOT_PREFIX/usr/include/attr + mkdir -p ${SYSROOT_PREFIX}/usr/include/attr + cp include/*.h ${SYSROOT_PREFIX}/usr/include/attr } diff --git a/packages/devel/autoconf-archive/package.mk b/packages/devel/autoconf-archive/package.mk index ce08052263..cfd912670b 100644 --- a/packages/devel/autoconf-archive/package.mk +++ b/packages/devel/autoconf-archive/package.mk @@ -7,16 +7,16 @@ PKG_VERSION="2019.01.06" PKG_SHA256="17195c833098da79de5778ee90948f4c5d90ed1a0cf8391b4ab348e2ec511e3f" PKG_LICENSE="GPL" PKG_SITE="https://www.gnu.org/software/autoconf-archive/" -PKG_URL="http://ftpmirror.gnu.org/autoconf-archive/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftpmirror.gnu.org/autoconf-archive/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host" PKG_LONGDESC="autoconf-archive is an package of m4 macros" -PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME --prefix=$TOOLCHAIN" +PKG_CONFIGURE_OPTS_HOST="--target=${TARGET_NAME} --prefix=${TOOLCHAIN}" makeinstall_host() { # make install - make prefix=$SYSROOT_PREFIX/usr install + make prefix=${SYSROOT_PREFIX}/usr install # remove problematic m4 file - rm -rf $SYSROOT_PREFIX/usr/share/aclocal/ax_prog_cc_for_build.m4 + rm -rf ${SYSROOT_PREFIX}/usr/share/aclocal/ax_prog_cc_for_build.m4 } diff --git a/packages/devel/autoconf/package.mk b/packages/devel/autoconf/package.mk index 5ab7b4b51d..18172507ab 100644 --- a/packages/devel/autoconf/package.mk +++ b/packages/devel/autoconf/package.mk @@ -6,15 +6,15 @@ PKG_VERSION="2.69" PKG_SHA256="64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684" PKG_LICENSE="GPL" PKG_SITE="http://sources.redhat.com/autoconf/" -PKG_URL="http://ftpmirror.gnu.org/autoconf/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftpmirror.gnu.org/autoconf/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host m4:host gettext:host" PKG_LONGDESC="A GNU tool for automatically configuring source code." PKG_CONFIGURE_OPTS_HOST="EMACS=no \ - ac_cv_path_M4=$TOOLCHAIN/bin/m4 \ + ac_cv_path_M4=${TOOLCHAIN}/bin/m4 \ ac_cv_prog_gnu_m4_gnu=no \ - --target=$TARGET_NAME" + --target=${TARGET_NAME}" post_makeinstall_host() { - make prefix=$SYSROOT_PREFIX/usr install + make prefix=${SYSROOT_PREFIX}/usr install } diff --git a/packages/devel/automake/package.mk b/packages/devel/automake/package.mk index 0f371369e6..4b7ccd6a6f 100644 --- a/packages/devel/automake/package.mk +++ b/packages/devel/automake/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="1.15.1" PKG_SHA256="af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf" PKG_LICENSE="GPL" PKG_SITE="http://sources.redhat.com/automake/" -PKG_URL="http://ftpmirror.gnu.org/automake/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftpmirror.gnu.org/automake/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host autoconf:host" PKG_LONGDESC="A GNU tool for automatically creating Makefiles." -PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME --disable-silent-rules" +PKG_CONFIGURE_OPTS_HOST="--target=${TARGET_NAME} --disable-silent-rules" post_makeinstall_host() { - make prefix=$SYSROOT_PREFIX/usr install + make prefix=${SYSROOT_PREFIX}/usr install } diff --git a/packages/devel/binutils/package.mk b/packages/devel/binutils/package.mk index 0bdf46ab00..b730315409 100644 --- a/packages/devel/binutils/package.mk +++ b/packages/devel/binutils/package.mk @@ -7,14 +7,14 @@ PKG_VERSION="2.35.1" PKG_SHA256="3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/binutils/" -PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftp.gnu.org/gnu/binutils/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host bison:host flex:host linux:host" PKG_DEPENDS_TARGET="toolchain zlib binutils:host" PKG_LONGDESC="A GNU collection of binary utilities." -PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \ - --with-sysroot=$SYSROOT_PREFIX \ - --with-lib-path=$SYSROOT_PREFIX/lib:$SYSROOT_PREFIX/usr/lib \ +PKG_CONFIGURE_OPTS_HOST="--target=${TARGET_NAME} \ + --with-sysroot=${SYSROOT_PREFIX} \ + --with-lib-path=${SYSROOT_PREFIX}/lib:${SYSROOT_PREFIX}/usr/lib \ --without-ppl \ --without-cloog \ --disable-werror \ @@ -28,9 +28,9 @@ PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \ --enable-lto \ --disable-nls" -PKG_CONFIGURE_OPTS_TARGET="--target=$TARGET_NAME \ - --with-sysroot=$SYSROOT_PREFIX \ - --with-lib-path=$SYSROOT_PREFIX/lib:$SYSROOT_PREFIX/usr/lib \ +PKG_CONFIGURE_OPTS_TARGET="--target=${TARGET_NAME} \ + --with-sysroot=${SYSROOT_PREFIX} \ + --with-lib-path=${SYSROOT_PREFIX}/lib:${SYSROOT_PREFIX}/usr/lib \ --with-system-zlib \ --without-ppl \ --without-cloog \ @@ -59,7 +59,7 @@ make_host() { } makeinstall_host() { - cp -v ../include/libiberty.h $SYSROOT_PREFIX/usr/include + cp -v ../include/libiberty.h ${SYSROOT_PREFIX}/usr/include make install } @@ -72,10 +72,10 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib - cp libiberty/libiberty.a $SYSROOT_PREFIX/usr/lib - make DESTDIR="$SYSROOT_PREFIX" -C bfd install - make DESTDIR="$SYSROOT_PREFIX" -C opcodes install + mkdir -p ${SYSROOT_PREFIX}/usr/lib + cp libiberty/libiberty.a ${SYSROOT_PREFIX}/usr/lib + make DESTDIR="${SYSROOT_PREFIX}" -C bfd install + make DESTDIR="${SYSROOT_PREFIX}" -C opcodes install mkdir -p ${INSTALL}/usr/bin cp binutils/strings ${INSTALL}/usr/bin diff --git a/packages/devel/bison/package.mk b/packages/devel/bison/package.mk index 65a0504743..4afde171f2 100644 --- a/packages/devel/bison/package.mk +++ b/packages/devel/bison/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="3.7.4" PKG_SHA256="a3b5813f48a11e540ef26f46e4d288c0c25c7907d9879ae50e430ec49f63c010" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/bison/" -PKG_URL="http://ftpmirror.gnu.org/bison/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftpmirror.gnu.org/bison/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host m4:host" PKG_LONGDESC="A general-purpose parser generator." PKG_BUILD_FLAGS="-parallel" @@ -17,6 +17,6 @@ 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: +# ${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 730ba69273..33bfb25f2d 100644 --- a/packages/devel/boost/package.mk +++ b/packages/devel/boost/package.mk @@ -20,31 +20,31 @@ make_host() { } makeinstall_host() { - mkdir -p $TOOLCHAIN/bin - cp bjam $TOOLCHAIN/bin + mkdir -p ${TOOLCHAIN}/bin + cp bjam ${TOOLCHAIN}/bin } pre_configure_target() { - export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/$PKG_PYTHON_VERSION" - export CXXFLAGS="$CXXFLAGS -I$SYSROOT_PREFIX/usr/include/$PKG_PYTHON_VERSION" + export CFLAGS="${CFLAGS} -I${SYSROOT_PREFIX}/usr/include/${PKG_PYTHON_VERSION}" + export CXXFLAGS="${CXXFLAGS} -I${SYSROOT_PREFIX}/usr/include/${PKG_PYTHON_VERSION}" } configure_target() { sh bootstrap.sh --prefix=/usr \ - --with-bjam=$TOOLCHAIN/bin/bjam \ - --with-python=$TOOLCHAIN/bin/python \ - --with-python-root=$SYSROOT_PREFIX/usr + --with-bjam=${TOOLCHAIN}/bin/bjam \ + --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 : \"$CFLAGS\" \"$LDFLAGS\" ;" \ + echo "using gcc : $(${CC} -v 2>&1 | tail -n 1 |awk '{print $3}') : ${CC} : \"${CFLAGS}\" \"${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 } makeinstall_target() { - $TOOLCHAIN/bin/bjam -d2 --ignore-site-config \ + ${TOOLCHAIN}/bin/bjam -d2 --ignore-site-config \ --layout=system \ - --prefix=$SYSROOT_PREFIX/usr \ + --prefix=${SYSROOT_PREFIX}/usr \ --toolset=gcc link=static \ --with-chrono \ --with-date_time \ @@ -52,7 +52,7 @@ makeinstall_target() { --with-iostreams \ --with-python \ --with-random \ - --with-regex -sICU_PATH="$SYSROOT_PREFIX/usr" \ + --with-regex -sICU_PATH="${SYSROOT_PREFIX}/usr" \ --with-serialization \ --with-system \ --with-thread \ diff --git a/packages/devel/ccache/package.mk b/packages/devel/ccache/package.mk index 6860d9d193..7ed5c185ec 100644 --- a/packages/devel/ccache/package.mk +++ b/packages/devel/ccache/package.mk @@ -7,34 +7,34 @@ PKG_VERSION="3.7.12" PKG_SHA256="a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400" PKG_LICENSE="GPL" PKG_SITE="https://ccache.dev/download.html" -PKG_URL="https://github.com/ccache/ccache/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://github.com/ccache/ccache/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="make:host" PKG_LONGDESC="A compiler cache to speed up re-compilation of C/C++ code by caching." PKG_CONFIGURE_OPTS_HOST="--with-bundled-zlib" pre_configure_host() { - export CC=$LOCAL_CC - export CXX=$LOCAL_CXX + export CC=${LOCAL_CC} + export CXX=${LOCAL_CXX} } post_makeinstall_host() { # setup ccache - if [ -z "$CCACHE_DISABLE" ]; then - $TOOLCHAIN/bin/ccache --max-size=$CCACHE_CACHE_SIZE + if [ -z "${CCACHE_DISABLE}" ]; then + ${TOOLCHAIN}/bin/ccache --max-size=${CCACHE_CACHE_SIZE} fi - cat > $TOOLCHAIN/bin/host-gcc < ${TOOLCHAIN}/bin/host-gcc < $TOOLCHAIN/bin/host-g++ < ${TOOLCHAIN}/bin/host-g++ < $TOOLCHAIN/bin/lex << "EOF" + cat > ${TOOLCHAIN}/bin/lex << "EOF" #!/bin/sh exec flex "$@" EOF - chmod -v 755 $TOOLCHAIN/bin/lex + chmod -v 755 ${TOOLCHAIN}/bin/lex } diff --git a/packages/devel/fribidi/package.mk b/packages/devel/fribidi/package.mk index e0352c8c18..9b86b4531b 100644 --- a/packages/devel/fribidi/package.mk +++ b/packages/devel/fribidi/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.0.10" PKG_SHA256="7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01" PKG_LICENSE="LGPL" PKG_SITE="http://fribidi.freedesktop.org/" -PKG_URL="https://github.com/fribidi/fribidi/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://github.com/fribidi/fribidi/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A bidirectional algorithm library." PKG_TOOLCHAIN="meson" @@ -18,9 +18,9 @@ PKG_MESON_OPTS_TARGET="-Ddeprecated=false \ -Ddefault_library=static" post_makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/bin - cp -f $PKG_DIR/scripts/fribidi-config $SYSROOT_PREFIX/usr/bin - chmod +x $SYSROOT_PREFIX/usr/bin/fribidi-config + mkdir -p ${SYSROOT_PREFIX}/usr/bin + cp -f ${PKG_DIR}/scripts/fribidi-config ${SYSROOT_PREFIX}/usr/bin + chmod +x ${SYSROOT_PREFIX}/usr/bin/fribidi-config - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/devel/gettext/package.mk b/packages/devel/gettext/package.mk index 2e256fbaee..f98b53ad81 100644 --- a/packages/devel/gettext/package.mk +++ b/packages/devel/gettext/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.21" PKG_SHA256="d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/s/gettext/" -PKG_URL="http://ftp.gnu.org/pub/gnu/gettext/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftp.gnu.org/pub/gnu/gettext/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A program internationalization library and tools." diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk index 478cfc5d7d..c157de8206 100644 --- a/packages/devel/glib/package.mk +++ b/packages/devel/glib/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.67.2" PKG_SHA256="b41d42d6c572e1e420ffc38a077e0157e0b53b5a94c9647a3dc3701043c3b69b" PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" -PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/$(get_pkg_version_maj_min)/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="libffi:host Python3:host meson:host ninja:host" PKG_DEPENDS_TARGET="toolchain pcre zlib libffi Python3:host util-linux" PKG_LONGDESC="A library which includes support routines for C such as lists, trees, hashes, memory allocation." @@ -40,9 +40,9 @@ growing_stack=false va_val_copy=false" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin - rm -rf $INSTALL/usr/lib/gdbus-2.0 - rm -rf $INSTALL/usr/lib/glib-2.0 - rm -rf $INSTALL/usr/lib/installed-tests - rm -rf $INSTALL/usr/share + rm -rf ${INSTALL}/usr/bin + rm -rf ${INSTALL}/usr/lib/gdbus-2.0 + rm -rf ${INSTALL}/usr/lib/glib-2.0 + rm -rf ${INSTALL}/usr/lib/installed-tests + rm -rf ${INSTALL}/usr/share } diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk index 68b2ec98dd..bd0da7d7fc 100644 --- a/packages/devel/glibc/package.mk +++ b/packages/devel/glibc/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.32" PKG_SHA256="1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/libc/" -PKG_URL="http://ftp.gnu.org/pub/gnu/glibc/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftp.gnu.org/pub/gnu/glibc/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="ccache:host autotools:host linux:host gcc:bootstrap pigz:host Python3:host" PKG_DEPENDS_INIT="glibc" PKG_LONGDESC="The Glibc package contains the main C library." @@ -25,8 +25,8 @@ PKG_CONFIGURE_OPTS_TARGET="BASH_SHELL=/bin/sh \ --with-elf \ --with-tls \ --with-__thread \ - --with-binutils=$BUILD/toolchain/bin \ - --with-headers=$SYSROOT_PREFIX/usr/include \ + --with-binutils=${BUILD}/toolchain/bin \ + --with-headers=${SYSROOT_PREFIX}/usr/include \ --enable-kernel=5.4.0 \ --without-cvs \ --without-gd \ @@ -36,9 +36,9 @@ PKG_CONFIGURE_OPTS_TARGET="BASH_SHELL=/bin/sh \ --disable-timezone-tools" if build_with_debug; then - PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-debug" + PKG_CONFIGURE_OPTS_TARGET+=" --enable-debug" else - PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --disable-debug" + PKG_CONFIGURE_OPTS_TARGET+=" --disable-debug" fi post_unpack() { @@ -46,7 +46,7 @@ post_unpack() { } pre_build_target() { - cd $PKG_BUILD + cd ${PKG_BUILD} aclocal --force --verbose autoconf --force --verbose cd - @@ -54,26 +54,26 @@ pre_build_target() { pre_configure_target() { # 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"` + 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") - if [ -n "$PROJECT_CFLAGS" ]; then - export CFLAGS=`echo $CFLAGS | sed -e "s|$PROJECT_CFLAGS||g"` + if [ -n "${PROJECT_CFLAGS}" ]; then + export CFLAGS=$(echo ${CFLAGS} | sed -e "s|${PROJECT_CFLAGS}||g") fi - export LDFLAGS=`echo $LDFLAGS | sed -e "s|-ffast-math||g"` - export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Ofast|-O2|g"` - export LDFLAGS=`echo $LDFLAGS | sed -e "s|-O.|-O2|g"` + export LDFLAGS=$(echo ${LDFLAGS} | sed -e "s|-ffast-math||g") + export LDFLAGS=$(echo ${LDFLAGS} | sed -e "s|-Ofast|-O2|g") + export LDFLAGS=$(echo ${LDFLAGS} | sed -e "s|-O.|-O2|g") - export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` + export LDFLAGS=$(echo ${LDFLAGS} | sed -e "s|-Wl,--as-needed||") unset LD_LIBRARY_PATH # set some CFLAGS we need - export CFLAGS="$CFLAGS -g -fno-stack-protector" + export CFLAGS="${CFLAGS} -g -fno-stack-protector" - export BUILD_CC=$HOST_CC + export BUILD_CC=${HOST_CC} export OBJDUMP_FOR_HOST=objdump cat >config.cache < Date: Tue, 19 Jan 2021 19:33:53 +0000 Subject: [PATCH 07/27] emulation: automated code cleanup Signed-off-by: Ian Leonard --- packages/emulation/cyclone68000/package.mk | 2 +- packages/emulation/libretro-2048/package.mk | 10 ++++---- packages/emulation/libretro-4do/package.mk | 10 ++++---- .../emulation/libretro-atari800/package.mk | 10 ++++---- .../libretro-beetle-bsnes/package.mk | 12 +++++----- .../emulation/libretro-beetle-gba/package.mk | 10 ++++---- .../emulation/libretro-beetle-lynx/package.mk | 10 ++++---- .../emulation/libretro-beetle-ngp/package.mk | 10 ++++---- .../libretro-beetle-pce-fast/package.mk | 10 ++++---- .../emulation/libretro-beetle-pcfx/package.mk | 14 +++++------ .../emulation/libretro-beetle-psx/package.mk | 10 ++++---- .../libretro-beetle-saturn/package.mk | 10 ++++---- .../libretro-beetle-supergrafx/package.mk | 10 ++++---- .../emulation/libretro-beetle-vb/package.mk | 10 ++++---- .../libretro-beetle-wswan/package.mk | 10 ++++---- .../emulation/libretro-bluemsx/package.mk | 10 ++++---- packages/emulation/libretro-bnes/package.mk | 10 ++++---- .../package.mk | 10 ++++---- .../package.mk | 10 ++++---- .../package.mk | 10 ++++---- packages/emulation/libretro-cap32/package.mk | 10 ++++---- .../emulation/libretro-desmume/package.mk | 16 ++++++------- .../emulation/libretro-dinothawr/package.mk | 10 ++++---- .../emulation/libretro-dolphin/package.mk | 14 +++++------ packages/emulation/libretro-dosbox/package.mk | 10 ++++---- .../emulation/libretro-fbalpha/package.mk | 16 ++++++------- packages/emulation/libretro-fceumm/package.mk | 10 ++++---- packages/emulation/libretro-fmsx/package.mk | 10 ++++---- packages/emulation/libretro-fsuae/package.mk | 22 ++++++++--------- packages/emulation/libretro-fuse/package.mk | 10 ++++---- .../emulation/libretro-gambatte/package.mk | 10 ++++---- .../emulation/libretro-genplus/package.mk | 16 ++++++------- packages/emulation/libretro-gw/package.mk | 10 ++++---- packages/emulation/libretro-handy/package.mk | 10 ++++---- packages/emulation/libretro-hatari/package.mk | 12 +++++----- packages/emulation/libretro-mame/package.mk | 16 ++++++------- .../emulation/libretro-mame2000/package.mk | 12 +++++----- .../emulation/libretro-mame2003/package.mk | 12 +++++----- .../libretro-mame2003_plus/package.mk | 12 +++++----- .../emulation/libretro-mame2010/package.mk | 24 +++++++++---------- .../emulation/libretro-mame2016/package.mk | 4 ++-- .../emulation/libretro-melonds/package.mk | 12 +++++----- packages/emulation/libretro-mesen/package.mk | 10 ++++---- packages/emulation/libretro-meteor/package.mk | 14 +++++------ packages/emulation/libretro-mgba/package.mk | 14 +++++------ packages/emulation/libretro-mrboom/package.mk | 10 ++++---- .../emulation/libretro-mupen64plus/package.mk | 22 ++++++++--------- .../emulation/libretro-nestopia/package.mk | 10 ++++---- packages/emulation/libretro-nx/package.mk | 10 ++++---- packages/emulation/libretro-o2em/package.mk | 10 ++++---- .../libretro-pcsx-rearmed/package.mk | 22 ++++++++--------- .../emulation/libretro-picodrive/package.mk | 24 +++++++++---------- .../emulation/libretro-pokemini/package.mk | 12 +++++----- packages/emulation/libretro-ppsspp/package.mk | 14 +++++------ packages/emulation/libretro-prboom/package.mk | 10 ++++---- .../emulation/libretro-prosystem/package.mk | 10 ++++---- .../emulation/libretro-quicknes/package.mk | 10 ++++---- .../emulation/libretro-reicast/package.mk | 16 ++++++------- .../emulation/libretro-sameboy/package.mk | 10 ++++---- .../emulation/libretro-scummvm/package.mk | 14 +++++------ packages/emulation/libretro-snes9x/package.mk | 10 ++++---- .../emulation/libretro-snes9x2002/package.mk | 12 +++++----- .../emulation/libretro-snes9x2010/package.mk | 10 ++++---- packages/emulation/libretro-stella/package.mk | 10 ++++---- .../emulation/libretro-tgbdual/package.mk | 10 ++++---- .../emulation/libretro-tyrquake/package.mk | 10 ++++---- packages/emulation/libretro-uae/package.mk | 16 ++++++------- .../emulation/libretro-uae4arm/package.mk | 14 +++++------ .../emulation/libretro-vba-next/package.mk | 10 ++++---- packages/emulation/libretro-vbam/package.mk | 14 +++++------ packages/emulation/libretro-vecx/package.mk | 10 ++++---- packages/emulation/libretro-vice/package.mk | 14 +++++------ .../libretro-virtualjaguar/package.mk | 10 ++++---- .../emulation/libretro-vram-test/package.mk | 12 +++++----- .../emulation/libretro-yabause/package.mk | 8 +++---- 75 files changed, 444 insertions(+), 444 deletions(-) diff --git a/packages/emulation/cyclone68000/package.mk b/packages/emulation/cyclone68000/package.mk index 2f96132f9e..52275404fd 100644 --- a/packages/emulation/cyclone68000/package.mk +++ b/packages/emulation/cyclone68000/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="66dda842eae01f47f5389b931ec9567fb0bbb6a1" PKG_SHA256="c59900531e35e7303e1172d9bd5d161491b4554983930ad855614252156ea0e0" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/notaz/cyclone68000" -PKG_URL="https://github.com/notaz/cyclone68000/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/notaz/cyclone68000/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Motorola 68000 emulator written in ARM assembly" PKG_TOOLCHAIN="manual" diff --git a/packages/emulation/libretro-2048/package.mk b/packages/emulation/libretro-2048/package.mk index bca2fe3931..95b4f55ee8 100644 --- a/packages/emulation/libretro-2048/package.mk +++ b/packages/emulation/libretro-2048/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="6e91356b9a901410017184a0d7772e40a92332a6" PKG_SHA256="814fc0a89f6bd6771002096d4a426e7c005b0f62d9e175a32339614f8382180d" PKG_LICENSE="Public domain" PKG_SITE="https://github.com/libretro/libretro-2048" -PKG_URL="https://github.com/libretro/libretro-2048/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/libretro-2048/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.2048: 2048 for Kodi" PKG_LIBNAME="2048_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="2048_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-4do/package.mk b/packages/emulation/libretro-4do/package.mk index 2098a7bead..ad80801328 100644 --- a/packages/emulation/libretro-4do/package.mk +++ b/packages/emulation/libretro-4do/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="da814a868c41fb47f265e04e5f95756cda62e5c2" PKG_SHA256="6a3ec326d35ae55fa4e749c600d9eb538fb7c1c3b9ffd1fa1ac6064f4bf5e7b4" PKG_LICENSE="LGPL" PKG_SITE="https://github.com/libretro/4do-libretro" -PKG_URL="https://github.com/libretro/4do-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/4do-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Port of 4DO/libfreedo to libretro." PKG_LIBNAME="4do_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="4DO_LIB" makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-atari800/package.mk b/packages/emulation/libretro-atari800/package.mk index 8eb9e642b4..9d1e5c2830 100644 --- a/packages/emulation/libretro-atari800/package.mk +++ b/packages/emulation/libretro-atari800/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="8ce851fbca0d360763a267322f6a76c3c80ddae6" PKG_SHA256="4a1b17cbdb606dbc444984a70753b98797a7b4634e4c9fea998e5db08ee25ba6" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/libretro-atari800" -PKG_URL="https://github.com/libretro/libretro-atari800/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/libretro-atari800/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="Atari 8-bit computer and 5200 console emulator" PKG_TOOLCHAIN="make" @@ -14,11 +14,11 @@ PKG_TOOLCHAIN="make" PKG_MAKE_OPTS_TARGET="platform=unix" PKG_LIBNAME="atari800_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="ATARI800_LIB" makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-beetle-bsnes/package.mk b/packages/emulation/libretro-beetle-bsnes/package.mk index f9933ebfd8..21c9e8c774 100644 --- a/packages/emulation/libretro-beetle-bsnes/package.mk +++ b/packages/emulation/libretro-beetle-bsnes/package.mk @@ -6,21 +6,21 @@ PKG_VERSION="0d6221a5fca708b36fa090d1c261663910d1e67e" PKG_SHA256="46a20d9c16f853deff45b61ec50ea312b0afb1e2c3aaa024e57cdc78a2ad79fe" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-bsnes-libretro" -PKG_URL="https://github.com/libretro/beetle-bsnes-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/beetle-bsnes-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.beetle-bsnes: Beetle bSNES for Kodi" PKG_LIBNAME="mednafen_snes_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BEETLE-BSNES_LIB" make_target() { - LDFLAGS="$LDFLAGS -ldl" + LDFLAGS+=" -ldl" make } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-beetle-gba/package.mk b/packages/emulation/libretro-beetle-gba/package.mk index 68f6e1d795..5a94835652 100644 --- a/packages/emulation/libretro-beetle-gba/package.mk +++ b/packages/emulation/libretro-beetle-gba/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="5dc23a3e302bd11efe997ae92e282e7d603c5813" PKG_SHA256="bc711802fdac5a66d1208447a1265aec737832bbb360ec2ea21a8af2216c2e67" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-gba-libretro" -PKG_URL="https://github.com/libretro/beetle-gba-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/beetle-gba-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.beetle-gba: Beetle GBA for Kodi" PKG_LIBNAME="mednafen_gba_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BEETLE-GBA_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-beetle-lynx/package.mk b/packages/emulation/libretro-beetle-lynx/package.mk index 4a1a1bb7cc..6883dce7de 100644 --- a/packages/emulation/libretro-beetle-lynx/package.mk +++ b/packages/emulation/libretro-beetle-lynx/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="559be1d83418b6309ce72db9c175c5bec6bcd549" PKG_SHA256="1083966de10c5ee925c208dd9b20619f7221402b1ff487e76d4b994f97ab5ed1" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-lynx-libretro" -PKG_URL="https://github.com/libretro/beetle-lynx-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/beetle-lynx-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="Standalone port of Mednafen Lynx to libretro, itself a fork of Handy" PKG_LIBNAME="mednafen_lynx_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BEETLE-LYNX_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-beetle-ngp/package.mk b/packages/emulation/libretro-beetle-ngp/package.mk index bba9994082..393d2351d4 100644 --- a/packages/emulation/libretro-beetle-ngp/package.mk +++ b/packages/emulation/libretro-beetle-ngp/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="38f0e6a80724fe92a7e7914d378abff4561c942e" PKG_SHA256="3d8b2750093a6921bd512f207bc235c3755558ccdafbb5249a69a2639f05809a" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-ngp-libretro" -PKG_URL="https://github.com/libretro/beetle-ngp-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/beetle-ngp-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="Standalone port of Mednafen NGP to the libretro API, itself a fork of Neopop" PKG_LIBNAME="mednafen_ngp_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BEETLE-NGP_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-beetle-pce-fast/package.mk b/packages/emulation/libretro-beetle-pce-fast/package.mk index 36b5207f43..d711d16a26 100644 --- a/packages/emulation/libretro-beetle-pce-fast/package.mk +++ b/packages/emulation/libretro-beetle-pce-fast/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="cd46fd82aea1ead94e9771b69b73fbea5bcff904" PKG_SHA256="050a8e2d9daeae7c7b18ba8d4496a1f2835c49734b51878728f38db6cc372914" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-pce-fast-libretro" -PKG_URL="https://github.com/libretro/beetle-pce-fast-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/beetle-pce-fast-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.beetle-pce-fast: Beetle PCE Fast for Kodi" PKG_LIBNAME="mednafen_pce_fast_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BEETLE-PCE-FAST_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-beetle-pcfx/package.mk b/packages/emulation/libretro-beetle-pcfx/package.mk index 41a2a21260..a19ae5cd36 100644 --- a/packages/emulation/libretro-beetle-pcfx/package.mk +++ b/packages/emulation/libretro-beetle-pcfx/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="294ecfc09a8dc4d1a20b83ad518283e24cbdb676" PKG_SHA256="05c1fbc498ddb6ab60a0e02acc7eedc38f3fe771956bf485a0aa09790dadf015" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-pcfx-libretro" -PKG_URL="https://github.com/libretro/beetle-pcfx-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/beetle-pcfx-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="Standalone port of Mednafen PCFX to libretro" PKG_LIBNAME="mednafen_pcfx_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BEETLE-PCFX_LIB" make_target() { - case $TARGET_CPU in + case ${TARGET_CPU} in arm1176jzf-s) make platform=armv6-hardfloat ;; @@ -23,7 +23,7 @@ make_target() { make platform=armv7-neon-hardfloat ;; cortex-a9|*cortex-a53|cortex-a17) - if [ "$TARGET_ARCH" = "aarch64" ]; then + if [ "${TARGET_ARCH}" = "aarch64" ]; then make platform=aarch64 else make platform=armv7-cortexa9-neon-hardfloat @@ -36,7 +36,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-beetle-psx/package.mk b/packages/emulation/libretro-beetle-psx/package.mk index 4d214f75dc..ca8d26ccf5 100644 --- a/packages/emulation/libretro-beetle-psx/package.mk +++ b/packages/emulation/libretro-beetle-psx/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="c6ee7ce49551fadcff96cbbe26299646e6890b1e" PKG_SHA256="a82fddea6b72dacd0accf50d11729f8b0ba5d9c3b2132f3b0c5c139699b68f82" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-psx-libretro" -PKG_URL="https://github.com/libretro/beetle-psx-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/beetle-psx-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="Fork of Mednafen PSX" PKG_LIBNAME="mednafen_psx_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BEETLE-PSX_LIB" makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-beetle-saturn/package.mk b/packages/emulation/libretro-beetle-saturn/package.mk index d0a5a6f166..f2b556fbe0 100644 --- a/packages/emulation/libretro-beetle-saturn/package.mk +++ b/packages/emulation/libretro-beetle-saturn/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="d24c9c4be3147cea7e2ff34b9800afd586014c5a" PKG_SHA256="811a8dc2e9d3497cc60ceee2f7e148981b27d34c94f07634ccb84dc460f72471" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/beetle-saturn-libretro" -PKG_URL="https://github.com/libretro/beetle-saturn-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/beetle-saturn-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.beetle-saturn: beetle-saturn for Kodi" PKG_LIBNAME="mednafen_saturn_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BEETLE-SATURN_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-beetle-supergrafx/package.mk b/packages/emulation/libretro-beetle-supergrafx/package.mk index d1de768545..4affbde179 100644 --- a/packages/emulation/libretro-beetle-supergrafx/package.mk +++ b/packages/emulation/libretro-beetle-supergrafx/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="0bb8e212ce2216ed726e4e648ba7f1ca9bac2f5a" PKG_SHA256="0eb77c7ea5102fca39502e26a8eed864374410e7194ea9ad78f0308690281bfc" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-supergrafx-libretro" -PKG_URL="https://github.com/libretro/beetle-supergrafx-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/beetle-supergrafx-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="Standalone port of Mednafen PCE Fast to libretro. This one only emulates a SuperGrafx TG-16" PKG_LIBNAME="mednafen_supergrafx_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BEETLE-SUPERGRAFX_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-beetle-vb/package.mk b/packages/emulation/libretro-beetle-vb/package.mk index b6d9761bad..7390e80eaa 100644 --- a/packages/emulation/libretro-beetle-vb/package.mk +++ b/packages/emulation/libretro-beetle-vb/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="a410d5cf3fa529c2a3970df34fee17b068f53168" PKG_SHA256="d15a1bc7875dd6de244f9e357a6097c75c195faca2ebf5eaddd6741c2af33c42" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-vb-libretro" -PKG_URL="https://github.com/libretro/beetle-vb-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/beetle-vb-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="Standalone port of Mednafen VB to libretro" PKG_LIBNAME="mednafen_vb_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BEETLE-VB_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-beetle-wswan/package.mk b/packages/emulation/libretro-beetle-wswan/package.mk index 5dc08a4b57..887846a2b4 100644 --- a/packages/emulation/libretro-beetle-wswan/package.mk +++ b/packages/emulation/libretro-beetle-wswan/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="5f9cc2e732fcca23e5cfe11fcf156f91007186a4" PKG_SHA256="5d2501a298f505381ea210518e0df73b4be38e75420a93dbe94f453025cde6ce" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/beetle-wswan-libretro" -PKG_URL="https://github.com/libretro/beetle-wswan-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/beetle-wswan-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="Standalone port of Mednafen WonderSwan to libretro, itself a fork of Cygne" PKG_LIBNAME="mednafen_wswan_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BEETLE-WSWAN_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-bluemsx/package.mk b/packages/emulation/libretro-bluemsx/package.mk index da64768137..806f579c15 100644 --- a/packages/emulation/libretro-bluemsx/package.mk +++ b/packages/emulation/libretro-bluemsx/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="29eca1e7874f16bf9f997c51bf1dc14298083e71" PKG_SHA256="0a0333988d7afe0cad4ae923bf9f90d50d5a67c7b096c11b1e23aa9a8df78a07" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/blueMSX-libretro" -PKG_URL="https://github.com/libretro/blueMSX-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/blueMSX-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.bluemsx: BlueMSX for Kodi" PKG_LIBNAME="bluemsx_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BLUEMSX_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-bnes/package.mk b/packages/emulation/libretro-bnes/package.mk index 5bbd2d42c1..d02fd4c454 100644 --- a/packages/emulation/libretro-bnes/package.mk +++ b/packages/emulation/libretro-bnes/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="8e26e89a93bef8eb8992d1921b539dce1792660a" PKG_SHA256="c151e1296b8f6c035014dc62919692097feeebb19ae73294f1b9781edf1921b1" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/bnes-libretro" -PKG_URL="https://github.com/libretro/bnes-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/bnes-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.bnes: bNES for Kodi" PKG_LIBNAME="bnes_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BNES_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk b/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk index e6c09c4151..db676d51c5 100644 --- a/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk +++ b/packages/emulation/libretro-bsnes-mercury-accuracy/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="60d38df01b2cb389fe61c8d821315691374a8b27" PKG_SHA256="01f1678445a358d762ef021148c62c646b7591da73942742af9e58c5f85e227e" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/bsnes-mercury" -PKG_URL="https://github.com/libretro/bsnes-mercury/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/bsnes-mercury/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.beetle-bsnes-accuracy: Beetle bSNES for Kodi" PKG_LIBNAME="bsnes_mercury_accuracy_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BSNES-MERCURY-ACCURACY_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-bsnes-mercury-balanced/package.mk b/packages/emulation/libretro-bsnes-mercury-balanced/package.mk index a631901994..9ea7c7bbc8 100644 --- a/packages/emulation/libretro-bsnes-mercury-balanced/package.mk +++ b/packages/emulation/libretro-bsnes-mercury-balanced/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="60d38df01b2cb389fe61c8d821315691374a8b27" PKG_SHA256="01f1678445a358d762ef021148c62c646b7591da73942742af9e58c5f85e227e" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/bsnes-mercury" -PKG_URL="https://github.com/libretro/bsnes-mercury/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/bsnes-mercury/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.beetle-bsnes-balanced: Beetle bSNES for Kodi" PKG_LIBNAME="bsnes_mercury_balanced_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BSNES-MERCURY-BALANCED_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-bsnes-mercury-performance/package.mk b/packages/emulation/libretro-bsnes-mercury-performance/package.mk index 3885eeb487..2f1abdc3c7 100644 --- a/packages/emulation/libretro-bsnes-mercury-performance/package.mk +++ b/packages/emulation/libretro-bsnes-mercury-performance/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="60d38df01b2cb389fe61c8d821315691374a8b27" PKG_SHA256="01f1678445a358d762ef021148c62c646b7591da73942742af9e58c5f85e227e" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/bsnes-mercury" -PKG_URL="https://github.com/libretro/bsnes-mercury/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/bsnes-mercury/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.beetle-bsnes-performance: Beetle bSNES for Kodi" PKG_LIBNAME="bsnes_mercury_performance_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="BSNES-MERCURY-PERFORMANCE_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-cap32/package.mk b/packages/emulation/libretro-cap32/package.mk index e621634d9c..adee65eb7b 100644 --- a/packages/emulation/libretro-cap32/package.mk +++ b/packages/emulation/libretro-cap32/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="4c470bb36b6bca00866d07c2036732ab85747a2a" PKG_SHA256="40a5cb903b1c45c08cc7671a8546d7b3da9e88499e0910bf3aab483655efd57b" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/libretro-cap32" -PKG_URL="https://github.com/libretro/libretro-cap32/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/libretro-cap32/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.cap32: cap32 for Kodi" PKG_LIBNAME="cap32_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="CAP32_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-desmume/package.mk b/packages/emulation/libretro-desmume/package.mk index a04cdffe22..6a91c27ca2 100644 --- a/packages/emulation/libretro-desmume/package.mk +++ b/packages/emulation/libretro-desmume/package.mk @@ -6,22 +6,22 @@ PKG_VERSION="d9923420d55e8bda61aaa15cb003b498375a2cb6" PKG_SHA256="a42ab96148a572d57174e2434dde22d5927d9b8432bed61c60b6433005f3f5c3" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/desmume" -PKG_URL="https://github.com/libretro/desmume/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/desmume/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="libretro wrapper for desmume NDS emulator." PKG_TOOLCHAIN="make" PKG_LIBNAME="desmume_libretro.so" -PKG_LIBPATH="desmume/$PKG_LIBNAME" +PKG_LIBPATH="desmume/${PKG_LIBNAME}" PKG_LIBVAR="DESMUME_LIB" make_target() { - case $TARGET_CPU in + case ${TARGET_CPU} in arm1176jzf-s) - make -C desmume -f Makefile.libretro platform=armv6-hardfloat-$TARGET_CPU + make -C desmume -f Makefile.libretro platform=armv6-hardfloat-${TARGET_CPU} ;; cortex-a7|cortex-a9) - make -C desmume -f Makefile.libretro platform=armv7-neon-hardfloat-$TARGET_CPU + make -C desmume -f Makefile.libretro platform=armv7-neon-hardfloat-${TARGET_CPU} ;; x86-64) make -C desmume -f Makefile.libretro @@ -30,7 +30,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-dinothawr/package.mk b/packages/emulation/libretro-dinothawr/package.mk index 561cf826be..dcddd1f7ce 100644 --- a/packages/emulation/libretro-dinothawr/package.mk +++ b/packages/emulation/libretro-dinothawr/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="a4083e0b0937c38e96d74b055765fbfbe69f2664" PKG_SHA256="14212b011376ebd5f39c6c2eeb95db4d0378d5e66300fd4ba1a4730dd104bf73" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/Dinothawr" -PKG_URL="https://github.com/libretro/Dinothawr/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/Dinothawr/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.dinothawr: dinothawr for Kodi" PKG_LIBNAME="dinothawr_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="DINOTHAWR_LIB" pre_make_target() { @@ -21,7 +21,7 @@ pre_make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-dolphin/package.mk b/packages/emulation/libretro-dolphin/package.mk index a8f45b71e5..bcbe8570d1 100644 --- a/packages/emulation/libretro-dolphin/package.mk +++ b/packages/emulation/libretro-dolphin/package.mk @@ -7,18 +7,18 @@ PKG_SHA256="3acfdb0dee34773cfc67b045f135465f5e96e4de7b2912dfe61c6ea7c7d7e4d2" PKG_ARCH="none" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/dolphin" -PKG_URL="https://github.com/libretro/dolphin/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/dolphin/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform enet" PKG_LONGDESC="Dolphin is a GameCube / Wii emulator, allowing you to play games for these two platforms on PC" PKG_LIBNAME="dolphin_libretro.so" -PKG_LIBPATH="libretro/$PKG_LIBNAME" +PKG_LIBPATH="libretro/${PKG_LIBNAME}" PKG_LIBVAR="DOLPHIN_LIB" pre_configure_target() { # fails to build in subdirs - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} } make_target() { @@ -26,7 +26,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-dosbox/package.mk b/packages/emulation/libretro-dosbox/package.mk index 42409f79c8..7fc92a0dbc 100644 --- a/packages/emulation/libretro-dosbox/package.mk +++ b/packages/emulation/libretro-dosbox/package.mk @@ -6,13 +6,13 @@ PKG_VERSION="665d16d4edaeb8b1d6170c4bcf3747d20b03d032" PKG_SHA256="3206f8f9f2ffb3aba6580ad21b2415684ed18680ec046aac97ad869d47f3decc" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/dosbox-libretro" -PKG_URL="https://github.com/libretro/dosbox-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/dosbox-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.dosbox: DOSBox for Kodi" PKG_BUILD_FLAGS="+pic" PKG_LIBNAME="dosbox_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="DOSBOX_LIB" make_target() { @@ -20,7 +20,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-fbalpha/package.mk b/packages/emulation/libretro-fbalpha/package.mk index abc268c96a..476099df47 100644 --- a/packages/emulation/libretro-fbalpha/package.mk +++ b/packages/emulation/libretro-fbalpha/package.mk @@ -6,20 +6,20 @@ PKG_VERSION="3edb7789803aaefeb34907f8dfec9d5bf26486ed" PKG_SHA256="3cd1b78fd1b253c798cd2ed1948e5d5ec4d481a398c323435108b3c3f5e29dab" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/fbalpha" -PKG_URL="https://github.com/libretro/fbalpha/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/fbalpha/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.fba: fba for Kodi" PKG_TOOLCHAIN="make" PKG_LIBNAME="fbalpha_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="FBALPHA_LIB" pre_make_target() { - PKG_MAKE_OPTS_TARGET="-f makefile.libretro CC=$CC CXX=$CXX GIT_VERSION=${PKG_VERSION:0:7}" + PKG_MAKE_OPTS_TARGET="-f makefile.libretro CC=${CC} CXX=${CXX} GIT_VERSION=${PKG_VERSION:0:7}" - if [ "$PROJECT" = "RPi" ]; then - case $DEVICE in + if [ "${PROJECT}" = "RPi" ]; then + case ${DEVICE} in RPi) PKG_MAKE_OPTS_TARGET+=" platform=armv" ;; @@ -36,7 +36,7 @@ pre_make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-fceumm/package.mk b/packages/emulation/libretro-fceumm/package.mk index b02b44c427..f2ed569ec7 100644 --- a/packages/emulation/libretro-fceumm/package.mk +++ b/packages/emulation/libretro-fceumm/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="e7e7610c27560fcf0d82ca258912bea15779b23e" PKG_SHA256="b1f998e9be80d553dc9c9bea72ce279bb95449984aa5d8b1c2e36c56d0ffdf56" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/libretro-fceumm" -PKG_URL="https://github.com/libretro/libretro-fceumm/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/libretro-fceumm/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.fceumm: FCEUmm emulator for Kodi" PKG_LIBNAME="fceumm_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="FCEUMM_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-fmsx/package.mk b/packages/emulation/libretro-fmsx/package.mk index b4b50d4d09..c758b92238 100644 --- a/packages/emulation/libretro-fmsx/package.mk +++ b/packages/emulation/libretro-fmsx/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="fdc6a2f5f40428f2b38d5e533f542e2a9206b080" PKG_SHA256="2b3a68ca3f0c3f2a6e65dac5d661958e7fd779d24890ac1fb2270da2e948644b" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/fmsx-libretro" -PKG_URL="https://github.com/libretro/fmsx-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/fmsx-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.fmsx: fmsx for Kodi" PKG_LIBNAME="fmsx_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="FMSX_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-fsuae/package.mk b/packages/emulation/libretro-fsuae/package.mk index 0a06678726..9f403f5ce6 100644 --- a/packages/emulation/libretro-fsuae/package.mk +++ b/packages/emulation/libretro-fsuae/package.mk @@ -7,35 +7,35 @@ PKG_SHA256="0beaf41955733f30cf092e7aa7e4f5e07a64c0608783fb7e6c820711c44e4ed9" PKG_ARCH="x86_64" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/libretro-fsuae" -PKG_URL="https://github.com/libretro/libretro-fsuae/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/libretro-fsuae/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain glib libmpeg2 openal-soft libpng" PKG_LONGDESC="FS-UAE amiga emulator." PKG_BUILD_FLAGS="-lto" PKG_TOOLCHAIN="autotools" PKG_LIBNAME="fsuae_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="FSUAE_LIB" -if [ "$TARGET_ARCH" = "arm" ] && target_has_feature neon; then +if [ "${TARGET_ARCH}" = "arm" ] && target_has_feature neon; then PKG_CONFIGURE_OPTS_TARGET="--disable-jit --enable-neon" fi pre_configure_target() { - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} # check if this flag is still needed when this package is updated - export CFLAGS="$CFLAGS -fcommon" + export CFLAGS="${CFLAGS} -fcommon" export ac_cv_func_realloc_0_nonnull=yes } make_target() { - make -j1 CC="$CC" gen - make CC="$CC" + make -j1 CC="${CC}" gen + make CC="${CC}" } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-fuse/package.mk b/packages/emulation/libretro-fuse/package.mk index 156463f91d..5d4e18ae04 100644 --- a/packages/emulation/libretro-fuse/package.mk +++ b/packages/emulation/libretro-fuse/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="33710427a519c82bb38654c5a098272e14fc1823" PKG_SHA256="dde8486f541b942682bf7ffdcd0b4537c8391db44f6a78d2f6e6dfce499d1b3e" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/fuse-libretro" -PKG_URL="https://github.com/libretro/fuse-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/fuse-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.fuse: fuse for Kodi" PKG_LIBNAME="fuse_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="FUSE_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-gambatte/package.mk b/packages/emulation/libretro-gambatte/package.mk index e859636025..f6b6e109cf 100644 --- a/packages/emulation/libretro-gambatte/package.mk +++ b/packages/emulation/libretro-gambatte/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="fce2e5a6a9c4ba236325d74ea449109898724cda" PKG_SHA256="9e1976366bf9a0c04460bc4cf449b9c99ee824a605859d02c6f5da2f501cbb66" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/gambatte-libretro" -PKG_URL="https://github.com/libretro/gambatte-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/gambatte-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.gambatte: Gambatte for Kodi" PKG_LIBNAME="gambatte_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="GAMBATTE_LIB" makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-genplus/package.mk b/packages/emulation/libretro-genplus/package.mk index 12ae009052..2ad55f1942 100644 --- a/packages/emulation/libretro-genplus/package.mk +++ b/packages/emulation/libretro-genplus/package.mk @@ -6,25 +6,25 @@ PKG_VERSION="f23676488eea5821e38f42eb143011d492f36df5" PKG_SHA256="4f6816add17915ea5c9c335e9f4e56a5c5d50b7d3d811eda848b4dd02acc04d2" PKG_LICENSE="Modified BSD / LGPLv2.1" PKG_SITE="https://github.com/libretro/Genesis-Plus-GX" -PKG_URL="https://github.com/libretro/Genesis-Plus-GX/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/Genesis-Plus-GX/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.genplus: Genesis Plus GX for Kodi" PKG_TOOLCHAIN="manual" PKG_LIBNAME="genesis_plus_gx_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="GENPLUS_LIB" make_target() { - if [ "$ARCH" = "arm" ]; then - CFLAGS="$CFLAGS -DALIGN_LONG" + if [ "${ARCH}" = "arm" ]; then + CFLAGS+=" -DALIGN_LONG" fi - make -f Makefile.libretro GIT_VERSION=$PKG_VERSION + make -f Makefile.libretro GIT_VERSION=${PKG_VERSION} } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-gw/package.mk b/packages/emulation/libretro-gw/package.mk index 19affaef16..fcf76c0611 100644 --- a/packages/emulation/libretro-gw/package.mk +++ b/packages/emulation/libretro-gw/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="819b1dde560013003eeac86c2069c5be7af25c6d" PKG_SHA256="e5dc930b9f835a617211c78d5efd7998b3e4d12660465ad2e53fc8e09da0d86f" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/gw-libretro" -PKG_URL="https://github.com/libretro/gw-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/gw-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.gw: gw for Kodi" PKG_LIBNAME="gw_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="GW_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-handy/package.mk b/packages/emulation/libretro-handy/package.mk index a6ea2fb7db..69da2eb304 100644 --- a/packages/emulation/libretro-handy/package.mk +++ b/packages/emulation/libretro-handy/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="dba810a87ebae87392259c68dcab7a35f6000aac" PKG_SHA256="8209510e60dc317d0b1cd4bb0c9b248e187401a772f3d6c9d8737070bfb80246" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/libretro-handy" -PKG_URL="https://github.com/libretro/libretro-handy/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/libretro-handy/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.handy: handy for Kodi" PKG_LIBNAME="handy_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="HANDY_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-hatari/package.mk b/packages/emulation/libretro-hatari/package.mk index 0d53eb6401..0f31adc3bf 100644 --- a/packages/emulation/libretro-hatari/package.mk +++ b/packages/emulation/libretro-hatari/package.mk @@ -6,22 +6,22 @@ PKG_VERSION="f19bc118b4e39f5b5131505d5ead09109384be8f" PKG_SHA256="62606ae3763b0fe152a09ebb303e4c22cdafdec333d437800d71d5842fcbd594" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/hatari" -PKG_URL="https://github.com/libretro/hatari/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/hatari/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.hatari: hatari for Kodi" PKG_TOOLCHAIN="manual" PKG_LIBNAME="hatari_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="HATARI_LIB" make_target() { - cd $PKG_BUILD + cd ${PKG_BUILD} make -f Makefile.libretro } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-mame/package.mk b/packages/emulation/libretro-mame/package.mk index 939b6dab82..f7dfa25040 100644 --- a/packages/emulation/libretro-mame/package.mk +++ b/packages/emulation/libretro-mame/package.mk @@ -7,14 +7,14 @@ PKG_SHA256="acdee7eeac28de1ab257cd2593c3d3266863875139d9a201f572d8044e3eb96e" PKG_ARCH="x86_64 arm" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/mame" -PKG_URL="https://github.com/libretro/mame/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/mame/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.mame: MAME for Kodi" PKG_BUILD_FLAGS="-gold -lto" PKG_TOOLCHAIN="make" PKG_LIBNAME="mame_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="MAME_LIB" pre_make_target() { @@ -24,19 +24,19 @@ pre_make_target() { CROSS_BUILD="1" OVERRIDE_CC="${CC}" OVERRIDE_CXX="${CXX}" \ TARGET="mame" SUBTARGET="arcade" PLATFORM="${ARCH}" RETRO=1 OSD="retro"" - if [ "$ARCH" = "arm" ]; then + if [ "${ARCH}" = "arm" ]; then PKG_MAKE_OPTS_TARGET+=" NOASM="1" ARCHITECTURE=""" - elif [ "$ARCH" = "x86_64" ]; then + elif [ "${ARCH}" = "x86_64" ]; then PKG_MAKE_OPTS_TARGET+=" NOASM="0" PTR64="1"" fi } post_make_target() { - mv $PKG_BUILD/mamearcade_libretro.so $PKG_BUILD/mame_libretro.so + mv ${PKG_BUILD}/mamearcade_libretro.so ${PKG_BUILD}/mame_libretro.so } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-mame2000/package.mk b/packages/emulation/libretro-mame2000/package.mk index 2bcc59f378..d565336d8a 100644 --- a/packages/emulation/libretro-mame2000/package.mk +++ b/packages/emulation/libretro-mame2000/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="6655a5122c4a34e57de933fedafa3c6ec6a221be" PKG_SHA256="92e4292e892d534b66ba1185107b228a67bbfef106db02c88443f37309523eea" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/mame2000-libretro" -PKG_URL="https://github.com/libretro/mame2000-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/mame2000-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="2000 version of MAME (0.37b5) for libretro" PKG_LIBNAME="mame2000_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="MAME2000_LIB" make_target() { - if [ "$TARGET_ARCH" = "arm" ]; then + if [ "${TARGET_ARCH}" = "arm" ]; then make ARM=1 else make @@ -23,7 +23,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-mame2003/package.mk b/packages/emulation/libretro-mame2003/package.mk index 6046287762..c581225f61 100644 --- a/packages/emulation/libretro-mame2003/package.mk +++ b/packages/emulation/libretro-mame2003/package.mk @@ -6,20 +6,20 @@ PKG_VERSION="b04cf1f2cea50a4f19d6c783829d2abb6b1010b4" PKG_SHA256="d495ca9e7b4ecedaec552f686e01f61f359d8cc1f4fcb73367b3053e29502278" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/mame2003-libretro" -PKG_URL="https://github.com/libretro/mame2003-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/mame2003-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Late 2003 version of MAME (0.78) for libretro" PKG_LIBNAME="mame2003_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="MAME2003_LIB" configure_target() { - export LD="$CC" + export LD="${CC}" } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-mame2003_plus/package.mk b/packages/emulation/libretro-mame2003_plus/package.mk index c440820462..615f0cdd4f 100644 --- a/packages/emulation/libretro-mame2003_plus/package.mk +++ b/packages/emulation/libretro-mame2003_plus/package.mk @@ -6,20 +6,20 @@ PKG_VERSION="3b43072a9ef4471508d92531e606d4e2c3dac3f6" PKG_SHA256="13b197f2d83f8a2adb091214455f1c6ea784eae96c3347ace645cf5bd4d89f69" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/mame2003-plus-libretro" -PKG_URL="https://github.com/libretro/mame2003-plus-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/mame2003-plus-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Updated 2018 version of MAME (0.78) with added game support plus many fixes and improvements" PKG_LIBNAME="mame2003_plus_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="MAME2003_PLUS_LIB" configure_target() { - export LD="$CC" + export LD="${CC}" } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-mame2010/package.mk b/packages/emulation/libretro-mame2010/package.mk index 9859947f43..3231c45860 100644 --- a/packages/emulation/libretro-mame2010/package.mk +++ b/packages/emulation/libretro-mame2010/package.mk @@ -6,28 +6,28 @@ PKG_VERSION="2d2e86b5d8dced24a390bbb3b44d913833a1f6fa" PKG_SHA256="5a084d988b314b9cbfc3e697f330f0a436a572481ca66ce91b0b7baafb37a8b7" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/mame2010-libretro" -PKG_URL="https://github.com/libretro/mame2010-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/mame2010-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain zlib" PKG_LONGDESC="Late 2010 version of MAME (0.139) for libretro" PKG_LIBNAME="mame2010_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="MAME2010_LIB" pre_configure_target() { - export CFLAGS="$CFLAGS -fpermissive" - export CXXFLAGS="$CXXFLAGS -fpermissive" - export LD="$CXX" + export CFLAGS="${CFLAGS} -fpermissive" + export CXXFLAGS="${CXXFLAGS} -fpermissive" + export LD="${CXX}" - case $TARGET_CPU in + case ${TARGET_CPU} in arm1176jzf-s) - PKG_MAKE_OPTS_TARGET="platform=armv6-hardfloat-$TARGET_CPU" + PKG_MAKE_OPTS_TARGET="platform=armv6-hardfloat-${TARGET_CPU}" ;; cortex-a7|cortex-a8|cortex-a9) - PKG_MAKE_OPTS_TARGET="platform=armv7-neon-hardfloat-$TARGET_CPU" + PKG_MAKE_OPTS_TARGET="platform=armv7-neon-hardfloat-${TARGET_CPU}" ;; *cortex-a53|cortex-a17) - if [ "$TARGET_ARCH" = "aarch64" ]; then + if [ "${TARGET_ARCH}" = "aarch64" ]; then PKG_MAKE_OPTS_TARGET="platform=aarch64" else PKG_MAKE_OPTS_TARGET="platform=armv7-neon-hardfloat-cortex-a9" @@ -42,7 +42,7 @@ pre_make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-mame2016/package.mk b/packages/emulation/libretro-mame2016/package.mk index bb76d635ef..f0facf2412 100644 --- a/packages/emulation/libretro-mame2016/package.mk +++ b/packages/emulation/libretro-mame2016/package.mk @@ -23,9 +23,9 @@ pre_make_target() { TARGET="mame" SUBTARGET="arcade" PLATFORM="${ARCH}" RETRO=1 OSD="retro" \ GIT_VERSION=${PKG_VERSION:0:7}" - if [ "$ARCH" = "arm" ]; then + if [ "${ARCH}" = "arm" ]; then PKG_MAKE_OPTS_TARGET+=" NOASM="1" ARCHITECTURE=""" - elif [ "$ARCH" = "x86_64" ]; then + elif [ "${ARCH}" = "x86_64" ]; then PKG_MAKE_OPTS_TARGET+=" NOASM="0" PTR64="1"" fi } diff --git a/packages/emulation/libretro-melonds/package.mk b/packages/emulation/libretro-melonds/package.mk index 09b5bb218e..578da66394 100644 --- a/packages/emulation/libretro-melonds/package.mk +++ b/packages/emulation/libretro-melonds/package.mk @@ -6,21 +6,21 @@ PKG_VERSION="289d544859e6abfab855f6208052bef0bf4a4592" PKG_SHA256="35fe3e54f8acbfbab7b064dd425a0dcdb25176d5f5ac291b2033d094ab911b72" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/melonds" -PKG_URL="https://github.com/libretro/melonds/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/melonds/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="libretro wrapper for melonDS DS emulator." PKG_TOOLCHAIN="make" PKG_LIBNAME="melonds_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="MELONDS_LIB" configure_target() { - cd $PKG_BUILD + cd ${PKG_BUILD} } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-mesen/package.mk b/packages/emulation/libretro-mesen/package.mk index 643770d661..669eae5df8 100644 --- a/packages/emulation/libretro-mesen/package.mk +++ b/packages/emulation/libretro-mesen/package.mk @@ -6,13 +6,13 @@ PKG_VERSION="86326e832974d984846ae078e568c023a5f76f1f" PKG_SHA256="50687bfd9fb242c878a420cb44a74e9bc9503bfd43f2e47f6d345cf5d8fca249" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/SourMesen/Mesen/" -PKG_URL="https://github.com/SourMesen/Mesen/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/SourMesen/Mesen/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.mesen: mesen for Kodi" PKG_TOOLCHAIN="make" PKG_LIBNAME="mesen_libretro.so" -PKG_LIBPATH="Libretro/$PKG_LIBNAME" +PKG_LIBPATH="Libretro/${PKG_LIBNAME}" PKG_LIBVAR="MESEN_LIB" make_target() { @@ -20,7 +20,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-meteor/package.mk b/packages/emulation/libretro-meteor/package.mk index 5cb6208ee9..07a3772420 100644 --- a/packages/emulation/libretro-meteor/package.mk +++ b/packages/emulation/libretro-meteor/package.mk @@ -6,19 +6,19 @@ PKG_VERSION="bc6bbc06f00afd69803fe30a923be9bb95c73cb6" PKG_SHA256="f718aa75a079539a01fad6d349afe38f06b762272d498640e29467d2f3c8b4cd" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/meteor-libretro" -PKG_URL="https://github.com/libretro/meteor-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/meteor-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.meteor: Meteor GBA for Kodi" PKG_TOOLCHAIN="make" PKG_LIBNAME="meteor_libretro.so" -PKG_LIBPATH="libretro/$PKG_LIBNAME" +PKG_LIBPATH="libretro/${PKG_LIBNAME}" PKG_LIBVAR="METEOR_LIB" pre_configure_target() { # fails to build in subdirs - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} } make_target() { @@ -26,7 +26,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-mgba/package.mk b/packages/emulation/libretro-mgba/package.mk index 98f38c6bd6..03f26569a7 100644 --- a/packages/emulation/libretro-mgba/package.mk +++ b/packages/emulation/libretro-mgba/package.mk @@ -6,19 +6,19 @@ PKG_VERSION="11d194f0988178a53dbfbe20699c5fad658d39e5" PKG_SHA256="b4cfc4ef84f9108d9bff3aaa8265fe35ebaaeae7c5facee49f3c556c54ad34c4" PKG_LICENSE="MPL 2.0" PKG_SITE="https://github.com/libretro/mgba" -PKG_URL="https://github.com/libretro/mgba/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/mgba/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform zlib" PKG_LONGDESC="game.libretro.mgba: mGBA for Kodi" PKG_TOOLCHAIN="make" PKG_LIBNAME="mgba_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="MGBA_LIB" pre_configure_target() { # fails to build in subdirs - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} } make_target() { @@ -26,7 +26,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-mrboom/package.mk b/packages/emulation/libretro-mrboom/package.mk index c459d829f6..ee89ac94e0 100644 --- a/packages/emulation/libretro-mrboom/package.mk +++ b/packages/emulation/libretro-mrboom/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="e074bafa1fe9480df1ba412752912a2c2c454958" PKG_SHA256="ac337b339cb1da9d013745c72b59b84ee64d94ada8f303be671e680d50061c15" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/mrboom-libretro" -PKG_URL="https://github.com/libretro/mrboom-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/mrboom-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.mrboom: mrboom for Kodi" PKG_LIBNAME="mrboom_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="MRBOOM_LIB" pre_make_target() { @@ -26,7 +26,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-mupen64plus/package.mk b/packages/emulation/libretro-mupen64plus/package.mk index 59fae24bb6..20dd1963cd 100644 --- a/packages/emulation/libretro-mupen64plus/package.mk +++ b/packages/emulation/libretro-mupen64plus/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="b21e3292e6ff7afb954d4871362ab6e6473d680f" PKG_SHA256="2bc4424ac80ee03d248d261908a857dc1e0ae919704830e1629cd111a9acc91e" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/mupen64plus-libretro" -PKG_URL="https://github.com/libretro/mupen64plus-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/mupen64plus-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.mupen64plus: Mupen64Plus for Kodi" PKG_LIBNAME="mupen64plus_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="MUPEN64PLUS_LIB" make_target() { @@ -20,13 +20,13 @@ make_target() { export HAVE_NEON=1 fi - if [ -z "$DEVICE" ]; then - PKG_DEVICE_NAME=$PROJECT + if [ -z "${DEVICE}" ]; then + PKG_DEVICE_NAME=${PROJECT} else - PKG_DEVICE_NAME=$DEVICE + PKG_DEVICE_NAME=${DEVICE} fi - case $PKG_DEVICE_NAME in + case ${PKG_DEVICE_NAME} in RPi|RPi2) make platform=${PKG_DEVICE_NAME,,} ;; @@ -34,8 +34,8 @@ make_target() { make WITH_DYNAREC=x86_64 ;; *) - if [[ "$TARGET_CPU" = "cortex-a9" ]] || [[ "$TARGET_CPU" = *"cortex-a53" ]] || [[ "$TARGET_CPU" = "cortex-a17" ]]; then - if [ "$TARGET_ARCH" = "aarch64" ]; then + if [[ "${TARGET_CPU}" = "cortex-a9" ]] || [[ "${TARGET_CPU}" = *"cortex-a53" ]] || [[ "${TARGET_CPU}" = "cortex-a17" ]]; then + if [ "${TARGET_ARCH}" = "aarch64" ]; then make platform=aarch64 else make platform=linux-gles FORCE_GLES=1 WITH_DYNAREC=arm @@ -46,7 +46,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-nestopia/package.mk b/packages/emulation/libretro-nestopia/package.mk index d3331caa42..af58392722 100644 --- a/packages/emulation/libretro-nestopia/package.mk +++ b/packages/emulation/libretro-nestopia/package.mk @@ -6,13 +6,13 @@ PKG_VERSION="02e7c03f933333bb9ce79b2c0e5ebb936a9536e2" PKG_SHA256="f3fd8e18899a6b46aadb4436c3b58f2aeb844d0d22ea904017dbc9c112b8fd5d" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/nestopia" -PKG_URL="https://github.com/libretro/nestopia/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/nestopia/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.nestopia: Nestopia for Kodi" PKG_TOOLCHAIN="manual" PKG_LIBNAME="nestopia_libretro.so" -PKG_LIBPATH="libretro/$PKG_LIBNAME" +PKG_LIBPATH="libretro/${PKG_LIBNAME}" PKG_LIBVAR="NESTOPIA_LIB" make_target() { @@ -20,7 +20,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-nx/package.mk b/packages/emulation/libretro-nx/package.mk index 2bd215868e..df736a9897 100644 --- a/packages/emulation/libretro-nx/package.mk +++ b/packages/emulation/libretro-nx/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="aad9a19b95356d91062bd3f2bc561b2139cf0b7b" PKG_SHA256="7da3b2c59a8ee02e831c90e08f2419b1afa6b9e1140ec16e184a2164c213f28b" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/nxengine-libretro" -PKG_URL="https://github.com/libretro/nxengine-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/nxengine-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.nx: nx for Kodi" PKG_LIBNAME="nxengine_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="NX_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-o2em/package.mk b/packages/emulation/libretro-o2em/package.mk index 232000087b..bd79c8c861 100644 --- a/packages/emulation/libretro-o2em/package.mk +++ b/packages/emulation/libretro-o2em/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="51e5e19d71c5c17d87ce67a5faf60a8b77d40135" PKG_SHA256="de7b3e61ba978d7d793d3458002c3e247961d3dbbb91f406ce798b873c311cba" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/libretro-o2em" -PKG_URL="https://github.com/libretro/libretro-o2em/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/libretro-o2em/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.o2em: o2em for Kodi" PKG_LIBNAME="o2em_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="O2EM_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-pcsx-rearmed/package.mk b/packages/emulation/libretro-pcsx-rearmed/package.mk index 191247a3b3..4003f295ca 100644 --- a/packages/emulation/libretro-pcsx-rearmed/package.mk +++ b/packages/emulation/libretro-pcsx-rearmed/package.mk @@ -6,18 +6,18 @@ PKG_VERSION="574e2fafbf6dbee9a5cacacd97c6a18c98fbc10e" PKG_SHA256="e215780d44b1100d00bc2f81398027bc8783d2cae5266ba584dbc52cff1b7fb7" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/pcsx_rearmed" -PKG_URL="https://github.com/libretro/pcsx_rearmed/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/pcsx_rearmed/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.pcsx-rearmed: PCSX Rearmed for Kodi" PKG_TOOLCHAIN="manual" PKG_BUILD_FLAGS="-gold" PKG_LIBNAME="pcsx_rearmed_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="PCSX-REARMED_LIB" make_target() { - cd $PKG_BUILD + cd ${PKG_BUILD} if target_has_feature neon; then export HAVE_NEON=1 @@ -27,23 +27,23 @@ make_target() { fi # check if this flag is still needed when this package is updated - export CFLAGS="$CFLAGS -fcommon" + export CFLAGS="${CFLAGS} -fcommon" - case $TARGET_ARCH in + case ${TARGET_ARCH} in aarch64) - make -f Makefile.libretro DYNAREC=lightrec platform=aarch64 GIT_VERSION=$PKG_VERSION + make -f Makefile.libretro DYNAREC=lightrec platform=aarch64 GIT_VERSION=${PKG_VERSION} ;; arm) - make -f Makefile.libretro DYNAREC=ari64 GIT_VERSION=$PKG_VERSION + make -f Makefile.libretro DYNAREC=ari64 GIT_VERSION=${PKG_VERSION} ;; x86_64) - make -f Makefile.libretro DYNAREC=lightrec GIT_VERSION=$PKG_VERSION + make -f Makefile.libretro DYNAREC=lightrec GIT_VERSION=${PKG_VERSION} ;; esac } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-picodrive/package.mk b/packages/emulation/libretro-picodrive/package.mk index 15f0e70847..8a2ccab618 100644 --- a/packages/emulation/libretro-picodrive/package.mk +++ b/packages/emulation/libretro-picodrive/package.mk @@ -6,38 +6,38 @@ PKG_VERSION="67cdfb8c5d407c5a4e8f25ffa0ee7fac716b0690" PKG_SHA256="39871c4c5d2af833a4ae56ef83cfe21102edc563b728f00c56d50de9857cbf1e" PKG_LICENSE="MAME" PKG_SITE="https://github.com/libretro/picodrive" -PKG_URL="https://github.com/libretro/picodrive/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/picodrive/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="toolchain:host" -PKG_DEPENDS_TARGET="toolchain kodi-platform $PKG_NAME:host" +PKG_DEPENDS_TARGET="toolchain kodi-platform ${PKG_NAME}:host" PKG_DEPENDS_UNPACK="cyclone68000" PKG_LONGDESC="Fast MegaDrive/MegaCD/32X emulator" PKG_TOOLCHAIN="manual" PKG_BUILD_FLAGS="-gold" PKG_LIBNAME="picodrive_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="PICODRIVE_LIB" pre_build_host() { - cp -a $(get_build_dir cyclone68000)/* $PKG_BUILD/cpu/cyclone/ + cp -a $(get_build_dir cyclone68000)/* ${PKG_BUILD}/cpu/cyclone/ } pre_configure_host() { # fails to build in subdirs - cd $PKG_BUILD - rm -rf .$HOST_NAME + cd ${PKG_BUILD} + rm -rf .${HOST_NAME} } make_host() { - if [ "$ARCH" = "arm" ]; then + if [ "${ARCH}" = "arm" ]; then make -C cpu/cyclone CONFIG_FILE=../cyclone_config.h fi } pre_configure_target() { # fails to build in subdirs - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} } post_configure_target() { @@ -49,7 +49,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-pokemini/package.mk b/packages/emulation/libretro-pokemini/package.mk index 17d9d2985c..569fba92a7 100644 --- a/packages/emulation/libretro-pokemini/package.mk +++ b/packages/emulation/libretro-pokemini/package.mk @@ -6,21 +6,21 @@ PKG_VERSION="87163ef02126f73c93b7e55badd7d6d66e12a304" PKG_SHA256="64d5db160d39fc79a26d81c1c41a9d8085747fe37eceb3c93d6efb39044f6299" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/pokemini" -PKG_URL="https://github.com/libretro/pokemini/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/pokemini/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="libretro wrapper for PokeMini emulator." PKG_TOOLCHAIN="make" PKG_LIBNAME="pokemini_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="POKEMINI_LIB" configure_target() { - cd $PKG_BUILD + cd ${PKG_BUILD} } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-ppsspp/package.mk b/packages/emulation/libretro-ppsspp/package.mk index 4287a46139..20b9d23945 100644 --- a/packages/emulation/libretro-ppsspp/package.mk +++ b/packages/emulation/libretro-ppsspp/package.mk @@ -6,13 +6,13 @@ PKG_VERSION="7b4ddb426bbe9e287bb7f19b0cfaebb4ea0d41d8" PKG_SHA256="e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/hrydgard/ppsspp" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain SDL2" PKG_LONGDESC="A PSP emulator written in C++." PKG_TOOLCHAIN="cmake-make" PKG_LIBNAME="ppsspp_libretro.so" -PKG_LIBPATH="lib/$PKG_LIBNAME" +PKG_LIBPATH="lib/${PKG_LIBNAME}" PKG_LIBVAR="PPSSPP_LIB" if target_has_feature neon; then @@ -25,10 +25,10 @@ fi PKG_CMAKE_OPTS_TARGET="-DLIBRETRO=ON \ -DUSE_SYSTEM_FFMPEG=ON \ - $PKG_ARCH_ARM" + ${PKG_ARCH_ARM}" pre_configure_target() { - LDFLAGS="$LDFLAGS -lpthread" + LDFLAGS+=" -lpthread" } pre_make_target() { @@ -36,7 +36,7 @@ pre_make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-prboom/package.mk b/packages/emulation/libretro-prboom/package.mk index 0ff59379a7..b4c41fdb06 100644 --- a/packages/emulation/libretro-prboom/package.mk +++ b/packages/emulation/libretro-prboom/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="0f553228c1c980fb75acb566e35e3e17ea477ee3" PKG_SHA256="999a8d31b9372896d4bf6833424b34cdef0c29ff3f53f135ac61622c4e61fd42" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/libretro-prboom" -PKG_URL="https://github.com/libretro/libretro-prboom/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/libretro-prboom/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.prboom: prboom for Kodi" PKG_LIBNAME="prboom_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="PRBOOM_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-prosystem/package.mk b/packages/emulation/libretro-prosystem/package.mk index 5bf806cb55..1052ebb336 100644 --- a/packages/emulation/libretro-prosystem/package.mk +++ b/packages/emulation/libretro-prosystem/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="95f2094b915afb502f74d921aceaf7db7e63a01c" PKG_SHA256="3a9950d87c63b1ff98f168bff99bde037b49a49dfc03d9c5ebd3e56fb701e889" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/prosystem-libretro" -PKG_URL="https://github.com/libretro/prosystem-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/prosystem-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="Port of ProSystem to libretro" PKG_LIBNAME="prosystem_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="PROSYSTEM_LIB" makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-quicknes/package.mk b/packages/emulation/libretro-quicknes/package.mk index f86c150a97..bba5852be8 100644 --- a/packages/emulation/libretro-quicknes/package.mk +++ b/packages/emulation/libretro-quicknes/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="55d47ca526e7d8585e321b9d99cc2ac3796bd230" PKG_SHA256="463ba5a604df399286b2b8a092a9933e3633e96ec01e177a5027f6907176748f" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/QuickNES_Core" -PKG_URL="https://github.com/libretro/QuickNES_Core/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/QuickNES_Core/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.quicknes: QuickNES for Kodi" PKG_LIBNAME="quicknes_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="QUICKNES_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-reicast/package.mk b/packages/emulation/libretro-reicast/package.mk index a9be208bd2..4c68fd4b48 100644 --- a/packages/emulation/libretro-reicast/package.mk +++ b/packages/emulation/libretro-reicast/package.mk @@ -6,24 +6,24 @@ PKG_VERSION="9d6f80ee347f99a7a8162032de59834e03b64016" PKG_SHA256="94b20bb11d17b987a15a06f67cd87ae8957c6c1a71b07c1cbc2bceb045226d4c" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/reicast-emulator" -PKG_URL="https://github.com/libretro/reicast-emulator/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/reicast-emulator/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="Reicast is a multiplatform Sega Dreamcast emulator" PKG_LIBNAME="reicast_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="REICAST_LIB" make_target() { - if [ "$DEVICE" = "RPi2" ]; then + if [ "${DEVICE}" = "RPi2" ]; then make platform=${DEVICE,,} else - case $TARGET_CPU in + case ${TARGET_CPU} in arm1176jzf-s) make platform=arm FORCE_GLES=1 ;; cortex-a7|cortex-a9) - make platform=armv7-neon-hardfloat-$TARGET_CPU FORCE_GLES=1 + make platform=armv7-neon-hardfloat-${TARGET_CPU} FORCE_GLES=1 ;; x86-64) make @@ -33,7 +33,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-sameboy/package.mk b/packages/emulation/libretro-sameboy/package.mk index 17bede0d13..3795f90ce4 100644 --- a/packages/emulation/libretro-sameboy/package.mk +++ b/packages/emulation/libretro-sameboy/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="699dcd7d16ad0ed35ad727e18bb53d6bf4b091ca" PKG_SHA256="f5dc6d62494f88ee20ad24af52079a8ac595a34703d2097341b828bb19dd625f" PKG_LICENSE="MIT" PKG_SITE="https://github.com/libretro/sameboy" -PKG_URL="https://github.com/libretro/sameboy/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/sameboy/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="libretro wrapper for SameBoy emulator." PKG_LIBNAME="sameboy_libretro.so" -PKG_LIBPATH="libretro/$PKG_LIBNAME" +PKG_LIBPATH="libretro/${PKG_LIBNAME}" PKG_LIBVAR="SAMEBOY_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-scummvm/package.mk b/packages/emulation/libretro-scummvm/package.mk index bea86c6872..da5599834f 100644 --- a/packages/emulation/libretro-scummvm/package.mk +++ b/packages/emulation/libretro-scummvm/package.mk @@ -6,26 +6,26 @@ PKG_VERSION="7b1e9299057a01a1defad6dbae4bdbeed36aa767" PKG_SHA256="a2dd4c2913c88fd2f0f1ef8eb5d84734d86c3a73313e734380a95ae6b8e2de9b" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/scummvm" -PKG_URL="https://github.com/libretro/scummvm/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/scummvm/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.scummvm: scummvm for Kodi" PKG_TOOLCHAIN="make" PKG_LIBNAME="scummvm_libretro.so" -PKG_LIBPATH="backends/platform/libretro/build/$PKG_LIBNAME" +PKG_LIBPATH="backends/platform/libretro/build/${PKG_LIBNAME}" PKG_LIBVAR="SCUMMVM_LIB" PKG_MAKE_OPTS_TARGET="-C backends/platform/libretro/build/" pre_make_target() { - cd $PKG_BUILD + cd ${PKG_BUILD} CXXFLAGS+=" -DHAVE_POSIX_MEMALIGN=1" export AR+=" cru" - export LD="$CC" + export LD="${CC}" } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-snes9x/package.mk b/packages/emulation/libretro-snes9x/package.mk index 73d72f19fe..0ac7dc557e 100644 --- a/packages/emulation/libretro-snes9x/package.mk +++ b/packages/emulation/libretro-snes9x/package.mk @@ -6,13 +6,13 @@ PKG_VERSION="975aecb88830e6719e267e38144da47eb707fbac" PKG_SHA256="caa4fa80eac5a873452b980865103dd96a90779392e84d0cdcdfadd35fc89cb6" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/snes9x" -PKG_URL="https://github.com/libretro/snes9x/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/snes9x/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.snes9x: snes9x for Kodi" PKG_TOOLCHAIN="manual" PKG_LIBNAME="snes9x_libretro.so" -PKG_LIBPATH="libretro/$PKG_LIBNAME" +PKG_LIBPATH="libretro/${PKG_LIBNAME}" PKG_LIBVAR="SNES9X_LIB" make_target() { @@ -20,7 +20,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-snes9x2002/package.mk b/packages/emulation/libretro-snes9x2002/package.mk index 9ce928f5ac..12196f6bb1 100644 --- a/packages/emulation/libretro-snes9x2002/package.mk +++ b/packages/emulation/libretro-snes9x2002/package.mk @@ -7,20 +7,20 @@ PKG_SHA256="7b505900ab3a46bc7c9de76c0e564589978be63f391a51cff046f8b49e84c7f2" PKG_ARCH="arm" PKG_LICENSE="GPL" PKG_SITE="https://github.com/libretro/snes9x2002" -PKG_URL="https://github.com/libretro/snes9x2002/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/snes9x2002/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="Port of SNES9x 1.39 for libretro. Heavily optimized for ARM." PKG_LIBNAME="snes9x2002_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="SNES9X2002_LIB" pre_make_target() { - export CFLAGS="$CFLAGS -std=gnu11" + export CFLAGS="${CFLAGS} -std=gnu11" } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-snes9x2010/package.mk b/packages/emulation/libretro-snes9x2010/package.mk index cca127dc85..bccfea52fd 100644 --- a/packages/emulation/libretro-snes9x2010/package.mk +++ b/packages/emulation/libretro-snes9x2010/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="5b70b056e27b360684869470a7143294865b7f05" PKG_SHA256="39b9af85d459730a0f292913ab26567dd95485ae33a8ec0294d224e6b4096b60" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/snes9x2010" -PKG_URL="https://github.com/libretro/snes9x2010/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/snes9x2010/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="snes9x2010 for Kodi" PKG_LIBNAME="snes9x2010_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="SNES9X2010_LIB" makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-stella/package.mk b/packages/emulation/libretro-stella/package.mk index 7dd3ae042b..b71f159707 100644 --- a/packages/emulation/libretro-stella/package.mk +++ b/packages/emulation/libretro-stella/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="b4b4cf3266ce6dc8ed891978761209272000009c" PKG_SHA256="c02a1708deb97450e25ae0c04c0c0fea17a19d51fa954f2308ca0cad637ae7a5" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/stella-libretro" -PKG_URL="https://github.com/libretro/stella-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/stella-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.stella: Stella for Kodi" PKG_LIBNAME="stella2014_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="STELLA_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-tgbdual/package.mk b/packages/emulation/libretro-tgbdual/package.mk index e956a2994e..414be517b7 100644 --- a/packages/emulation/libretro-tgbdual/package.mk +++ b/packages/emulation/libretro-tgbdual/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="b1fd9280dc89733ecdfb45d7d24b65e5e30f74a5" PKG_SHA256="246dd68382a6b87be3001decbfef4c4ba6e9b209948ec22c7cf3ba94a5ddfd2f" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/tgbdual-libretro" -PKG_URL="https://github.com/libretro/tgbdual-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/tgbdual-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.tgbdual: tgbdual for Kodi" PKG_LIBNAME="tgbdual_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="TGBDUAL_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-tyrquake/package.mk b/packages/emulation/libretro-tyrquake/package.mk index 91e0b1a71f..b681dbef0e 100644 --- a/packages/emulation/libretro-tyrquake/package.mk +++ b/packages/emulation/libretro-tyrquake/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="d2c077f0d28f9b8e4e74032787efef57fc540996" PKG_SHA256="26330f2c6ce2f25ffe1644d8d86e0ed311754169f5a359ba5fbaf2b4ef716aef" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/tyrquake" -PKG_URL="https://github.com/libretro/tyrquake/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/tyrquake/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.tyrquake: tyrquake for Kodi" PKG_LIBNAME="tyrquake_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="TYRQUAKE_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-uae/package.mk b/packages/emulation/libretro-uae/package.mk index 4b0872ea4d..a5c281b5ef 100644 --- a/packages/emulation/libretro-uae/package.mk +++ b/packages/emulation/libretro-uae/package.mk @@ -6,24 +6,24 @@ PKG_VERSION="4e85b3df50dac612e4ea301dbb019b734b5ece6e" PKG_SHA256="95e402199e26e83f7cfcf4e6c8e709054f2ca5d2b662800a4b85f3c3bce21988" PKG_LICENSE="GPL" PKG_SITE="https://github.com/libretro/libretro-uae" -PKG_URL="https://github.com/libretro/libretro-uae/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/libretro-uae/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="libretro wrapper for UAE emulator." PKG_BUILD_FLAGS="-lto" PKG_LIBNAME="puae_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="UAE_LIB" pre_configure_target() { - CFLAGS="$CFLAGS -fcommon" - if [ "$TARGET_ARCH" = "arm" ]; then - CFLAGS="$CFLAGS -DARM -marm" + CFLAGS+=" -fcommon" + if [ "${TARGET_ARCH}" = "arm" ]; then + CFLAGS+=" -DARM -marm" fi } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-uae4arm/package.mk b/packages/emulation/libretro-uae4arm/package.mk index 28394b7e6a..1d0f915fca 100644 --- a/packages/emulation/libretro-uae4arm/package.mk +++ b/packages/emulation/libretro-uae4arm/package.mk @@ -7,17 +7,17 @@ PKG_SHA256="ccc989c75c11cbc1be96b917cadc3551b5fb8710f2a203f2ce86c46196229a4a" PKG_ARCH="arm" PKG_LICENSE="GPL" PKG_SITE="https://github.com/libretro/uae4arm-libretro" -PKG_URL="https://github.com/libretro/uae4arm-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/uae4arm-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain zlib" PKG_LONGDESC="UAE4ARM amiga emulator." PKG_LIBNAME="uae4arm_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="UAE4ARM_LIB" pre_configure_target() { if target_has_feature neon; then - CFLAGS="$CFLAGS -D__NEON_OPT" + CFLAGS+=" -D__NEON_OPT" fi } @@ -28,11 +28,11 @@ make_target() { PKG_HAVE_NEON=0 fi - make HAVE_NEON=$PKG_HAVE_NEON USE_PICASSO96=1 + make HAVE_NEON=${PKG_HAVE_NEON} USE_PICASSO96=1 } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-vba-next/package.mk b/packages/emulation/libretro-vba-next/package.mk index 265eec69c3..93f07b8625 100644 --- a/packages/emulation/libretro-vba-next/package.mk +++ b/packages/emulation/libretro-vba-next/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="15037175093511aab9a52e27f28989c6c6fdb674" PKG_SHA256="e72c17f1bfd1dabe955a0b59d9d15ef5469a4f54c0527f4320a5572aed220248" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/vba-next" -PKG_URL="https://github.com/libretro/vba-next/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/vba-next/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.vba-next: VBA-Next for Kodi" PKG_LIBNAME="vba_next_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="VBA-NEXT_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-vbam/package.mk b/packages/emulation/libretro-vbam/package.mk index 357b395962..021c106d2c 100644 --- a/packages/emulation/libretro-vbam/package.mk +++ b/packages/emulation/libretro-vbam/package.mk @@ -6,19 +6,19 @@ PKG_VERSION="26e9a6e3d91fce2380ef128bf23e52fb3be2bce1" PKG_SHA256="d5ae8a518b413a7263b8bb2c5a1e282ea6168eeea1de3075db1e26333d847e22" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/vbam-libretro" -PKG_URL="https://github.com/libretro/vbam-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/vbam-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.vbam: VBA-M for Kodi" PKG_TOOLCHAIN="make" PKG_LIBNAME="vbam_libretro.so" -PKG_LIBPATH="src/libretro/$PKG_LIBNAME" +PKG_LIBPATH="src/libretro/${PKG_LIBNAME}" PKG_LIBVAR="VBAM_LIB" pre_configure_target() { # fails to build in subdirs - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} } make_target() { @@ -26,7 +26,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-vecx/package.mk b/packages/emulation/libretro-vecx/package.mk index 72ec6156ed..4b8c81d09c 100644 --- a/packages/emulation/libretro-vecx/package.mk +++ b/packages/emulation/libretro-vecx/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="7f8d42e0f5e891997afa72a639dbcc0f3be710c6" PKG_SHA256="ca151780c41b687056c7a1a4616516846e8a174dd6a561653296cb2a5b854fb1" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/libretro-vecx" -PKG_URL="https://github.com/libretro/libretro-vecx/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/libretro-vecx/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.vecx: vecx for Kodi" PKG_LIBNAME="vecx_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="VECX_LIB" make_target() { @@ -19,7 +19,7 @@ make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-vice/package.mk b/packages/emulation/libretro-vice/package.mk index 95ddaaf19d..e5ff604345 100644 --- a/packages/emulation/libretro-vice/package.mk +++ b/packages/emulation/libretro-vice/package.mk @@ -6,24 +6,24 @@ PKG_VERSION="ba666e1d5ef0fbfd8f569ea446fbda831bf03c9a" PKG_SHA256="5cde31a1ba3ecc05217781572c4ed9a7f47816f71ce16723b21458d5ac4905ba" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/vice-libretro" -PKG_URL="https://github.com/libretro/vice-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/vice-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="VICE C64 libretro" PKG_LIBNAME="vice_x64_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="VICE_LIB" pre_build_target() { - export GIT_VERSION=$PKG_VERSION + export GIT_VERSION=${PKG_VERSION} } make_target() { - make -f Makefile.libretro CC=$CC + make -f Makefile.libretro CC=${CC} } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-virtualjaguar/package.mk b/packages/emulation/libretro-virtualjaguar/package.mk index 6d1ab49ffb..b44ebae3d9 100644 --- a/packages/emulation/libretro-virtualjaguar/package.mk +++ b/packages/emulation/libretro-virtualjaguar/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="575371decc78b186273146126140268c3efb7ce4" PKG_SHA256="110933269a6f6e607101399c8c70a9a990d3f0d9c2d53b9daab5ec398360f80e" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/libretro/virtualjaguar-libretro" -PKG_URL="https://github.com/libretro/virtualjaguar-libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/virtualjaguar-libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="Port of Virtual Jaguar to Libretro" PKG_LIBNAME="virtualjaguar_libretro.so" -PKG_LIBPATH="$PKG_LIBNAME" +PKG_LIBPATH="${PKG_LIBNAME}" PKG_LIBVAR="VIRTUALJAGUAR_LIB" makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-vram-test/package.mk b/packages/emulation/libretro-vram-test/package.mk index b65f518f7b..bda84fc1a8 100644 --- a/packages/emulation/libretro-vram-test/package.mk +++ b/packages/emulation/libretro-vram-test/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="6b90ce965b08cc1d6a94b4f3916b5114167db498" PKG_SHA256="2bd1b3af783a028355eb4b4c416f09802313a9a69759e716377b55012f7bb4ae" PKG_LICENSE="MIT" PKG_SITE="https://github.com/libretro/libretro-samples" -PKG_URL="https://github.com/libretro/libretro-samples/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/libretro-samples/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="VRAM Test from libretro" PKG_TOOLCHAIN="manual" @@ -15,16 +15,16 @@ PKG_LIBNAME="testsw_vram_libretro.so" PKG_LIBVAR="VRAM-TEST_LIB" configure_package() { - PKG_LIBPATH="$PKG_BUILD/video/software/rendering_direct_to_vram/$PKG_LIBNAME" + PKG_LIBPATH="${PKG_BUILD}/video/software/rendering_direct_to_vram/${PKG_LIBNAME}" } make_target() { - cd $PKG_BUILD/video/software/rendering_direct_to_vram + cd ${PKG_BUILD}/video/software/rendering_direct_to_vram make } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } diff --git a/packages/emulation/libretro-yabause/package.mk b/packages/emulation/libretro-yabause/package.mk index 64c9e7ab2f..58e0df78d9 100644 --- a/packages/emulation/libretro-yabause/package.mk +++ b/packages/emulation/libretro-yabause/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="f515e5a49336195c61b751e539aadae72fbe0aa7" PKG_SHA256="c76134a37e6cb1e20579b257ce8b119f6edde64a080db7320f81d076db5fcd74" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/libretro/yabause" -PKG_URL="https://github.com/libretro/yabause/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libretro/yabause/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_LONGDESC="game.libretro.yabause: Yabause for Kodi" PKG_TOOLCHAIN="make" @@ -32,8 +32,8 @@ pre_make_target() { } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME - cp $PKG_LIBPATH $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME - echo "set($PKG_LIBVAR $SYSROOT_PREFIX/usr/lib/$PKG_LIBNAME)" > $SYSROOT_PREFIX/usr/lib/cmake/$PKG_NAME/$PKG_NAME-config.cmake + mkdir -p ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME} + cp ${PKG_LIBPATH} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME} + echo "set(${PKG_LIBVAR} ${SYSROOT_PREFIX}/usr/lib/${PKG_LIBNAME})" > ${SYSROOT_PREFIX}/usr/lib/cmake/${PKG_NAME}/${PKG_NAME}-config.cmake } From dc28cd2250dbecef19ab5b113c3e637538e66422 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:33:55 +0000 Subject: [PATCH 08/27] graphics: automated code cleanup Signed-off-by: Ian Leonard --- packages/graphics/bcm2835-driver/package.mk | 8 ++++---- packages/graphics/ftgl/package.mk | 4 ++-- packages/graphics/giflib/package.mk | 2 +- packages/graphics/glew/package.mk | 18 ++++++++--------- packages/graphics/glm/package.mk | 2 +- packages/graphics/glmark2/package.mk | 10 +++++----- packages/graphics/harfbuzz/package.mk | 2 +- packages/graphics/kmscube/package.mk | 6 +++--- packages/graphics/lcms2/package.mk | 2 +- packages/graphics/libde265/package.mk | 2 +- packages/graphics/libglvnd/package.mk | 2 +- packages/graphics/libheif/package.mk | 2 +- packages/graphics/libjpeg-turbo/package.mk | 6 +++--- packages/graphics/libmali/package.mk | 22 ++++++++++----------- packages/graphics/libpng/package.mk | 12 +++++------ packages/graphics/libprojectM/package.mk | 4 ++-- packages/graphics/libraw/package.mk | 2 +- packages/graphics/soil/package.mk | 6 +++--- packages/graphics/tiff/package.mk | 8 ++++---- 19 files changed, 60 insertions(+), 60 deletions(-) diff --git a/packages/graphics/bcm2835-driver/package.mk b/packages/graphics/bcm2835-driver/package.mk index 8ab7ae155a..6b86d2c000 100644 --- a/packages/graphics/bcm2835-driver/package.mk +++ b/packages/graphics/bcm2835-driver/package.mk @@ -23,17 +23,17 @@ makeinstall_target() { # Install vendor header files except proprietary GL headers mkdir -p ${SYSROOT_PREFIX}/usr/include for f in $(cd ${PKG_FLOAT}/opt/vc/include; ls | grep -v "GL"); do - cp -PRv ${PKG_FLOAT}/opt/vc/include/$f ${SYSROOT_PREFIX}/usr/include + cp -PRv ${PKG_FLOAT}/opt/vc/include/${f} ${SYSROOT_PREFIX}/usr/include done # Install vendor libs & pkgconfigs except proprietary GL libs mkdir -p ${SYSROOT_PREFIX}/usr/lib for f in $(cd ${PKG_FLOAT}/opt/vc/lib; ls *.so *.a | grep -Ev "^lib(EGL|GL)"); do - cp -PRv ${PKG_FLOAT}/opt/vc/lib/$f ${SYSROOT_PREFIX}/usr/lib + cp -PRv ${PKG_FLOAT}/opt/vc/lib/${f} ${SYSROOT_PREFIX}/usr/lib done mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig for f in $(cd ${PKG_FLOAT}/opt/vc/lib/pkgconfig; ls | grep -v "gl"); do - cp -PRv ${PKG_FLOAT}/opt/vc/lib/pkgconfig/$f ${SYSROOT_PREFIX}/usr/lib/pkgconfig + cp -PRv ${PKG_FLOAT}/opt/vc/lib/pkgconfig/${f} ${SYSROOT_PREFIX}/usr/lib/pkgconfig done # Update prefix in vendor pkgconfig files @@ -49,7 +49,7 @@ makeinstall_target() { # Install vendor libs except proprietary GL mkdir -p ${INSTALL}/usr/lib for f in $(cd ${PKG_FLOAT}/opt/vc/lib; ls *.so | grep -Ev "^lib(EGL|GL)"); do - cp -PRv ${PKG_FLOAT}/opt/vc/lib/$f ${INSTALL}/usr/lib + cp -PRv ${PKG_FLOAT}/opt/vc/lib/${f} ${INSTALL}/usr/lib done # Install useful tools diff --git a/packages/graphics/ftgl/package.mk b/packages/graphics/ftgl/package.mk index 9e89044afb..a431490059 100644 --- a/packages/graphics/ftgl/package.mk +++ b/packages/graphics/ftgl/package.mk @@ -6,8 +6,8 @@ PKG_VERSION="2.1.2" PKG_SHA256="0f61d978c28cd5d78daded591f5b03f71248c0a51c7965733e8729c874265f50" PKG_LICENSE="GPL" PKG_SITE="http://sourceforge.net/projects/ftgl/" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain freetype" PKG_LONGDESC="a free cross-platform Open Source C++ library that uses Freetype2 to simplify rendering fonts in OpenGL applications" -PKG_CMAKE_OPTS_TARGET="-DOUTPUT_DIR=$SYSROOT_PREFIX/usr" +PKG_CMAKE_OPTS_TARGET="-DOUTPUT_DIR=${SYSROOT_PREFIX}/usr" diff --git a/packages/graphics/giflib/package.mk b/packages/graphics/giflib/package.mk index f424b10df7..f0f4440e1a 100644 --- a/packages/graphics/giflib/package.mk +++ b/packages/graphics/giflib/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="5.2.1" PKG_SHA256="31da5562f44c5f15d63340a09a4fd62b48c45620cd302f77a6d9acf0077879bd" PKG_LICENSE="OSS" PKG_SITE="http://giflib.sourceforge.net/" -PKG_URL="$SOURCEFORGE_SRC/giflib/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="${SOURCEFORGE_SRC}/giflib/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="zlib:host" PKG_DEPENDS_TARGET="toolchain zlib" PKG_LONGDESC="giflib: giflib service library" diff --git a/packages/graphics/glew/package.mk b/packages/graphics/glew/package.mk index 276d48edf6..3a23c8c17e 100644 --- a/packages/graphics/glew/package.mk +++ b/packages/graphics/glew/package.mk @@ -7,23 +7,23 @@ PKG_VERSION="2.2.0" PKG_SHA256="d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1" PKG_LICENSE="BSD" PKG_SITE="http://glew.sourceforge.net/" -PKG_URL="$SOURCEFORGE_SRC/glew/glew/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tgz" +PKG_URL="${SOURCEFORGE_SRC}/glew/glew/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tgz" PKG_DEPENDS_TARGET="toolchain libX11" PKG_LONGDESC="A cross-platform C/C++ extension loading library." make_target() { - make CC="$CC" LD="$CC" AR="$AR" \ - POPT="$CFLAGS" LDFLAGS.EXTRA="$LDFLAGS" \ + make CC="${CC}" LD="${CC}" AR="${AR}" \ + POPT="${CFLAGS}" LDFLAGS.EXTRA="${LDFLAGS}" \ GLEW_DEST="/usr" LIBDIR="/usr/lib" lib/libGLEW.a glew.pc } makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib - cp -PR lib/libGLEW.a $SYSROOT_PREFIX/usr/lib + mkdir -p ${SYSROOT_PREFIX}/usr/lib + cp -PR lib/libGLEW.a ${SYSROOT_PREFIX}/usr/lib - mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig - cp -PR glew.pc $SYSROOT_PREFIX/usr/lib/pkgconfig + mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig + cp -PR glew.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig - mkdir -p $SYSROOT_PREFIX/usr/include - cp -PR include/GL $SYSROOT_PREFIX/usr/include + mkdir -p ${SYSROOT_PREFIX}/usr/include + cp -PR include/GL ${SYSROOT_PREFIX}/usr/include } diff --git a/packages/graphics/glm/package.mk b/packages/graphics/glm/package.mk index 2a21c3d7c1..8ec1526d34 100644 --- a/packages/graphics/glm/package.mk +++ b/packages/graphics/glm/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.9.9.8" PKG_SHA256="37e2a3d62ea3322e43593c34bae29f57e3e251ea89f4067506c94043769ade4c" PKG_LICENSE="MIT" PKG_SITE="https://glm.g-truc.net/" -PKG_URL="https://github.com/g-truc/glm/releases/download/$PKG_VERSION/glm-$PKG_VERSION.zip" +PKG_URL="https://github.com/g-truc/glm/releases/download/${PKG_VERSION}/glm-${PKG_VERSION}.zip" PKG_SOURCE_DIR="glm" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="OpenGL Mathematics (GLM)" diff --git a/packages/graphics/glmark2/package.mk b/packages/graphics/glmark2/package.mk index 5979563aa8..fc40d215f7 100644 --- a/packages/graphics/glmark2/package.mk +++ b/packages/graphics/glmark2/package.mk @@ -6,15 +6,15 @@ PKG_VERSION="dab3e7d8ab185a59e7475845d189f9a2d7d67ad0" PKG_SHA256="01dc8adb82ae01e248e3d16f7510356bae87900e119089f7402e4915824fcd75" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/glmark2/glmark2" -PKG_URL="https://github.com/glmark2/glmark2/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/glmark2/glmark2/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="glmark2 is an OpenGL 2.0 and ES 2.0 benchmark" -if [ "$OPENGLES_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET+=" $OPENGLES" +if [ "${OPENGLES_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" PKG_MESON_OPTS_TARGET="-Dflavors=drm-glesv2" -elif [ "$OPENGL_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET+=" $OPENGL" +elif [ "${OPENGL_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL}" PKG_MESON_OPTS_TARGET="-Dflavors=drm-gl" fi diff --git a/packages/graphics/harfbuzz/package.mk b/packages/graphics/harfbuzz/package.mk index 593114e8fc..9f78b8fe42 100644 --- a/packages/graphics/harfbuzz/package.mk +++ b/packages/graphics/harfbuzz/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.7.4" PKG_SHA256="6ad11d653347bd25d8317589df4e431a2de372c0cf9be3543368e07ec23bb8e7" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/HarfBuzz" -PKG_URL="https://github.com/harfbuzz/harfbuzz/releases/download/$PKG_VERSION/harfbuzz-$PKG_VERSION.tar.xz" +PKG_URL="https://github.com/harfbuzz/harfbuzz/releases/download/${PKG_VERSION}/harfbuzz-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain cairo freetype glib" PKG_LONGDESC="HarfBuzz is an OpenType text shaping engine." PKG_TOOLCHAIN="meson" diff --git a/packages/graphics/kmscube/package.mk b/packages/graphics/kmscube/package.mk index 81c83cdc6d..a0633da090 100644 --- a/packages/graphics/kmscube/package.mk +++ b/packages/graphics/kmscube/package.mk @@ -10,9 +10,9 @@ PKG_URL="https://gitlab.freedesktop.org/mesa/kmscube/-/archive/master/kmscube-${ PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Example KMS/GBM/EGL application" -if [ "$OPENGLES_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET+=" $OPENGLES" -elif [ "$OPENGL_SUPPORT" = "yes" ]; then +if [ "${OPENGLES_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" +elif [ "${OPENGL_SUPPORT}" = "yes" ]; then echo "kmscube only supports OpenGLESv2" exit 0 fi diff --git a/packages/graphics/lcms2/package.mk b/packages/graphics/lcms2/package.mk index d81b246213..45c413a9c1 100644 --- a/packages/graphics/lcms2/package.mk +++ b/packages/graphics/lcms2/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="2.11" PKG_SHA256="dc49b9c8e4d7cdff376040571a722902b682a795bf92985a85b48854c270772e" PKG_LICENSE="MIT/GPLv3" PKG_SITE="http://www.littlecms.com" -PKG_URL="$SOURCEFORGE_SRC/lcms/lcms/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" +PKG_URL="${SOURCEFORGE_SRC}/lcms/lcms/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain tiff" PKG_LONGDESC="An small-footprint color management engine, with special focus on accuracy and performance." diff --git a/packages/graphics/libde265/package.mk b/packages/graphics/libde265/package.mk index 5774811272..c8bee4664d 100644 --- a/packages/graphics/libde265/package.mk +++ b/packages/graphics/libde265/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.0.8" PKG_SHA256="24c791dd334fa521762320ff54f0febfd3c09fc978880a8c5fbc40a88f21d905" PKG_LICENSE="LGPLv3" PKG_SITE="http://www.libde265.org" -PKG_URL="https://github.com/strukturag/libde265/releases/download/v${PKG_VERSION}/${PKG_NAME}-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/strukturag/libde265/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Open h.265 video codec implementation." PKG_BUILD_FLAGS="+pic" diff --git a/packages/graphics/libglvnd/package.mk b/packages/graphics/libglvnd/package.mk index 577283aba6..f17ac56975 100644 --- a/packages/graphics/libglvnd/package.mk +++ b/packages/graphics/libglvnd/package.mk @@ -11,7 +11,7 @@ PKG_DEPENDS_TARGET="toolchain libX11 libXext xorgproto" PKG_LONGDESC="libglvnd is a vendor-neutral dispatch layer for arbitrating OpenGL API calls between multiple vendors." PKG_TOOLCHAIN="autotools" -if [ "$OPENGLES_SUPPORT" = "no" ]; then +if [ "${OPENGLES_SUPPORT}" = "no" ]; then PKG_CONFIGURE_OPTS_TARGET+=" --disable-gles" fi diff --git a/packages/graphics/libheif/package.mk b/packages/graphics/libheif/package.mk index f206c573a7..471c57da19 100644 --- a/packages/graphics/libheif/package.mk +++ b/packages/graphics/libheif/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.10.0" PKG_SHA256="ad5af1276f341277dc537b0d19a4193e0833c247b2aacb936e0c5494141533ae" PKG_LICENSE="LGPLv3" PKG_SITE="http://www.libde265.org" -PKG_URL="https://github.com/strukturag/libheif/releases/download/v$PKG_VERSION/libheif-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/strukturag/libheif/releases/download/v${PKG_VERSION}/libheif-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libde265 libjpeg-turbo libpng" PKG_LONGDESC="A HEIF file format decoder and encoder." PKG_BUILD_FLAGS="+pic" diff --git a/packages/graphics/libjpeg-turbo/package.mk b/packages/graphics/libjpeg-turbo/package.mk index 5da47cd936..35d0940b7f 100644 --- a/packages/graphics/libjpeg-turbo/package.mk +++ b/packages/graphics/libjpeg-turbo/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.0.6" PKG_SHA256="005aee2fcdca252cee42271f7f90574dda64ca6505d9f8b86ae61abc2b426371" PKG_LICENSE="GPL" PKG_SITE="https://libjpeg-turbo.org/" -PKG_URL="https://github.com/libjpeg-turbo/libjpeg-turbo/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A high-speed version of libjpeg for x86 and x86-64 processors which uses SIMD." @@ -28,11 +28,11 @@ else PKG_CMAKE_OPTS_TARGET+=" -DWITH_SIMD=OFF" fi -if [ $TARGET_ARCH = "x86_64" ]; then +if [ ${TARGET_ARCH} = "x86_64" ]; then PKG_DEPENDS_HOST+=" nasm:host" PKG_DEPENDS_TARGET+=" nasm:host" fi post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/graphics/libmali/package.mk b/packages/graphics/libmali/package.mk index 9bec5dd7a3..18dc6356a1 100644 --- a/packages/graphics/libmali/package.mk +++ b/packages/graphics/libmali/package.mk @@ -7,32 +7,32 @@ PKG_SHA256="4f2103fc927cc006ee5c9b647e899f50b0dcaeee127fec713387d06a333eb404" PKG_ARCH="arm aarch64" PKG_LICENSE="nonfree" PKG_SITE="https://github.com/LibreELEC/libmali" -PKG_URL="https://github.com/LibreELEC/libmali/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/LibreELEC/libmali/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="OpenGL ES user-space binary for the ARM Mali GPU family" -PKG_STAMP="$MALI_FAMILY" +PKG_STAMP="${MALI_FAMILY}" PKG_DEPENDS_TARGET="libdrm" -if listcontains "$MALI_FAMILY" "(t620|t720)"; then +if listcontains "${MALI_FAMILY}" "(t620|t720)"; then PKG_DEPENDS_TARGET+=" wayland" fi -listcontains "$MALI_FAMILY" "4[0-9]+" && PKG_DEPENDS_TARGET+=" mali-utgard" -listcontains "$MALI_FAMILY" "t[0-9]+" && PKG_DEPENDS_TARGET+=" mali-midgard" -listcontains "$MALI_FAMILY" "g[0-9]+" && PKG_DEPENDS_TARGET+=" mali-bifrost" +listcontains "${MALI_FAMILY}" "4[0-9]+" && PKG_DEPENDS_TARGET+=" mali-utgard" +listcontains "${MALI_FAMILY}" "t[0-9]+" && PKG_DEPENDS_TARGET+=" mali-midgard" +listcontains "${MALI_FAMILY}" "g[0-9]+" && PKG_DEPENDS_TARGET+=" mali-bifrost" PKG_CMAKE_OPTS_TARGET="-DMALI_VARIANT=${MALI_FAMILY// /;}" -if [ "$TARGET_ARCH" = "aarch64" ]; then +if [ "${TARGET_ARCH}" = "aarch64" ]; then PKG_CMAKE_OPTS_TARGET+=" -DMALI_ARCH=aarch64-linux-gnu" fi post_makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -v $PKG_DIR/scripts/libmali-setup $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -v ${PKG_DIR}/scripts/libmali-setup ${INSTALL}/usr/bin - if [ $(ls -1q $INSTALL/usr/lib/libmali-*.so | wc -l) -gt 1 ]; then - ln -sfv /var/lib/libmali/libmali.so $INSTALL/usr/lib/libmali.so + if [ $(ls -1q ${INSTALL}/usr/lib/libmali-*.so | wc -l) -gt 1 ]; then + ln -sfv /var/lib/libmali/libmali.so ${INSTALL}/usr/lib/libmali.so fi } diff --git a/packages/graphics/libpng/package.mk b/packages/graphics/libpng/package.mk index 3a34b002b8..cc2b9c8bd2 100644 --- a/packages/graphics/libpng/package.mk +++ b/packages/graphics/libpng/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.6.37" PKG_SHA256="505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca" PKG_LICENSE="LibPNG2" PKG_SITE="http://www.libpng.org/" -PKG_URL="$SOURCEFORGE_SRC/libpng/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="${SOURCEFORGE_SRC}/libpng/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="zlib:host" PKG_DEPENDS_TARGET="toolchain zlib" PKG_LONGDESC="An extensible file format for the lossless, portable, well-compressed storage of raster images." @@ -20,17 +20,17 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_lib_z_zlibVersion=yes \ PKG_CONFIGURE_OPTS_HOST="--enable-static --disable-shared" pre_configure_host() { - export CPPFLAGS="$CPPFLAGS -I$TOOLCHAIN/include" + export CPPFLAGS="${CPPFLAGS} -I${TOOLCHAIN}/include" } pre_configure_target() { - export CPPFLAGS="$CPPFLAGS -I$SYSROOT_PREFIX/usr/include" + export CPPFLAGS="${CPPFLAGS} -I${SYSROOT_PREFIX}/usr/include" } post_makeinstall_target() { - sed -e "s:\([\"'= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" \ + sed -e "s:\([\"'= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" \ -e "s:libs=\"-lpng16\":libs=\"-lpng16 -lz\":g" \ - -i $SYSROOT_PREFIX/usr/bin/libpng*-config + -i ${SYSROOT_PREFIX}/usr/bin/libpng*-config - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/graphics/libprojectM/package.mk b/packages/graphics/libprojectM/package.mk index aafa48885d..31864490ed 100644 --- a/packages/graphics/libprojectM/package.mk +++ b/packages/graphics/libprojectM/package.mk @@ -7,8 +7,8 @@ PKG_VERSION="3.1.7" PKG_SHA256="968551c5d6292179838bf5d3ab85f5bd785c6fec7c1de42c0cf5ec3dbf4b04f9" PKG_LICENSE="GPL" PKG_SITE="https://github.com/projectM-visualizer/projectm" -PKG_URL="https://github.com/projectM-visualizer/projectm/archive/v$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain freetype glm $OPENGL" +PKG_URL="https://github.com/projectM-visualizer/projectm/archive/v${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain freetype glm ${OPENGL}" PKG_LONGDESC="A MilkDrop compatible opensource music visualizer." PKG_TOOLCHAIN="configure" PKG_BUILD_FLAGS="+pic" diff --git a/packages/graphics/libraw/package.mk b/packages/graphics/libraw/package.mk index c7b48e8e26..15083c3b23 100644 --- a/packages/graphics/libraw/package.mk +++ b/packages/graphics/libraw/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.20.2" PKG_SHA256="dc1b486c2003435733043e4e05273477326e51c3ea554c6864a4eafaff1004a6" PKG_LICENSE="LGPL" PKG_SITE="http://www.libraw.org/" -PKG_URL="http://www.libraw.org/data/LibRaw-$PKG_VERSION.tar.gz" +PKG_URL="http://www.libraw.org/data/LibRaw-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libjpeg-turbo lcms2" PKG_LONGDESC="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" PKG_BUILD_FLAGS="+pic" diff --git a/packages/graphics/soil/package.mk b/packages/graphics/soil/package.mk index 1c6f5d87f0..2b8953120f 100644 --- a/packages/graphics/soil/package.mk +++ b/packages/graphics/soil/package.mk @@ -6,15 +6,15 @@ PKG_VERSION="1.16" PKG_SHA256="5f2d8a8c78e81d29df07f0f97c34fa2f75187bcadfdc7222cbd026859acaff2f" PKG_LICENSE="CCPL" PKG_SITE="http://www.lonesock.net/soil.html" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain mesa" PKG_LONGDESC="A tiny C lib primarily for loading textures into OpenGL" PKG_BUILD_FLAGS="+pic" pre_make_target() { - sed "s/1.07-20071110/$PKG_VERSION/" -i Makefile + sed "s/1.07-20071110/${PKG_VERSION}/" -i Makefile } pre_makeinstall_target() { - export DESTDIR=$SYSROOT_PREFIX + export DESTDIR=${SYSROOT_PREFIX} } diff --git a/packages/graphics/tiff/package.mk b/packages/graphics/tiff/package.mk index fd1e4271ec..0e81f5a21f 100644 --- a/packages/graphics/tiff/package.mk +++ b/packages/graphics/tiff/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="4.2.0" PKG_SHA256="eb0484e568ead8fa23b513e9b0041df7e327f4ee2d22db5a533929dfc19633cb" PKG_LICENSE="OSS" PKG_SITE="http://www.remotesensing.org/libtiff/" -PKG_URL="http://download.osgeo.org/libtiff/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://download.osgeo.org/libtiff/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libjpeg-turbo zlib" PKG_LONGDESC="libtiff is a library for reading and writing TIFF files." PKG_BUILD_FLAGS="+pic" @@ -21,10 +21,10 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-zstd \ --disable-webp \ --enable-cxx \ - --with-jpeg-lib-dir=$SYSROOT_PREFIX/usr/lib \ - --with-jpeg-include-dir=$SYSROOT_PREFIX/usr/include \ + --with-jpeg-lib-dir=${SYSROOT_PREFIX}/usr/lib \ + --with-jpeg-include-dir=${SYSROOT_PREFIX}/usr/include \ --without-x" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } From 3087041cd06ff773063bee102b45425fa5500ddf Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:33:55 +0000 Subject: [PATCH 09/27] lang: automated code cleanup Signed-off-by: Ian Leonard --- packages/lang/Python3/package.mk | 54 ++++++++--------- .../lang/gcc-arm-aarch64-none-elf/package.mk | 10 ++-- .../gcc-arm-aarch64-none-linux-gnu/package.mk | 10 ++-- .../package.mk | 10 ++-- packages/lang/gcc-or1k-linux/package.mk | 10 ++-- packages/lang/gcc/package.mk | 60 +++++++++---------- packages/lang/llvm/package.mk | 30 +++++----- 7 files changed, 92 insertions(+), 92 deletions(-) diff --git a/packages/lang/Python3/package.mk b/packages/lang/Python3/package.mk index e2bf5e9d56..2f6b0acda3 100644 --- a/packages/lang/Python3/package.mk +++ b/packages/lang/Python3/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="3.8.7" PKG_SHA256="ddcc1df16bb5b87aa42ec5d20a5b902f2d088caa269b28e01590f97a798ec50a" PKG_LICENSE="OSS" PKG_SITE="http://www.python.org/" -PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/${PKG_NAME::-1}-$PKG_VERSION.tar.xz" +PKG_URL="http://www.python.org/ftp/python/${PKG_VERSION}/${PKG_NAME::-1}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="zlib:host bzip2:host libffi:host util-linux:host xz:host" PKG_DEPENDS_TARGET="toolchain Python3:host sqlite expat zlib bzip2 xz openssl libffi readline ncurses util-linux" PKG_LONGDESC="Python3 is an interpreted object-oriented programming language." @@ -85,56 +85,56 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_prog_HAS_HG=/bin/false " pre_configure_host() { - export PYTHON_MODULES_INCLUDE="$HOST_INCDIR" - export PYTHON_MODULES_LIB="$HOST_LIBDIR" - export DISABLED_EXTENSIONS="readline _curses _curses_panel $PKG_PY_DISABLED_MODULES" + export PYTHON_MODULES_INCLUDE="${HOST_INCDIR}" + export PYTHON_MODULES_LIB="${HOST_LIBDIR}" + export DISABLED_EXTENSIONS="readline _curses _curses_panel ${PKG_PY_DISABLED_MODULES}" } post_make_host() { - # python distutils per default adds -L$LIBDIR when linking binary extensions - sed -e "s|^ 'LIBDIR':.*| 'LIBDIR': '/usr/lib',|g" -i $(find $PKG_BUILD/.$HOST_NAME -not -path '*/__pycache__/*' -name '_sysconfigdata__*.py') + # python distutils per default adds -L${LIBDIR} when linking binary extensions + sed -e "s|^ 'LIBDIR':.*| 'LIBDIR': '/usr/lib',|g" -i $(find ${PKG_BUILD}/.${HOST_NAME} -not -path '*/__pycache__/*' -name '_sysconfigdata__*.py') } post_makeinstall_host() { - ln -sf $PKG_PYTHON_VERSION $TOOLCHAIN/bin/python + ln -sf ${PKG_PYTHON_VERSION} ${TOOLCHAIN}/bin/python - rm -f $TOOLCHAIN/bin/smtpd.py* - rm -f $TOOLCHAIN/bin/pyvenv - rm -f $TOOLCHAIN/bin/pydoc* + rm -f ${TOOLCHAIN}/bin/smtpd.py* + rm -f ${TOOLCHAIN}/bin/pyvenv + rm -f ${TOOLCHAIN}/bin/pydoc* - rm -fr $PKG_BUILD/.$HOST_NAME/build/temp.* + rm -fr ${PKG_BUILD}/.${HOST_NAME}/build/temp.* - cp $PKG_BUILD/Tools/scripts/reindent.py $TOOLCHAIN/lib/$PKG_PYTHON_VERSION + cp ${PKG_BUILD}/Tools/scripts/reindent.py ${TOOLCHAIN}/lib/${PKG_PYTHON_VERSION} } pre_configure_target() { - export PYTHON_MODULES_INCLUDE="$TARGET_INCDIR" - export PYTHON_MODULES_LIB="$TARGET_LIBDIR" - export DISABLED_EXTENSIONS="$PKG_PY_DISABLED_MODULES" + export PYTHON_MODULES_INCLUDE="${TARGET_INCDIR}" + export PYTHON_MODULES_LIB="${TARGET_LIBDIR}" + export DISABLED_EXTENSIONS="${PKG_PY_DISABLED_MODULES}" } post_makeinstall_target() { - ln -sf $PKG_PYTHON_VERSION $INSTALL/usr/bin/python + ln -sf ${PKG_PYTHON_VERSION} ${INSTALL}/usr/bin/python - rm -fr $PKG_BUILD/.$TARGET_NAME/build/temp.* + rm -fr ${PKG_BUILD}/.${TARGET_NAME}/build/temp.* - PKG_INSTALL_PATH_LIB=$INSTALL/usr/lib/$PKG_PYTHON_VERSION + PKG_INSTALL_PATH_LIB=${INSTALL}/usr/lib/${PKG_PYTHON_VERSION} for dir in config compiler sysconfigdata lib-dynload/sysconfigdata lib2to3/tests test; do - rm -rf $PKG_INSTALL_PATH_LIB/$dir + rm -rf ${PKG_INSTALL_PATH_LIB}/${dir} done - rm -rf $PKG_INSTALL_PATH_LIB/distutils/command/*.exe + rm -rf ${PKG_INSTALL_PATH_LIB}/distutils/command/*.exe - rm -rf $INSTALL/usr/bin/pyvenv - rm -rf $INSTALL/usr/bin/python*-config - rm -rf $INSTALL/usr/bin/smtpd.py $INSTALL/usr/bin/smtpd.py.* + rm -rf ${INSTALL}/usr/bin/pyvenv + rm -rf ${INSTALL}/usr/bin/python*-config + rm -rf ${INSTALL}/usr/bin/smtpd.py ${INSTALL}/usr/bin/smtpd.py.* - find $INSTALL -name '*.o' -delete + find ${INSTALL} -name '*.o' -delete - python_compile $PKG_INSTALL_PATH_LIB + python_compile ${PKG_INSTALL_PATH_LIB} # strip - chmod u+w $INSTALL/usr/lib/libpython*.so.* - debug_strip $INSTALL/usr + chmod u+w ${INSTALL}/usr/lib/libpython*.so.* + debug_strip ${INSTALL}/usr } diff --git a/packages/lang/gcc-arm-aarch64-none-elf/package.mk b/packages/lang/gcc-arm-aarch64-none-elf/package.mk index b3d396906e..fc74541c73 100644 --- a/packages/lang/gcc-arm-aarch64-none-elf/package.mk +++ b/packages/lang/gcc-arm-aarch64-none-elf/package.mk @@ -12,16 +12,16 @@ PKG_LONGDESC="ARM Aarch64 GNU Linux Binary Toolchain" PKG_TOOLCHAIN="manual" makeinstall_host() { - mkdir -p $TOOLCHAIN/lib/gcc-arm-aarch64-none-elf/ - cp -a * $TOOLCHAIN/lib/gcc-arm-aarch64-none-elf + mkdir -p ${TOOLCHAIN}/lib/gcc-arm-aarch64-none-elf/ + cp -a * ${TOOLCHAIN}/lib/gcc-arm-aarch64-none-elf # wrap gcc and g++ with ccache like in gcc package.mk - PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-aarch64-none-elf/bin/aarch64-none-elf-" + PKG_GCC_PREFIX="${TOOLCHAIN}/lib/gcc-arm-aarch64-none-elf/bin/aarch64-none-elf-" cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real" cat > "${PKG_GCC_PREFIX}gcc" << EOF #!/bin/sh -$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@" +${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@" EOF chmod +x "${PKG_GCC_PREFIX}gcc" @@ -29,7 +29,7 @@ EOF cp "${PKG_GCC_PREFIX}g++" "${PKG_GCC_PREFIX}g++.real" cat > "${PKG_GCC_PREFIX}g++" << EOF #!/bin/sh -$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@" +${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@" EOF chmod +x "${PKG_GCC_PREFIX}g++" diff --git a/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk b/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk index e8d85f1030..3c555809a4 100644 --- a/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk +++ b/packages/lang/gcc-arm-aarch64-none-linux-gnu/package.mk @@ -12,16 +12,16 @@ PKG_LONGDESC="ARM Aarch64 GNU Linux Binary Toolchain" PKG_TOOLCHAIN="manual" makeinstall_host() { - mkdir -p $TOOLCHAIN/lib/gcc-arm-aarch64-none-linux-gnu/ - cp -a * $TOOLCHAIN/lib/gcc-arm-aarch64-none-linux-gnu + mkdir -p ${TOOLCHAIN}/lib/gcc-arm-aarch64-none-linux-gnu/ + cp -a * ${TOOLCHAIN}/lib/gcc-arm-aarch64-none-linux-gnu # wrap gcc and g++ with ccache like in gcc package.mk - PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-" + PKG_GCC_PREFIX="${TOOLCHAIN}/lib/gcc-arm-aarch64-none-linux-gnu/bin/aarch64-none-linux-gnu-" cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real" cat > "${PKG_GCC_PREFIX}gcc" << EOF #!/bin/sh -$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@" +${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@" EOF chmod +x "${PKG_GCC_PREFIX}gcc" @@ -29,7 +29,7 @@ EOF cp "${PKG_GCC_PREFIX}g++" "${PKG_GCC_PREFIX}g++.real" cat > "${PKG_GCC_PREFIX}g++" << EOF #!/bin/sh -$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@" +${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@" EOF chmod +x "${PKG_GCC_PREFIX}g++" diff --git a/packages/lang/gcc-arm-arm-none-linux-gnueabihf/package.mk b/packages/lang/gcc-arm-arm-none-linux-gnueabihf/package.mk index 40a20b403c..83edbc73d8 100644 --- a/packages/lang/gcc-arm-arm-none-linux-gnueabihf/package.mk +++ b/packages/lang/gcc-arm-arm-none-linux-gnueabihf/package.mk @@ -12,16 +12,16 @@ PKG_LONGDESC="ARM AArch32 GNU Linux Binary Toolchain" PKG_TOOLCHAIN="manual" makeinstall_host() { - mkdir -p $TOOLCHAIN/lib/gcc-arm-arm-none-linux-gnueabihf/ - cp -a * $TOOLCHAIN/lib/gcc-arm-arm-none-linux-gnueabihf + mkdir -p ${TOOLCHAIN}/lib/gcc-arm-arm-none-linux-gnueabihf/ + cp -a * ${TOOLCHAIN}/lib/gcc-arm-arm-none-linux-gnueabihf # wrap gcc and g++ with ccache like in gcc package.mk - PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-arm-arm-none-linux-gnueabihf/bin/arm-none-linux-gnueabihf-" + PKG_GCC_PREFIX="${TOOLCHAIN}/lib/gcc-arm-arm-none-linux-gnueabihf/bin/arm-none-linux-gnueabihf-" cp "${PKG_GCC_PREFIX}gcc" "${PKG_GCC_PREFIX}gcc.real" cat > "${PKG_GCC_PREFIX}gcc" << EOF #!/bin/sh -$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@" +${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}gcc.real "\$@" EOF chmod +x "${PKG_GCC_PREFIX}gcc" @@ -29,7 +29,7 @@ EOF cp "${PKG_GCC_PREFIX}g++" "${PKG_GCC_PREFIX}g++.real" cat > "${PKG_GCC_PREFIX}g++" << EOF #!/bin/sh -$TOOLCHAIN/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@" +${TOOLCHAIN}/bin/ccache ${PKG_GCC_PREFIX}g++.real "\$@" EOF chmod +x "${PKG_GCC_PREFIX}g++" diff --git a/packages/lang/gcc-or1k-linux/package.mk b/packages/lang/gcc-or1k-linux/package.mk index fa0f7ca9df..149a15a26e 100644 --- a/packages/lang/gcc-or1k-linux/package.mk +++ b/packages/lang/gcc-or1k-linux/package.mk @@ -12,16 +12,16 @@ PKG_LONGDESC="OpenRISC 1000 GNU Linux Binary Toolchain" PKG_TOOLCHAIN="manual" makeinstall_host() { - mkdir -p $TOOLCHAIN/lib/gcc-or1k-linux/ - cp -a * $TOOLCHAIN/lib/gcc-or1k-linux + mkdir -p ${TOOLCHAIN}/lib/gcc-or1k-linux/ + cp -a * ${TOOLCHAIN}/lib/gcc-or1k-linux # wrap gcc and g++ with ccache like in gcc package.mk - PKG_GCC_PREFIX="$TOOLCHAIN/lib/gcc-or1k-linux/bin/or1k-linux-" + PKG_GCC_PREFIX="${TOOLCHAIN}/lib/gcc-or1k-linux/bin/or1k-linux-" rm -f "${PKG_GCC_PREFIX}gcc" cat > "${PKG_GCC_PREFIX}gcc" << EOF #!/bin/sh -$TOOLCHAIN/bin/ccache $TOOLCHAIN/lib/gcc-or1k-linux/bin/or1k-buildroot-linux-musl-gcc "\$@" +${TOOLCHAIN}/bin/ccache ${TOOLCHAIN}/lib/gcc-or1k-linux/bin/or1k-buildroot-linux-musl-gcc "\$@" EOF chmod +x "${PKG_GCC_PREFIX}gcc" @@ -29,7 +29,7 @@ EOF rm -f "${PKG_GCC_PREFIX}g++" cat > "${PKG_GCC_PREFIX}g++" << EOF #!/bin/sh -$TOOLCHAIN/bin/ccache $TOOLCHAIN/lib/gcc-or1k-linux/bin/or1k-buildroot-linux-musl-g++ "\$@" +${TOOLCHAIN}/bin/ccache ${TOOLCHAIN}/lib/gcc-or1k-linux/bin/or1k-buildroot-linux-musl-g++ "\$@" EOF chmod +x "${PKG_GCC_PREFIX}g++" diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk index ece284298e..77f049c553 100644 --- a/packages/lang/gcc/package.mk +++ b/packages/lang/gcc/package.mk @@ -7,19 +7,19 @@ PKG_VERSION="10.2.0" PKG_SHA256="b8dd4368bb9c7f0b98188317ee0254dd8cc99d1e3a18d0ff146c855fe16c1d8c" PKG_LICENSE="GPL" PKG_SITE="http://gcc.gnu.org/" -PKG_URL="http://ftpmirror.gnu.org/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftpmirror.gnu.org/gcc/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_BOOTSTRAP="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host zstd:host" PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host zstd:host glibc" PKG_DEPENDS_INIT="toolchain" PKG_LONGDESC="This package contains the GNU Compiler Collection." -GCC_COMMON_CONFIGURE_OPTS="--target=$TARGET_NAME \ - --with-sysroot=$SYSROOT_PREFIX \ - --with-gmp=$TOOLCHAIN \ - --with-mpfr=$TOOLCHAIN \ - --with-mpc=$TOOLCHAIN \ - --with-zstd=$TOOLCHAIN \ +GCC_COMMON_CONFIGURE_OPTS="--target=${TARGET_NAME} \ + --with-sysroot=${SYSROOT_PREFIX} \ + --with-gmp=${TOOLCHAIN} \ + --with-mpfr=${TOOLCHAIN} \ + --with-mpc=${TOOLCHAIN} \ + --with-zstd=${TOOLCHAIN} \ --with-gnu-as \ --with-gnu-ld \ --enable-plugin \ @@ -43,7 +43,7 @@ GCC_COMMON_CONFIGURE_OPTS="--target=$TARGET_NAME \ --disable-libssp \ --enable-__cxa_atexit" -PKG_CONFIGURE_OPTS_BOOTSTRAP="$GCC_COMMON_CONFIGURE_OPTS \ +PKG_CONFIGURE_OPTS_BOOTSTRAP="${GCC_COMMON_CONFIGURE_OPTS} \ --enable-languages=c \ --disable-libsanitizer \ --enable-cloog-backend=isl \ @@ -52,9 +52,9 @@ PKG_CONFIGURE_OPTS_BOOTSTRAP="$GCC_COMMON_CONFIGURE_OPTS \ --without-headers \ --with-newlib \ --disable-decimal-float \ - $GCC_OPTS" + ${GCC_OPTS}" -PKG_CONFIGURE_OPTS_HOST="$GCC_COMMON_CONFIGURE_OPTS \ +PKG_CONFIGURE_OPTS_HOST="${GCC_COMMON_CONFIGURE_OPTS} \ --enable-languages=c,c++ \ --enable-decimal-float \ --enable-tls \ @@ -66,7 +66,7 @@ PKG_CONFIGURE_OPTS_HOST="$GCC_COMMON_CONFIGURE_OPTS \ --disable-libstdcxx-pch \ --enable-libstdcxx-time \ --enable-clocale=gnu \ - $GCC_OPTS" + ${GCC_OPTS}" pre_configure_host() { unset CPP @@ -74,20 +74,20 @@ pre_configure_host() { post_make_host() { # fix wrong link - rm -rf $TARGET_NAME/libgcc/libgcc_s.so - ln -sf libgcc_s.so.1 $TARGET_NAME/libgcc/libgcc_s.so + rm -rf ${TARGET_NAME}/libgcc/libgcc_s.so + ln -sf libgcc_s.so.1 ${TARGET_NAME}/libgcc/libgcc_s.so if [ ! "${BUILD_WITH_DEBUG}" = "yes" ]; then - ${TARGET_PREFIX}strip $TARGET_NAME/libgcc/libgcc_s.so* - ${TARGET_PREFIX}strip $TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* + ${TARGET_PREFIX}strip ${TARGET_NAME}/libgcc/libgcc_s.so* + ${TARGET_PREFIX}strip ${TARGET_NAME}/libstdc++-v3/src/.libs/libstdc++.so* fi } post_makeinstall_host() { - cp -PR $TARGET_NAME/libstdc++-v3/src/.libs/libstdc++.so* $SYSROOT_PREFIX/usr/lib + cp -PR ${TARGET_NAME}/libstdc++-v3/src/.libs/libstdc++.so* ${SYSROOT_PREFIX}/usr/lib - GCC_VERSION=`$TOOLCHAIN/bin/${TARGET_NAME}-gcc -dumpversion` - DATE="0501`echo $GCC_VERSION | sed 's/\./0/g'`" + GCC_VERSION=$(${TOOLCHAIN}/bin/${TARGET_NAME}-gcc -dumpversion) + DATE="0501$(echo ${GCC_VERSION} | sed 's/\./0/g')" CROSS_CC=${TARGET_PREFIX}gcc-${GCC_VERSION} CROSS_CXX=${TARGET_PREFIX}g++-${GCC_VERSION} @@ -95,29 +95,29 @@ post_makeinstall_host() { cat > ${TARGET_PREFIX}gcc < ${TARGET_PREFIX}g++ < Date: Tue, 19 Jan 2021 19:33:55 +0000 Subject: [PATCH 10/27] linux: automated code cleanup Signed-off-by: Ian Leonard --- packages/linux/package.mk | 236 +++++++++++++++++++------------------- 1 file changed, 118 insertions(+), 118 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 0f8382e434..fd607610e0 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -6,31 +6,31 @@ PKG_NAME="linux" PKG_LICENSE="GPL" PKG_SITE="http://www.kernel.org" PKG_DEPENDS_HOST="ccache:host rsync:host openssl:host" -PKG_DEPENDS_TARGET="toolchain linux:host kmod:host xz:host keyutils $KERNEL_EXTRA_DEPENDS_TARGET" -PKG_NEED_UNPACK="$LINUX_DEPENDS $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)" +PKG_DEPENDS_TARGET="toolchain linux:host kmod:host xz:host keyutils ${KERNEL_EXTRA_DEPENDS_TARGET}" +PKG_NEED_UNPACK="${LINUX_DEPENDS} $(get_pkg_directory initramfs) $(get_pkg_variable initramfs PKG_NEED_UNPACK)" PKG_LONGDESC="This package contains a precompiled kernel image and the modules." PKG_IS_KERNEL_PKG="yes" -PKG_STAMP="$KERNEL_TARGET $KERNEL_MAKE_EXTRACMD" +PKG_STAMP="${KERNEL_TARGET} ${KERNEL_MAKE_EXTRACMD}" -PKG_PATCH_DIRS="$LINUX" +PKG_PATCH_DIRS="${LINUX}" -case "$LINUX" in +case "${LINUX}" in amlogic) PKG_VERSION="7c53f6b671f4aba70ff15e1b05148b10d58c2837" # 5.11-rc3 PKG_SHA256="30206f178c9c151a0c387c7967800bc0bf89a893958241a3add0098d443f323a" - PKG_URL="https://github.com/torvalds/linux/archive/$PKG_VERSION.tar.gz" - PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" + PKG_URL="https://github.com/torvalds/linux/archive/${PKG_VERSION}.tar.gz" + PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; raspberrypi) PKG_VERSION="e9505f4612646533f53813aabef5ca040b0ea49d" # 5.10.7 PKG_SHA256="2d6e3637dbe328161161cbdede2902e0aaaa979bd0179a40e14d2960a61de593" - PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz" - PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz" + PKG_URL="https://github.com/raspberrypi/linux/archive/${PKG_VERSION}.tar.gz" + PKG_SOURCE_NAME="linux-${LINUX}-${PKG_VERSION}.tar.gz" ;; *) PKG_VERSION="5.10.4" PKG_SHA256="904e396c26e9992a16cd1cc989460171536bed7739bf36049f6eb020ee5d56ec" - PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz" + PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_PATCH_DIRS="default" ;; esac @@ -41,26 +41,26 @@ if listcontains "${UBOOT_FIRMWARE}" "crust"; then PKG_PATCH_DIRS+=" crust" fi -if [ -n "$KERNEL_TOOLCHAIN" ]; then - PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-arm-$KERNEL_TOOLCHAIN:host" - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-arm-$KERNEL_TOOLCHAIN:host" - HEADERS_ARCH=$TARGET_ARCH +if [ -n "${KERNEL_TOOLCHAIN}" ]; then + PKG_DEPENDS_HOST+=" gcc-arm-${KERNEL_TOOLCHAIN}:host" + PKG_DEPENDS_TARGET+=" gcc-arm-${KERNEL_TOOLCHAIN}:host" + HEADERS_ARCH=${TARGET_ARCH} fi -if [ "$PKG_BUILD_PERF" != "no" ] && grep -q ^CONFIG_PERF_EVENTS= $PKG_KERNEL_CFG_FILE ; then +if [ "${PKG_BUILD_PERF}" != "no" ] && grep -q ^CONFIG_PERF_EVENTS= ${PKG_KERNEL_CFG_FILE}; then PKG_BUILD_PERF="yes" - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET binutils elfutils libunwind zlib openssl" + PKG_DEPENDS_TARGET+=" binutils elfutils libunwind zlib openssl" fi -if [ "$TARGET_ARCH" = "x86_64" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET elfutils:host pciutils" +if [ "${TARGET_ARCH}" = "x86_64" ]; then + PKG_DEPENDS_TARGET+=" elfutils:host pciutils" PKG_DEPENDS_UNPACK+=" intel-ucode kernel-firmware" -elif [ "$TARGET_ARCH" = "arm" -a "$DEVICE" = "iMX6" ]; then +elif [ "${TARGET_ARCH}" = "arm" -a "${DEVICE}" = "iMX6" ]; then PKG_DEPENDS_UNPACK+=" firmware-imx" fi -if [[ "$KERNEL_TARGET" = uImage* ]]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET u-boot-tools:host" +if [[ "${KERNEL_TARGET}" = uImage* ]]; then + PKG_DEPENDS_TARGET+=" u-boot-tools:host" fi # Ensure that the dependencies of initramfs:target are built correctly, but @@ -72,108 +72,108 @@ done post_patch() { # linux was already built and its build dir autoremoved - prepare it again for kernel packages - if [ -d $PKG_INSTALL/.image ]; then - cp -p $PKG_INSTALL/.image/.config $PKG_BUILD - kernel_make -C $PKG_BUILD prepare + if [ -d ${PKG_INSTALL}/.image ]; then + cp -p ${PKG_INSTALL}/.image/.config ${PKG_BUILD} + kernel_make -C ${PKG_BUILD} prepare # restore the required Module.symvers from an earlier build - cp -p $PKG_INSTALL/.image/Module.symvers $PKG_BUILD + cp -p ${PKG_INSTALL}/.image/Module.symvers ${PKG_BUILD} else - cp $PKG_KERNEL_CFG_FILE $PKG_BUILD/.config + cp ${PKG_KERNEL_CFG_FILE} ${PKG_BUILD}/.config - sed -i -e "s|@INITRAMFS_SOURCE@|$(kernel_initramfs_confs) $BUILD/initramfs|" $PKG_BUILD/.config + sed -i -e "s|@INITRAMFS_SOURCE@|$(kernel_initramfs_confs) ${BUILD}/initramfs|" ${PKG_BUILD}/.config - # set default hostname based on $DISTRONAME - sed -i -e "s|@DISTRONAME@|$DISTRONAME|g" $PKG_BUILD/.config + # set default hostname based on ${DISTRONAME} + sed -i -e "s|@DISTRONAME@|${DISTRONAME}|g" ${PKG_BUILD}/.config # disable swap support if not enabled - if [ ! "$SWAP_SUPPORT" = yes ]; then - sed -i -e "s|^CONFIG_SWAP=.*$|# CONFIG_SWAP is not set|" $PKG_BUILD/.config + if [ ! "${SWAP_SUPPORT}" = yes ]; then + sed -i -e "s|^CONFIG_SWAP=.*$|# CONFIG_SWAP is not set|" ${PKG_BUILD}/.config fi # disable nfs support if not enabled - if [ ! "$NFS_SUPPORT" = yes ]; then - sed -i -e "s|^CONFIG_NFS_FS=.*$|# CONFIG_NFS_FS is not set|" $PKG_BUILD/.config + if [ ! "${NFS_SUPPORT}" = yes ]; then + sed -i -e "s|^CONFIG_NFS_FS=.*$|# CONFIG_NFS_FS is not set|" ${PKG_BUILD}/.config fi # disable cifs support if not enabled - if [ ! "$SAMBA_SUPPORT" = yes ]; then - sed -i -e "s|^CONFIG_CIFS=.*$|# CONFIG_CIFS is not set|" $PKG_BUILD/.config + if [ ! "${SAMBA_SUPPORT}" = yes ]; then + sed -i -e "s|^CONFIG_CIFS=.*$|# CONFIG_CIFS is not set|" ${PKG_BUILD}/.config fi # disable iscsi support if not enabled - if [ ! "$ISCSI_SUPPORT" = yes ]; then - sed -i -e "s|^CONFIG_SCSI_ISCSI_ATTRS=.*$|# CONFIG_SCSI_ISCSI_ATTRS is not set|" $PKG_BUILD/.config - sed -i -e "s|^CONFIG_ISCSI_TCP=.*$|# CONFIG_ISCSI_TCP is not set|" $PKG_BUILD/.config - sed -i -e "s|^CONFIG_ISCSI_BOOT_SYSFS=.*$|# CONFIG_ISCSI_BOOT_SYSFS is not set|" $PKG_BUILD/.config - sed -i -e "s|^CONFIG_ISCSI_IBFT_FIND=.*$|# CONFIG_ISCSI_IBFT_FIND is not set|" $PKG_BUILD/.config - sed -i -e "s|^CONFIG_ISCSI_IBFT=.*$|# CONFIG_ISCSI_IBFT is not set|" $PKG_BUILD/.config + if [ ! "${ISCSI_SUPPORT}" = yes ]; then + sed -i -e "s|^CONFIG_SCSI_ISCSI_ATTRS=.*$|# CONFIG_SCSI_ISCSI_ATTRS is not set|" ${PKG_BUILD}/.config + sed -i -e "s|^CONFIG_ISCSI_TCP=.*$|# CONFIG_ISCSI_TCP is not set|" ${PKG_BUILD}/.config + sed -i -e "s|^CONFIG_ISCSI_BOOT_SYSFS=.*$|# CONFIG_ISCSI_BOOT_SYSFS is not set|" ${PKG_BUILD}/.config + sed -i -e "s|^CONFIG_ISCSI_IBFT_FIND=.*$|# CONFIG_ISCSI_IBFT_FIND is not set|" ${PKG_BUILD}/.config + sed -i -e "s|^CONFIG_ISCSI_IBFT=.*$|# CONFIG_ISCSI_IBFT is not set|" ${PKG_BUILD}/.config fi # disable lima/panfrost if libmali is configured - if [ "$OPENGLES" = "libmali" ]; then - sed -e "s|^CONFIG_DRM_LIMA=.*$|# CONFIG_DRM_LIMA is not set|" -i $PKG_BUILD/.config - sed -e "s|^CONFIG_DRM_PANFROST=.*$|# CONFIG_DRM_PANFROST is not set|" -i $PKG_BUILD/.config + if [ "${OPENGLES}" = "libmali" ]; then + sed -e "s|^CONFIG_DRM_LIMA=.*$|# CONFIG_DRM_LIMA is not set|" -i ${PKG_BUILD}/.config + sed -e "s|^CONFIG_DRM_PANFROST=.*$|# CONFIG_DRM_PANFROST is not set|" -i ${PKG_BUILD}/.config fi # disable wireguard support if not enabled - if [ ! "$WIREGUARD_SUPPORT" = yes ]; then - sed -e "s|^CONFIG_WIREGUARD=.*$|# CONFIG_WIREGUARD is not set|" -i $PKG_BUILD/.config + if [ ! "${WIREGUARD_SUPPORT}" = yes ]; then + sed -e "s|^CONFIG_WIREGUARD=.*$|# CONFIG_WIREGUARD is not set|" -i ${PKG_BUILD}/.config fi fi } make_host() { make \ - ARCH=${HEADERS_ARCH:-$TARGET_KERNEL_ARCH} \ - HOSTCC="$TOOLCHAIN/bin/host-gcc" \ - HOSTCXX="$TOOLCHAIN/bin/host-g++" \ - HOSTCFLAGS="$HOST_CFLAGS" \ - HOSTCXXFLAGS="$HOST_CXXFLAGS" \ - HOSTLDFLAGS="$HOST_LDFLAGS" \ + ARCH=${HEADERS_ARCH:-${TARGET_KERNEL_ARCH}} \ + HOSTCC="${TOOLCHAIN}/bin/host-gcc" \ + HOSTCXX="${TOOLCHAIN}/bin/host-g++" \ + HOSTCFLAGS="${HOST_CFLAGS}" \ + HOSTCXXFLAGS="${HOST_CXXFLAGS}" \ + HOSTLDFLAGS="${HOST_LDFLAGS}" \ headers_check } makeinstall_host() { make \ - ARCH=${HEADERS_ARCH:-$TARGET_KERNEL_ARCH} \ - HOSTCC="$TOOLCHAIN/bin/host-gcc" \ - HOSTCXX="$TOOLCHAIN/bin/host-g++" \ - HOSTCFLAGS="$HOST_CFLAGS" \ - HOSTCXXFLAGS="$HOST_CXXFLAGS" \ - HOSTLDFLAGS="$HOST_LDFLAGS" \ + ARCH=${HEADERS_ARCH:-${TARGET_KERNEL_ARCH}} \ + HOSTCC="${TOOLCHAIN}/bin/host-gcc" \ + HOSTCXX="${TOOLCHAIN}/bin/host-g++" \ + HOSTCFLAGS="${HOST_CFLAGS}" \ + HOSTCXXFLAGS="${HOST_CXXFLAGS}" \ + HOSTLDFLAGS="${HOST_LDFLAGS}" \ INSTALL_HDR_PATH=dest \ headers_install - mkdir -p $SYSROOT_PREFIX/usr/include - cp -R dest/include/* $SYSROOT_PREFIX/usr/include + mkdir -p ${SYSROOT_PREFIX}/usr/include + cp -R dest/include/* ${SYSROOT_PREFIX}/usr/include } pre_make_target() { - ( cd $ROOT - rm -rf $BUILD/initramfs + ( cd ${ROOT} + rm -rf ${BUILD}/initramfs rm -f ${STAMPS_INSTALL}/initramfs/install_target ${STAMPS_INSTALL}/*/install_init - $SCRIPTS/install initramfs + ${SCRIPTS}/install initramfs ) pkg_lock_status "ACTIVE" "linux:target" "build" - if [ "$TARGET_ARCH" = "x86_64" ]; then + if [ "${TARGET_ARCH}" = "x86_64" ]; then # copy some extra firmware to linux tree - mkdir -p $PKG_BUILD/external-firmware - cp -a $(get_build_dir kernel-firmware)/.copied-firmware/{amdgpu,amd-ucode,i915,radeon,e100,rtl_nic} $PKG_BUILD/external-firmware + mkdir -p ${PKG_BUILD}/external-firmware + cp -a $(get_build_dir kernel-firmware)/.copied-firmware/{amdgpu,amd-ucode,i915,radeon,e100,rtl_nic} ${PKG_BUILD}/external-firmware - cp -a $(get_build_dir intel-ucode)/intel-ucode $PKG_BUILD/external-firmware + cp -a $(get_build_dir intel-ucode)/intel-ucode ${PKG_BUILD}/external-firmware - FW_LIST="$(find $PKG_BUILD/external-firmware \( -type f -o -type l \) \( -iname '*.bin' -o -iname '*.fw' -o -path '*/intel-ucode/*' \) | sed 's|.*external-firmware/||' | sort | xargs)" - sed -i "s|CONFIG_EXTRA_FIRMWARE=.*|CONFIG_EXTRA_FIRMWARE=\"${FW_LIST}\"|" $PKG_BUILD/.config + FW_LIST="$(find ${PKG_BUILD}/external-firmware \( -type f -o -type l \) \( -iname '*.bin' -o -iname '*.fw' -o -path '*/intel-ucode/*' \) | sed 's|.*external-firmware/||' | sort | xargs)" + sed -i "s|CONFIG_EXTRA_FIRMWARE=.*|CONFIG_EXTRA_FIRMWARE=\"${FW_LIST}\"|" ${PKG_BUILD}/.config - elif [ "$TARGET_ARCH" = "arm" -a "$DEVICE" = "iMX6" ]; then - mkdir -p $PKG_BUILD/external-firmware/imx/sdma - cp -a $(get_build_dir firmware-imx)/firmware/sdma/*imx6*.bin $PKG_BUILD/external-firmware/imx/sdma - cp -a $(get_build_dir firmware-imx)/firmware/vpu/*imx6*.bin $PKG_BUILD/external-firmware + elif [ "${TARGET_ARCH}" = "arm" -a "${DEVICE}" = "iMX6" ]; then + mkdir -p ${PKG_BUILD}/external-firmware/imx/sdma + cp -a $(get_build_dir firmware-imx)/firmware/sdma/*imx6*.bin ${PKG_BUILD}/external-firmware/imx/sdma + cp -a $(get_build_dir firmware-imx)/firmware/vpu/*imx6*.bin ${PKG_BUILD}/external-firmware - FW_LIST="$(find $PKG_BUILD/external-firmware -type f | sed 's|.*external-firmware/||' | sort | xargs)" - sed -i -e "s|^CONFIG_EXTRA_FIRMWARE=.*$|CONFIG_EXTRA_FIRMWARE=\"${FW_LIST}\"|" $PKG_BUILD/.config - sed -i -e "/CONFIG_EXTRA_FIRMWARE_DIR/d" -e "/CONFIG_EXTRA_FIRMWARE=.../a CONFIG_EXTRA_FIRMWARE_DIR=\"external-firmware\"" $PKG_BUILD/.config + FW_LIST="$(find ${PKG_BUILD}/external-firmware -type f | sed 's|.*external-firmware/||' | sort | xargs)" + sed -i -e "s|^CONFIG_EXTRA_FIRMWARE=.*$|CONFIG_EXTRA_FIRMWARE=\"${FW_LIST}\"|" ${PKG_BUILD}/.config + sed -i -e "/CONFIG_EXTRA_FIRMWARE_DIR/d" -e "/CONFIG_EXTRA_FIRMWARE=.../a CONFIG_EXTRA_FIRMWARE_DIR=\"external-firmware\"" ${PKG_BUILD}/.config fi kernel_make oldconfig @@ -182,21 +182,21 @@ pre_make_target() { make_target() { # arm64 target does not support creating uImage. # Build Image first, then wrap it using u-boot's mkimage. - if [[ "$TARGET_KERNEL_ARCH" = "arm64" && "$KERNEL_TARGET" = uImage* ]]; then - if [ -z "$KERNEL_UIMAGE_LOADADDR" -o -z "$KERNEL_UIMAGE_ENTRYADDR" ]; then + if [[ "${TARGET_KERNEL_ARCH}" = "arm64" && "${KERNEL_TARGET}" = uImage* ]]; then + if [ -z "${KERNEL_UIMAGE_LOADADDR}" -o -z "${KERNEL_UIMAGE_ENTRYADDR}" ]; then die "ERROR: KERNEL_UIMAGE_LOADADDR and KERNEL_UIMAGE_ENTRYADDR have to be set to build uImage - aborting" fi - KERNEL_UIMAGE_TARGET="$KERNEL_TARGET" + KERNEL_UIMAGE_TARGET="${KERNEL_TARGET}" KERNEL_TARGET="${KERNEL_TARGET/uImage/Image}" fi - kernel_make $KERNEL_TARGET $KERNEL_MAKE_EXTRACMD modules + kernel_make ${KERNEL_TARGET} ${KERNEL_MAKE_EXTRACMD} modules - if [ "$PKG_BUILD_PERF" = "yes" ] ; then + if [ "${PKG_BUILD_PERF}" = "yes" ]; then ( cd tools/perf # arch specific perf build args - case "$TARGET_ARCH" in + case "${TARGET_ARCH}" in x86_64) PERF_BUILD_ARGS="ARCH=x86" ;; @@ -204,7 +204,7 @@ make_target() { PERF_BUILD_ARGS="ARCH=arm64" ;; *) - PERF_BUILD_ARGS="ARCH=$TARGET_ARCH" + PERF_BUILD_ARGS="ARCH=${TARGET_ARCH}" ;; esac @@ -217,72 +217,72 @@ make_target() { NO_LIBAUDIT=1 \ NO_LZMA=1 \ NO_SDT=1 \ - CROSS_COMPILE="$TARGET_PREFIX" \ - JOBS="$CONCURRENCY_MAKE_LEVEL" \ - make $PERF_BUILD_ARGS - mkdir -p $INSTALL/usr/bin - cp perf $INSTALL/usr/bin + CROSS_COMPILE="${TARGET_PREFIX}" \ + JOBS="${CONCURRENCY_MAKE_LEVEL}" \ + make ${PERF_BUILD_ARGS} + mkdir -p ${INSTALL}/usr/bin + cp perf ${INSTALL}/usr/bin ) fi - if [ -n "$KERNEL_UIMAGE_TARGET" ] ; then + if [ -n "${KERNEL_UIMAGE_TARGET}" ]; then # determine compression used for kernel image KERNEL_UIMAGE_COMP=${KERNEL_UIMAGE_TARGET:7} KERNEL_UIMAGE_COMP=$(echo ${KERNEL_UIMAGE_COMP:-none} | sed 's/gz/gzip/; s/bz2/bzip2/') # calculate new load address to make kernel Image unpack to memory area after compressed image - if [ "$KERNEL_UIMAGE_COMP" != "none" ] ; then - COMPRESSED_SIZE=$(stat -t "arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET" | awk '{print $2}') + 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} fi - mkimage -A $TARGET_KERNEL_ARCH \ + mkimage -A ${TARGET_KERNEL_ARCH} \ -O linux \ -T kernel \ - -C $KERNEL_UIMAGE_COMP \ - -a $PKG_KERNEL_UIMAGE_LOADADDR \ - -e $PKG_KERNEL_UIMAGE_ENTRYADDR \ - -d arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET \ - arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_UIMAGE_TARGET + -C ${KERNEL_UIMAGE_COMP} \ + -a ${PKG_KERNEL_UIMAGE_LOADADDR} \ + -e ${PKG_KERNEL_UIMAGE_ENTRYADDR} \ + -d arch/${TARGET_KERNEL_ARCH}/boot/${KERNEL_TARGET} \ + arch/${TARGET_KERNEL_ARCH}/boot/${KERNEL_UIMAGE_TARGET} KERNEL_TARGET="${KERNEL_UIMAGE_TARGET}" fi } makeinstall_target() { - mkdir -p $INSTALL/.image - cp -p arch/${TARGET_KERNEL_ARCH}/boot/${KERNEL_TARGET} System.map .config Module.symvers $INSTALL/.image/ + mkdir -p ${INSTALL}/.image + cp -p arch/${TARGET_KERNEL_ARCH}/boot/${KERNEL_TARGET} System.map .config Module.symvers ${INSTALL}/.image/ - kernel_make INSTALL_MOD_PATH=$INSTALL/$(get_kernel_overlay_dir) modules_install - rm -f $INSTALL/$(get_kernel_overlay_dir)/lib/modules/*/build - rm -f $INSTALL/$(get_kernel_overlay_dir)/lib/modules/*/source + kernel_make INSTALL_MOD_PATH=${INSTALL}/$(get_kernel_overlay_dir) modules_install + rm -f ${INSTALL}/$(get_kernel_overlay_dir)/lib/modules/*/build + rm -f ${INSTALL}/$(get_kernel_overlay_dir)/lib/modules/*/source - if [ "$BOOTLOADER" = "u-boot" ]; then - mkdir -p $INSTALL/usr/share/bootloader - for dtb in arch/$TARGET_KERNEL_ARCH/boot/dts/*.dtb arch/$TARGET_KERNEL_ARCH/boot/dts/*/*.dtb; do - if [ -f $dtb ]; then - cp -v $dtb $INSTALL/usr/share/bootloader + if [ "${BOOTLOADER}" = "u-boot" ]; then + mkdir -p ${INSTALL}/usr/share/bootloader + for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/*.dtb arch/${TARGET_KERNEL_ARCH}/boot/dts/*/*.dtb; do + if [ -f ${dtb} ]; then + cp -v ${dtb} ${INSTALL}/usr/share/bootloader fi done - elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then - mkdir -p $INSTALL/usr/share/bootloader/overlays + elif [ "${BOOTLOADER}" = "bcm2835-bootloader" ]; then + mkdir -p ${INSTALL}/usr/share/bootloader/overlays # install platform dtbs, but remove upstream kernel dtbs (i.e. without downstream # drivers and decent USB support) as these are not required by LibreELEC - cp -p arch/$TARGET_KERNEL_ARCH/boot/dts/*.dtb $INSTALL/usr/share/bootloader - rm -f $INSTALL/usr/share/bootloader/bcm283*.dtb + cp -p arch/${TARGET_KERNEL_ARCH}/boot/dts/*.dtb ${INSTALL}/usr/share/bootloader + rm -f ${INSTALL}/usr/share/bootloader/bcm283*.dtb # install overlay dtbs - for dtb in arch/$TARGET_KERNEL_ARCH/boot/dts/overlays/*.dtb \ - arch/$TARGET_KERNEL_ARCH/boot/dts/overlays/*.dtbo; do - cp $dtb $INSTALL/usr/share/bootloader/overlays 2>/dev/null || : + for dtb in arch/${TARGET_KERNEL_ARCH}/boot/dts/overlays/*.dtb \ + arch/${TARGET_KERNEL_ARCH}/boot/dts/overlays/*.dtbo; do + cp ${dtb} ${INSTALL}/usr/share/bootloader/overlays 2>/dev/null || : done - cp -p arch/$TARGET_KERNEL_ARCH/boot/dts/overlays/README $INSTALL/usr/share/bootloader/overlays + cp -p arch/${TARGET_KERNEL_ARCH}/boot/dts/overlays/README ${INSTALL}/usr/share/bootloader/overlays fi } From b2624896ff0d074bcf086710b8072b1bf601bfce Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:33:56 +0000 Subject: [PATCH 11/27] linux-driver-addons: automated code cleanup Signed-off-by: Ian Leonard --- packages/linux-driver-addons/dvb/crazycat/package.mk | 12 ++++++------ .../dvb/depends/media_tree/package.mk | 10 +++++----- .../dvb/depends/media_tree_cc/package.mk | 12 ++++++------ .../dvb/digital_devices/package.mk | 4 ++-- .../linux-driver-addons/dvb/dvb-latest/package.mk | 10 +++++----- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/packages/linux-driver-addons/dvb/crazycat/package.mk b/packages/linux-driver-addons/dvb/crazycat/package.mk index 83474aaddc..209b454ff1 100644 --- a/packages/linux-driver-addons/dvb/crazycat/package.mk +++ b/packages/linux-driver-addons/dvb/crazycat/package.mk @@ -20,7 +20,7 @@ PKG_ADDON_VERSION="${ADDON_VERSION}.${PKG_REV}" PKG_KERNEL_CFG_FILE=$(kernel_config_path) || die -if ! grep -q ^CONFIG_USB_PCI= ${PKG_KERNEL_CFG_FILE} ; then +if ! grep -q ^CONFIG_USB_PCI= ${PKG_KERNEL_CFG_FILE}; then PKG_PATCH_DIRS="disable-pci" fi @@ -30,21 +30,21 @@ pre_make_target() { } make_target() { - cp -RP $(get_build_dir media_tree_cc)/* $PKG_BUILD/linux + cp -RP $(get_build_dir media_tree_cc)/* ${PKG_BUILD}/linux # make config all - kernel_make VER=$KERNEL_VER SRCDIR=$(kernel_path) allyesconfig + kernel_make VER=${KERNEL_VER} SRCDIR=$(kernel_path) allyesconfig # hack to workaround media_build bug - if [ "$PROJECT" = Rockchip ]; then + if [ "${PROJECT}" = Rockchip ]; then sed -e 's/CONFIG_DVB_CXD2820R=m/# CONFIG_DVB_CXD2820R is not set/g' -i v4l/.config sed -e 's/CONFIG_DVB_LGDT3306A=m/# CONFIG_DVB_LGDT3306A is not set/g' -i v4l/.config fi # add menuconfig to edit .config - kernel_make VER=$KERNEL_VER SRCDIR=$(kernel_path) + kernel_make VER=${KERNEL_VER} SRCDIR=$(kernel_path) } makeinstall_target() { - install_driver_addon_files "$PKG_BUILD/v4l/" + install_driver_addon_files "${PKG_BUILD}/v4l/" } diff --git a/packages/linux-driver-addons/dvb/depends/media_tree/package.mk b/packages/linux-driver-addons/dvb/depends/media_tree/package.mk index eebf1ad748..3542173da9 100644 --- a/packages/linux-driver-addons/dvb/depends/media_tree/package.mk +++ b/packages/linux-driver-addons/dvb/depends/media_tree/package.mk @@ -8,13 +8,13 @@ PKG_LICENSE="GPL" PKG_SITE="https://git.linuxtv.org/media_tree.git" PKG_URL="http://linuxtv.org/downloads/drivers/linux-media-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" -PKG_NEED_UNPACK="$LINUX_DEPENDS" +PKG_NEED_UNPACK="${LINUX_DEPENDS}" PKG_LONGDESC="Source of Linux Kernel media_tree subsystem to build with media_build." PKG_TOOLCHAIN="manual" unpack() { - mkdir -p $PKG_BUILD/ - tar -xf $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2 -C $PKG_BUILD/ + mkdir -p ${PKG_BUILD}/ + tar -xf ${SOURCES}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}/ } post_unpack() { @@ -22,7 +22,7 @@ post_unpack() { # without removing atomisp there a lot additional includes that # slowdown build process after modpost from 3min to 6min # even if atomisp is disabled via kernel.conf - rm -rf $PKG_BUILD/drivers/staging/media/atomisp + rm -rf ${PKG_BUILD}/drivers/staging/media/atomisp sed -i 's|^.*drivers/staging/media/atomisp.*$||' \ - $PKG_BUILD/drivers/staging/media/Kconfig + ${PKG_BUILD}/drivers/staging/media/Kconfig } diff --git a/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk b/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk index 61b3512866..ba856abfbc 100644 --- a/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk +++ b/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk @@ -6,15 +6,15 @@ PKG_VERSION="2020-02-14" PKG_SHA256="c81d0412c8f237ecf30100ba1260625ca25df463102af331b063f4a7dca164f5" PKG_LICENSE="GPL" PKG_SITE="https://bitbucket.org/CrazyCat/media_build/downloads/" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" -PKG_NEED_UNPACK="$LINUX_DEPENDS" +PKG_NEED_UNPACK="${LINUX_DEPENDS}" PKG_LONGDESC="Source of Linux Kernel media_tree subsystem to build with media_build." PKG_TOOLCHAIN="manual" unpack() { - mkdir -p $PKG_BUILD/ - tar -xf $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2 -C $PKG_BUILD/ + mkdir -p ${PKG_BUILD}/ + tar -xf ${SOURCES}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2 -C ${PKG_BUILD}/ } post_unpack() { @@ -22,7 +22,7 @@ post_unpack() { # without removing atomisp there a lot additional includes that # slowdown build process after modpost from 3min to 6min # even if atomisp is disabled via kernel.conf - rm -rf $PKG_BUILD/drivers/staging/media/atomisp + rm -rf ${PKG_BUILD}/drivers/staging/media/atomisp sed -i 's|^.*drivers/staging/media/atomisp.*$||' \ - $PKG_BUILD/drivers/staging/media/Kconfig + ${PKG_BUILD}/drivers/staging/media/Kconfig } diff --git a/packages/linux-driver-addons/dvb/digital_devices/package.mk b/packages/linux-driver-addons/dvb/digital_devices/package.mk index 1834ca491b..6145281b6c 100644 --- a/packages/linux-driver-addons/dvb/digital_devices/package.mk +++ b/packages/linux-driver-addons/dvb/digital_devices/package.mk @@ -10,7 +10,7 @@ PKG_SITE="https://github.com/DigitalDevices/dddvb/" PKG_URL="https://github.com/DigitalDevices/dddvb/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain linux" PKG_BUILD_DEPENDS_TARGET="toolchain linux" -PKG_NEED_UNPACK="$LINUX_DEPENDS" +PKG_NEED_UNPACK="${LINUX_DEPENDS}" PKG_SECTION="driver.dvb" PKG_LONGDESC="DVB driver for Digital Devices cards" @@ -25,5 +25,5 @@ make_target() { } makeinstall_target() { - install_driver_addon_files "$PKG_BUILD/ddbridge $PKG_BUILD/dvb-core $PKG_BUILD/frontends" + install_driver_addon_files "${PKG_BUILD}/ddbridge ${PKG_BUILD}/dvb-core ${PKG_BUILD}/frontends" } diff --git a/packages/linux-driver-addons/dvb/dvb-latest/package.mk b/packages/linux-driver-addons/dvb/dvb-latest/package.mk index b601ae3b10..ccc016af0c 100644 --- a/packages/linux-driver-addons/dvb/dvb-latest/package.mk +++ b/packages/linux-driver-addons/dvb/dvb-latest/package.mk @@ -20,7 +20,7 @@ PKG_ADDON_VERSION="${ADDON_VERSION}.${PKG_REV}" PKG_KERNEL_CFG_FILE=$(kernel_config_path) || die -if ! grep -q ^CONFIG_USB_PCI= ${PKG_KERNEL_CFG_FILE} ; then +if ! grep -q ^CONFIG_USB_PCI= ${PKG_KERNEL_CFG_FILE}; then PKG_PATCH_DIRS="disable-pci" fi @@ -30,14 +30,14 @@ pre_make_target() { } make_target() { - cp -RP $(get_build_dir media_tree)/* $PKG_BUILD/linux + cp -RP $(get_build_dir media_tree)/* ${PKG_BUILD}/linux # make config all - kernel_make VER=$KERNEL_VER SRCDIR=$(kernel_path) allyesconfig + kernel_make VER=${KERNEL_VER} SRCDIR=$(kernel_path) allyesconfig - kernel_make VER=$KERNEL_VER SRCDIR=$(kernel_path) + kernel_make VER=${KERNEL_VER} SRCDIR=$(kernel_path) } makeinstall_target() { - install_driver_addon_files "$PKG_BUILD/v4l/" + install_driver_addon_files "${PKG_BUILD}/v4l/" } From 2a435072561180d42ee3d45091a570c8624934d5 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:33:56 +0000 Subject: [PATCH 12/27] linux-drivers: automated code cleanup Signed-off-by: Ian Leonard --- packages/linux-drivers/RTL8188EU/package.mk | 10 +++++----- packages/linux-drivers/RTL8192CU/package.mk | 10 +++++----- packages/linux-drivers/RTL8192DU/package.mk | 10 +++++----- packages/linux-drivers/RTL8192EU/package.mk | 10 +++++----- packages/linux-drivers/RTL8812AU/package.mk | 10 +++++----- packages/linux-drivers/bcm_sta/package.mk | 8 ++++---- packages/linux-drivers/mali-bifrost/package.mk | 14 +++++++------- packages/linux-drivers/mali-midgard/package.mk | 10 +++++----- packages/linux-drivers/mali-utgard/package.mk | 8 ++++---- 9 files changed, 45 insertions(+), 45 deletions(-) diff --git a/packages/linux-drivers/RTL8188EU/package.mk b/packages/linux-drivers/RTL8188EU/package.mk index 3fc9dd7459..bfe80b5b24 100644 --- a/packages/linux-drivers/RTL8188EU/package.mk +++ b/packages/linux-drivers/RTL8188EU/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="e855e210b27fc33212c558d34c32e0a5ccc32209d5c7e3f71fcf67695c224594" PKG_LICENSE="GPL" # realtek: PKG_SITE="http://www.realtek.com.tw/downloads/downloadsView.aspx?Langid=1&PFid=48&Level=5&Conn=4&ProdID=274&DownTypeID=3&GetDown=false&Downloads=true" PKG_SITE="https://github.com/lwfinger/rtl8188eu" -PKG_URL="https://github.com/lwfinger/rtl8188eu/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/lwfinger/rtl8188eu/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Realtek RTL81xxEU Linux 3.x driver" PKG_IS_KERNEL_PKG="yes" @@ -18,13 +18,13 @@ pre_make_target() { make_target() { make modules \ - ARCH=$TARGET_KERNEL_ARCH \ + ARCH=${TARGET_KERNEL_ARCH} \ KSRC=$(kernel_path) \ - CROSS_COMPILE=$TARGET_KERNEL_PREFIX \ + CROSS_COMPILE=${TARGET_KERNEL_PREFIX} \ CONFIG_POWER_SAVING=n } makeinstall_target() { - mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME - cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME + mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} + cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} } diff --git a/packages/linux-drivers/RTL8192CU/package.mk b/packages/linux-drivers/RTL8192CU/package.mk index 2e10134a72..8d4270566c 100644 --- a/packages/linux-drivers/RTL8192CU/package.mk +++ b/packages/linux-drivers/RTL8192CU/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="7a15cb42e568b0f9c3c872bd6a06cdcab9f0ffd0" PKG_SHA256="93cd979956ab3f60618707cd11395549ecff17135fa969e25f031a1f06453a7d" PKG_LICENSE="GPL" PKG_SITE="https://github.com/pvaret/rtl8192cu-fixes" -PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz" +PKG_URL="${PKG_SITE}/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Realtek RTL81xxCU Linux 3.x driver" PKG_IS_KERNEL_PKG="yes" @@ -17,13 +17,13 @@ pre_make_target() { make_target() { make V=1 \ - ARCH=$TARGET_KERNEL_ARCH \ + ARCH=${TARGET_KERNEL_ARCH} \ KSRC=$(kernel_path) \ - CROSS_COMPILE=$TARGET_KERNEL_PREFIX \ + CROSS_COMPILE=${TARGET_KERNEL_PREFIX} \ CONFIG_POWER_SAVING=n } makeinstall_target() { - mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME - cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME + mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} + cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} } diff --git a/packages/linux-drivers/RTL8192DU/package.mk b/packages/linux-drivers/RTL8192DU/package.mk index 8c82a97818..021257b39a 100644 --- a/packages/linux-drivers/RTL8192DU/package.mk +++ b/packages/linux-drivers/RTL8192DU/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="331ec03d89d0c0ebe771c4011846f029f6af33d3" PKG_SHA256="74e173b96d366ad50a0634fe98a8e55dc865276cd07de8fd635eaa4d5f71dae4" PKG_LICENSE="GPL" PKG_SITE="https://github.com/lwfinger/rtl8192du" -PKG_URL="https://github.com/lwfinger/rtl8192du/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/lwfinger/rtl8192du/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Realtek RTL8192DU Linux 3.x driver" PKG_IS_KERNEL_PKG="yes" @@ -17,13 +17,13 @@ pre_make_target() { make_target() { make V=1 \ - ARCH=$TARGET_KERNEL_ARCH \ + ARCH=${TARGET_KERNEL_ARCH} \ KSRC=$(kernel_path) \ - CROSS_COMPILE=$TARGET_KERNEL_PREFIX \ + CROSS_COMPILE=${TARGET_KERNEL_PREFIX} \ CONFIG_POWER_SAVING=n } makeinstall_target() { - mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME - cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME + mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} + cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} } diff --git a/packages/linux-drivers/RTL8192EU/package.mk b/packages/linux-drivers/RTL8192EU/package.mk index 6a5c078eb6..017af054ae 100644 --- a/packages/linux-drivers/RTL8192EU/package.mk +++ b/packages/linux-drivers/RTL8192EU/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="faf68bbf82623335e7997a473f9222751e275927" PKG_SHA256="f6988f1f0a4128cf935c2d09cd45a782f46414dc1a8d7c992c05ed7d565ac922" PKG_LICENSE="GPL" PKG_SITE="https://github.com/Mange/rtl8192eu-linux-driver" -PKG_URL="https://github.com/Mange/rtl8192eu-linux-driver/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/Mange/rtl8192eu-linux-driver/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Realtek RTL8192EU Linux 3.x driver" PKG_IS_KERNEL_PKG="yes" @@ -17,14 +17,14 @@ pre_make_target() { make_target() { make V=1 \ - ARCH=$TARGET_KERNEL_ARCH \ + ARCH=${TARGET_KERNEL_ARCH} \ KSRC=$(kernel_path) \ - CROSS_COMPILE=$TARGET_KERNEL_PREFIX \ + CROSS_COMPILE=${TARGET_KERNEL_PREFIX} \ CONFIG_POWER_SAVING=n \ USER_EXTRA_CFLAGS="-Wno-error=date-time" } makeinstall_target() { - mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME - cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME + mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} + cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} } diff --git a/packages/linux-drivers/RTL8812AU/package.mk b/packages/linux-drivers/RTL8812AU/package.mk index c016c92028..81ae08ddd3 100644 --- a/packages/linux-drivers/RTL8812AU/package.mk +++ b/packages/linux-drivers/RTL8812AU/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="64e7aaa5657ef63ab7ce74ce5554b49a21552e68" PKG_SHA256="1b7a79b15348f1a1125a351e5e5ff524456236519e20ee04b59484aefa6afbaa" PKG_LICENSE="GPL" PKG_SITE="https://github.com/aircrack-ng/rtl8812au" -PKG_URL="https://github.com/aircrack-ng/rtl8812au/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/aircrack-ng/rtl8812au/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Realtek RTL8812AU Linux 3.x driver" PKG_IS_KERNEL_PKG="yes" @@ -17,13 +17,13 @@ pre_make_target() { make_target() { make V=1 \ - ARCH=$TARGET_KERNEL_ARCH \ + ARCH=${TARGET_KERNEL_ARCH} \ KSRC=$(kernel_path) \ - CROSS_COMPILE=$TARGET_KERNEL_PREFIX \ + CROSS_COMPILE=${TARGET_KERNEL_PREFIX} \ CONFIG_POWER_SAVING=n } makeinstall_target() { - mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME - cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME + mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} + cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} } diff --git a/packages/linux-drivers/bcm_sta/package.mk b/packages/linux-drivers/bcm_sta/package.mk index fbe7fa5889..9a53ac79cc 100644 --- a/packages/linux-drivers/bcm_sta/package.mk +++ b/packages/linux-drivers/bcm_sta/package.mk @@ -11,17 +11,17 @@ PKG_SHA256="959bcd1e965d294304a4e290cb8e47b7c74b9763094eff4d0b8e6cfb68a6895b" PKG_ARCH="x86_64" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com/" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_LONGDESC="Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-, BCM4322-, BCM43224-, and BCM43225-based WLAN driver." PKG_TOOLCHAIN="manual" PKG_IS_KERNEL_PKG="yes" make_target() { cd x86-64 - KBUILD_NOPEDANTIC=1 kernel_make V=1 CC=$CC -C $(kernel_path) M=`pwd` BINARCH=$TARGET_KERNEL_ARCH + KBUILD_NOPEDANTIC=1 kernel_make V=1 CC=${CC} -C $(kernel_path) M=$(pwd) BINARCH=${TARGET_KERNEL_ARCH} } makeinstall_target() { - mkdir -p $INSTALL/$(get_full_module_dir)/bcm_sta - cp *.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME + mkdir -p ${INSTALL}/$(get_full_module_dir)/bcm_sta + cp *.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} } diff --git a/packages/linux-drivers/mali-bifrost/package.mk b/packages/linux-drivers/mali-bifrost/package.mk index a5fe88607b..7363f38da9 100644 --- a/packages/linux-drivers/mali-bifrost/package.mk +++ b/packages/linux-drivers/mali-bifrost/package.mk @@ -7,25 +7,25 @@ PKG_SHA256="712ba83f28bf687e2147f0f586678421b0d2cb5620423e93e7b7c9ddf35c1da5" PKG_ARCH="arm aarch64" PKG_LICENSE="GPL" PKG_SITE="https://developer.arm.com/products/software/mali-drivers/bifrost-kernel" -PKG_URL="https://github.com/LibreELEC/mali-bifrost/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/LibreELEC/mali-bifrost/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="mali-bifrost: the Linux kernel driver for ARM Mali Bifrost GPUs" PKG_TOOLCHAIN="manual" PKG_IS_KERNEL_PKG="yes" -case $PROJECT in +case ${PROJECT} in Amlogic) PKG_MALI_PLATFORM_CONFIG="config.meson-g12a" ;; esac make_target() { - kernel_make KDIR=$(kernel_path) -C $PKG_BUILD \ - CONFIG_NAME=$PKG_MALI_PLATFORM_CONFIG + kernel_make KDIR=$(kernel_path) -C ${PKG_BUILD} \ + CONFIG_NAME=${PKG_MALI_PLATFORM_CONFIG} } makeinstall_target() { - DRIVER_DIR=$PKG_BUILD/driver/product/kernel/drivers/gpu/arm/midgard/ + DRIVER_DIR=${PKG_BUILD}/driver/product/kernel/drivers/gpu/arm/midgard/ - mkdir -p $INSTALL/$(get_full_module_dir)/$PKG_NAME - cp $DRIVER_DIR/mali_kbase.ko $INSTALL/$(get_full_module_dir)/$PKG_NAME/ + mkdir -p ${INSTALL}/$(get_full_module_dir)/${PKG_NAME} + cp ${DRIVER_DIR}/mali_kbase.ko ${INSTALL}/$(get_full_module_dir)/${PKG_NAME}/ } diff --git a/packages/linux-drivers/mali-midgard/package.mk b/packages/linux-drivers/mali-midgard/package.mk index d312e84038..2c6b1c26e1 100644 --- a/packages/linux-drivers/mali-midgard/package.mk +++ b/packages/linux-drivers/mali-midgard/package.mk @@ -12,7 +12,7 @@ PKG_LONGDESC="mali-midgard: Linux drivers for Mali Midgard GPUs" PKG_TOOLCHAIN="manual" PKG_IS_KERNEL_PKG="yes" -case $PROJECT in +case ${PROJECT} in Allwinner) PKG_CONFIGS="CONFIG_MALI_PLATFORM_NAME=sunxi" ;; @@ -26,17 +26,17 @@ esac post_patch() { # rename kernel module to not clash with mali-bifrost - find $PKG_BUILD -name Kbuild -exec sed -i 's/mali_kbase.o/mali_midgard.o/g; s/mali_kbase-/mali_midgard-/g' {} \; + find ${PKG_BUILD} -name Kbuild -exec sed -i 's/mali_kbase.o/mali_midgard.o/g; s/mali_kbase-/mali_midgard-/g' {} \; } make_target() { - kernel_make -C $(kernel_path) M=$PKG_BUILD/driver/product/kernel/drivers/gpu/arm/midgard \ + kernel_make -C $(kernel_path) M=${PKG_BUILD}/driver/product/kernel/drivers/gpu/arm/midgard \ EXTRA_CFLAGS="${PKG_EXTRA_CFLAGS}" \ CONFIG_MALI_MIDGARD=m ${PKG_CONFIGS} } makeinstall_target() { - kernel_make -C $(kernel_path) M=$PKG_BUILD/driver/product/kernel/drivers/gpu/arm/midgard \ - INSTALL_MOD_PATH=$INSTALL/$(get_kernel_overlay_dir) INSTALL_MOD_STRIP=1 DEPMOD=: \ + kernel_make -C $(kernel_path) M=${PKG_BUILD}/driver/product/kernel/drivers/gpu/arm/midgard \ + INSTALL_MOD_PATH=${INSTALL}/$(get_kernel_overlay_dir) INSTALL_MOD_STRIP=1 DEPMOD=: \ modules_install } diff --git a/packages/linux-drivers/mali-utgard/package.mk b/packages/linux-drivers/mali-utgard/package.mk index d96b6e9562..9faf050bc7 100644 --- a/packages/linux-drivers/mali-utgard/package.mk +++ b/packages/linux-drivers/mali-utgard/package.mk @@ -12,7 +12,7 @@ PKG_LONGDESC="mali-utgard: Linux drivers for Mali Utgard GPUs" PKG_TOOLCHAIN="manual" PKG_IS_KERNEL_PKG="yes" -case $PROJECT in +case ${PROJECT} in Allwinner) PKG_MALI_PLATFORM="sunxi" ;; @@ -27,14 +27,14 @@ case $PROJECT in esac make_target() { - kernel_make -C $(kernel_path) M=$PKG_BUILD/driver/src/devicedrv/mali \ + kernel_make -C $(kernel_path) M=${PKG_BUILD}/driver/src/devicedrv/mali \ MALI_PLATFORM_FILES=platform/${PKG_MALI_PLATFORM}/${PKG_MALI_PLATFORM}.c GIT_REV="" \ EXTRA_CFLAGS="-DMALI_FAKE_PLATFORM_DEVICE=1 -DCONFIG_MALI_DMA_BUF_MAP_ON_ATTACH -DCONFIG_MALI400=1 -DCONFIG_MALI450=1 -DCONFIG_MALI470=1 ${PKG_EXTRA_CFLAGS}" \ CONFIG_MALI400=m CONFIG_MALI450=y CONFIG_MALI470=y CONFIG_MALI_DMA_BUF_MAP_ON_ATTACH=y ${PKG_CONFIGS} } makeinstall_target() { - kernel_make -C $(kernel_path) M=$PKG_BUILD/driver/src/devicedrv/mali/ \ - INSTALL_MOD_PATH=$INSTALL/$(get_kernel_overlay_dir) INSTALL_MOD_STRIP=1 DEPMOD=: \ + kernel_make -C $(kernel_path) M=${PKG_BUILD}/driver/src/devicedrv/mali/ \ + INSTALL_MOD_PATH=${INSTALL}/$(get_kernel_overlay_dir) INSTALL_MOD_STRIP=1 DEPMOD=: \ modules_install } From 922e37da136fdd9d06b2db0e608c6e1c4f4c9c67 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:33:57 +0000 Subject: [PATCH 13/27] linux-firmware: automated code cleanup Signed-off-by: Ian Leonard --- .../brcmfmac_sdio-firmware-imx/package.mk | 10 +++++----- .../brcmfmac_sdio-firmware-rpi/package.mk | 10 +++++----- .../brcmfmac_sdio-firmware/package.mk | 10 +++++----- packages/linux-firmware/dvb-firmware/package.mk | 8 ++++---- .../firmware-dragonboard/package.mk | 16 ++++++++-------- packages/linux-firmware/firmware-imx/package.mk | 14 +++++++------- .../linux-firmware/iwlwifi-firmware/package.mk | 4 ++-- .../linux-firmware/kernel-firmware/package.mk | 10 +++++----- packages/linux-firmware/misc-firmware/package.mk | 4 ++-- packages/linux-firmware/rtl8723bs_bt/package.mk | 2 +- packages/linux-firmware/wlan-firmware/package.mk | 4 ++-- 11 files changed, 46 insertions(+), 46 deletions(-) diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-imx/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware-imx/package.mk index 6731f6cf36..deaee8596a 100644 --- a/packages/linux-firmware/brcmfmac_sdio-firmware-imx/package.mk +++ b/packages/linux-firmware/brcmfmac_sdio-firmware-imx/package.mk @@ -6,14 +6,14 @@ PKG_VERSION="0.1" PKG_SHA256="4c8ed8ae39ecd05d7e3aeebc98cf230912cdcc887fa78d5112f981b6f9358b6e" PKG_LICENSE="GPL" PKG_SITE="https://github.com/LibreELEC/LibreELEC.tv" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Firmware for brcm bluetooth chips used in some Freescale iMX based devices." makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -av brcm_patchram_plus $INSTALL/usr/bin/ + mkdir -p ${INSTALL}/usr/bin + cp -av brcm_patchram_plus ${INSTALL}/usr/bin/ - mkdir -p $INSTALL/$(get_kernel_overlay_dir)/lib/firmware/ - cp -av firmware/brcm $INSTALL/$(get_kernel_overlay_dir)/lib/firmware/ + mkdir -p ${INSTALL}/$(get_kernel_overlay_dir)/lib/firmware/ + cp -av firmware/brcm ${INSTALL}/$(get_kernel_overlay_dir)/lib/firmware/ } diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk index cca381204e..df40e55ec7 100644 --- a/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk +++ b/packages/linux-firmware/brcmfmac_sdio-firmware-rpi/package.mk @@ -7,20 +7,20 @@ PKG_VERSION="c13705adcee0b35824db70b5f035c86a7088dfce" PKG_SHA256="7c453641e332d70a310dae8ee450b6ce024ed0a2204da1b3f3a3624191be60d8" PKG_LICENSE="GPL" PKG_SITE="https://github.com/LibreELEC/LibreELEC.tv" -PKG_URL="https://github.com/LibreELEC/$PKG_NAME/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/LibreELEC/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Firmware for brcm bluetooth chips used on RaspberryPi devices." PKG_TOOLCHAIN="manual" makeinstall_target() { - DESTDIR=$INSTALL/$(get_kernel_overlay_dir) ./install + DESTDIR=${INSTALL}/$(get_kernel_overlay_dir) ./install } post_makeinstall_target() { # Install rpi btuart script to bring up Bluetooth - mkdir -p $INSTALL/usr/bin - cp -P $PKG_DIR/scripts/rpi-btuart $INSTALL/usr/bin - cp -P $PKG_DIR/scripts/rpi-udev $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -P ${PKG_DIR}/scripts/rpi-btuart ${INSTALL}/usr/bin + cp -P ${PKG_DIR}/scripts/rpi-udev ${INSTALL}/usr/bin } post_install() { diff --git a/packages/linux-firmware/brcmfmac_sdio-firmware/package.mk b/packages/linux-firmware/brcmfmac_sdio-firmware/package.mk index a8375621b1..8f28cd2c35 100644 --- a/packages/linux-firmware/brcmfmac_sdio-firmware/package.mk +++ b/packages/linux-firmware/brcmfmac_sdio-firmware/package.mk @@ -6,14 +6,14 @@ PKG_VERSION="6d49ff1bc15a1c55f711292ed22a7687fa2c9e14" PKG_SHA256="f3698b81fec401dc9b20c32896aab884e8dded1b1e7a5e595060fe3cbce7a5d3" PKG_LICENSE="GPL" PKG_SITE="https://github.com/LibreELEC/brcmfmac_sdio-firmware" -PKG_URL="https://github.com/LibreELEC/brcmfmac_sdio-firmware/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/LibreELEC/brcmfmac_sdio-firmware/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Broadcom SDIO firmware used with LibreELEC" PKG_TOOLCHAIN="manual" post_makeinstall_target() { - FW_TARGET_DIR=$INSTALL/$(get_full_firmware_dir) + FW_TARGET_DIR=${INSTALL}/$(get_full_firmware_dir) - if find_file_path firmwares/$PKG_NAME.dat; then + if find_file_path firmwares/${PKG_NAME}.dat; then FW_LISTS="${FOUND_PATH}" else FW_LISTS="${PKG_DIR}/firmwares/any.dat ${PKG_DIR}/firmwares/${TARGET_ARCH}.dat" @@ -39,8 +39,8 @@ post_makeinstall_target() { done < ${fwlist} done - mkdir -p $INSTALL/usr/bin - cp $PKG_DIR/scripts/brcmfmac-firmware-setup $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp ${PKG_DIR}/scripts/brcmfmac-firmware-setup ${INSTALL}/usr/bin } post_install() { diff --git a/packages/linux-firmware/dvb-firmware/package.mk b/packages/linux-firmware/dvb-firmware/package.mk index 57c8f0ce34..be65d4f746 100644 --- a/packages/linux-firmware/dvb-firmware/package.mk +++ b/packages/linux-firmware/dvb-firmware/package.mk @@ -7,13 +7,13 @@ PKG_VERSION="1.4.0" PKG_SHA256="17d6a5727f7728ef618055089eb78372b3af7ed64ff3ed116211258727188ff0" PKG_LICENSE="Free-to-use" PKG_SITE="https://github.com/LibreELEC/dvb-firmware" -PKG_URL="https://github.com/LibreELEC/dvb-firmware/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/LibreELEC/dvb-firmware/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="dvb-firmware: firmwares for various DVB drivers" PKG_TOOLCHAIN="manual" makeinstall_target() { - PKG_FW_DIR="$INSTALL/$(get_kernel_overlay_dir)/lib/firmware" - mkdir -p "$PKG_FW_DIR" - cp -a "$PKG_BUILD/firmware/"* "$PKG_FW_DIR" + PKG_FW_DIR="${INSTALL}/$(get_kernel_overlay_dir)/lib/firmware" + mkdir -p "${PKG_FW_DIR}" + cp -a "${PKG_BUILD}/firmware/"* "${PKG_FW_DIR}" } diff --git a/packages/linux-firmware/firmware-dragonboard/package.mk b/packages/linux-firmware/firmware-dragonboard/package.mk index ae83b5f28d..bde17b42ff 100644 --- a/packages/linux-firmware/firmware-dragonboard/package.mk +++ b/packages/linux-firmware/firmware-dragonboard/package.mk @@ -13,9 +13,9 @@ PKG_LONGDESC="Additional firmware for Dragonboard 410c" PKG_TOOLCHAIN="manual" unpack() { - mkdir -p $PKG_BUILD - cd $PKG_BUILD - sh $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.bin --auto-accept + mkdir -p ${PKG_BUILD} + cd ${PKG_BUILD} + sh ${SOURCES}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.bin --auto-accept } make_target() { @@ -23,14 +23,14 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/$(get_full_firmware_dir)/qcom/venus-1.8/ - cp -a linux-board-support-package-v${PKG_VERSION%.0}/proprietary-linux/* $INSTALL/$(get_full_firmware_dir) - cp -a linux-board-support-package-v${PKG_VERSION%.0}/proprietary-linux/venus* $INSTALL/$(get_full_firmware_dir)/qcom/venus-1.8/ - rm $INSTALL/$(get_full_firmware_dir)/firmware.tar + mkdir -p ${INSTALL}/$(get_full_firmware_dir)/qcom/venus-1.8/ + cp -a linux-board-support-package-v${PKG_VERSION%.0}/proprietary-linux/* ${INSTALL}/$(get_full_firmware_dir) + cp -a linux-board-support-package-v${PKG_VERSION%.0}/proprietary-linux/venus* ${INSTALL}/$(get_full_firmware_dir)/qcom/venus-1.8/ + rm ${INSTALL}/$(get_full_firmware_dir)/firmware.tar MTOOLS_SKIP_CHECK=1 mcopy -n -i linux-board-support-package-v${PKG_VERSION%.0}/bootloaders-linux/NON-HLOS.bin \ ::image/modem.* \ ::image/mba.mbn \ ::image/wcnss.* \ - $INSTALL/$(get_full_firmware_dir) + ${INSTALL}/$(get_full_firmware_dir) } diff --git a/packages/linux-firmware/firmware-imx/package.mk b/packages/linux-firmware/firmware-imx/package.mk index 90f2bb57ac..226694dc13 100644 --- a/packages/linux-firmware/firmware-imx/package.mk +++ b/packages/linux-firmware/firmware-imx/package.mk @@ -14,15 +14,15 @@ PKG_LONGDESC="firmware-imx: Freescale IMX firmware such as for the VPU" PKG_TOOLCHAIN="manual" unpack() { - cd $(dirname $PKG_BUILD) - sh $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.bin --auto-accept + cd $(dirname ${PKG_BUILD}) + sh ${SOURCES}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.bin --auto-accept } makeinstall_target() { - mkdir -p $INSTALL/$(get_full_firmware_dir)/imx/sdma - cp -P firmware/sdma/sdma-imx6q.bin $INSTALL/$(get_full_firmware_dir)/imx/sdma + mkdir -p ${INSTALL}/$(get_full_firmware_dir)/imx/sdma + cp -P firmware/sdma/sdma-imx6q.bin ${INSTALL}/$(get_full_firmware_dir)/imx/sdma - mkdir -p $INSTALL/$(get_full_firmware_dir)/vpu - cp -P firmware/vpu/vpu_fw_imx6d.bin $INSTALL/$(get_full_firmware_dir)/vpu - cp -P firmware/vpu/vpu_fw_imx6q.bin $INSTALL/$(get_full_firmware_dir)/vpu + mkdir -p ${INSTALL}/$(get_full_firmware_dir)/vpu + cp -P firmware/vpu/vpu_fw_imx6d.bin ${INSTALL}/$(get_full_firmware_dir)/vpu + cp -P firmware/vpu/vpu_fw_imx6q.bin ${INSTALL}/$(get_full_firmware_dir)/vpu } diff --git a/packages/linux-firmware/iwlwifi-firmware/package.mk b/packages/linux-firmware/iwlwifi-firmware/package.mk index 69a9b24701..1924e57085 100644 --- a/packages/linux-firmware/iwlwifi-firmware/package.mk +++ b/packages/linux-firmware/iwlwifi-firmware/package.mk @@ -7,11 +7,11 @@ PKG_VERSION="422508ec618285ef41a6a4baae731cb84b2a53be" PKG_SHA256="67f6097c62feb82bd51bd94b8b5607a37bf5cb34ae079649d35e505c2db2b107" PKG_LICENSE="Free-to-use" PKG_SITE="https://github.com/LibreELEC/iwlwifi-firmware" -PKG_URL="https://github.com/LibreELEC/iwlwifi-firmware/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/LibreELEC/iwlwifi-firmware/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="iwlwifi-firmware: firmwares for various Intel WLAN drivers" PKG_TOOLCHAIN="manual" makeinstall_target() { - DESTDIR=$INSTALL/$(get_kernel_overlay_dir) ./install + DESTDIR=${INSTALL}/$(get_kernel_overlay_dir) ./install } diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk index fb427a3b18..483a9e2a0c 100644 --- a/packages/linux-firmware/kernel-firmware/package.mk +++ b/packages/linux-firmware/kernel-firmware/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="20201218" PKG_SHA256="d60a418260bc083df8c7d3359aa207b48181ec8354b6c8545cac28ff19ce8950" PKG_LICENSE="other" PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/" -PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/$PKG_VERSION.tar.gz" +PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${PKG_VERSION}.tar.gz" PKG_NEED_UNPACK="${PROJECT_DIR}/${PROJECT}/packages/${PKG_NAME} ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/${PKG_NAME}" PKG_LONGDESC="kernel-firmware: kernel related firmware" PKG_TOOLCHAIN="manual" @@ -25,7 +25,7 @@ post_patch() { # Install additional miscellaneous drivers makeinstall_target() { - FW_TARGET_DIR=$INSTALL/$(get_full_firmware_dir) + FW_TARGET_DIR=${INSTALL}/$(get_full_firmware_dir) if find_file_path config/kernel-firmware.dat; then FW_LISTS="${FOUND_PATH}" @@ -67,12 +67,12 @@ makeinstall_target() { # They are also not required at all if the kernel is not suitably configured. 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.* + rm -fr ${FW_TARGET_DIR}/brcm/brcmfmac43430*-sdio.* + rm -fr ${FW_TARGET_DIR}/brcm/brcmfmac43455*-sdio.* fi # brcm pcie firmware is only needed by x86_64 - [ "$TARGET_ARCH" != "x86_64" ] && rm -fr $FW_TARGET_DIR/brcm/*-pcie.* + [ "${TARGET_ARCH}" != "x86_64" ] && rm -fr ${FW_TARGET_DIR}/brcm/*-pcie.* # Cleanup - which may be project or device specific find_file_path scripts/cleanup.sh && ${FOUND_PATH} ${FW_TARGET_DIR} || true diff --git a/packages/linux-firmware/misc-firmware/package.mk b/packages/linux-firmware/misc-firmware/package.mk index c790f4a0ba..ba9c2964fa 100644 --- a/packages/linux-firmware/misc-firmware/package.mk +++ b/packages/linux-firmware/misc-firmware/package.mk @@ -7,11 +7,11 @@ PKG_VERSION="868fb584096c17ddcbc85e472e71f9b8d27da91f" PKG_SHA256="862a5a62b9794d7c6753ac0f7ae03fd34ee2564199afd61c42dc8f69d4c5b876" PKG_LICENSE="Free-to-use" PKG_SITE="https://github.com/LibreELEC/misc-firmware" -PKG_URL="https://github.com/LibreELEC/misc-firmware/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/LibreELEC/misc-firmware/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kernel-firmware" PKG_LONGDESC="misc-firmware: firmwares for various drivers" PKG_TOOLCHAIN="manual" makeinstall_target() { - DESTDIR=$INSTALL/$(get_kernel_overlay_dir) ./install + DESTDIR=${INSTALL}/$(get_kernel_overlay_dir) ./install } diff --git a/packages/linux-firmware/rtl8723bs_bt/package.mk b/packages/linux-firmware/rtl8723bs_bt/package.mk index 80f43bfefa..3dda0316df 100644 --- a/packages/linux-firmware/rtl8723bs_bt/package.mk +++ b/packages/linux-firmware/rtl8723bs_bt/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="09eb91f52a639ec5e4c5c4c98dc2afede046cf20" PKG_SHA256="4bb8483c4a14a9e0dfc4a6ddca18486caab5f361be2441b91e9e2a399ca9f33e" PKG_LICENSE="GPL" PKG_SITE="https://github.com/lwfinger/rtl8723bs_bt" -PKG_URL="https://github.com/lwfinger/rtl8723bs_bt/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/lwfinger/rtl8723bs_bt/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="rtl8723bs_bt Linux firmware" diff --git a/packages/linux-firmware/wlan-firmware/package.mk b/packages/linux-firmware/wlan-firmware/package.mk index d757153bd6..355c2f0457 100644 --- a/packages/linux-firmware/wlan-firmware/package.mk +++ b/packages/linux-firmware/wlan-firmware/package.mk @@ -6,11 +6,11 @@ PKG_VERSION="adb069a3c95913f4a55e540ed7bb2be33a582479" PKG_SHA256="1cd010f0e9eaba38376c15b08520ea1825fcb84c73bb1b4ce8ce248d6530eccc" PKG_LICENSE="Free-to-use" PKG_SITE="https://github.com/LibreELEC/wlan-firmware" -PKG_URL="https://github.com/LibreELEC/wlan-firmware/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/LibreELEC/wlan-firmware/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="wlan-firmware: firmwares for various WLAN drivers" PKG_TOOLCHAIN="manual" makeinstall_target() { - DESTDIR=$INSTALL/$(get_kernel_overlay_dir) ./install + DESTDIR=${INSTALL}/$(get_kernel_overlay_dir) ./install } From 928c79de2d19fccfbef0d234b28986475f0b563c Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:09 +0000 Subject: [PATCH 14/27] mediacenter: automated code cleanup Signed-off-by: Ian Leonard --- .../mediacenter/JsonSchemaBuilder/package.mk | 8 +- .../mediacenter/LibreELEC-settings/package.mk | 2 +- packages/mediacenter/TexturePacker/package.mk | 10 +- .../audiodecoder.2sf/package.mk | 2 +- .../audiodecoder.asap/package.mk | 2 +- .../audiodecoder.dumb/package.mk | 2 +- .../audiodecoder.fluidsynth/package.mk | 2 +- .../audiodecoder.gme/package.mk | 2 +- .../audiodecoder.gsf/package.mk | 2 +- .../audiodecoder.modplug/package.mk | 2 +- .../audiodecoder.ncsf/package.mk | 2 +- .../audiodecoder.nosefart/package.mk | 2 +- .../audiodecoder.openmpt/package.mk | 2 +- .../audiodecoder.organya/package.mk | 2 +- .../audiodecoder.qsf/package.mk | 2 +- .../audiodecoder.sacd/package.mk | 2 +- .../audiodecoder.sidplay/package.mk | 4 +- .../audiodecoder.snesapu/package.mk | 2 +- .../audiodecoder.ssf/package.mk | 2 +- .../audiodecoder.stsound/package.mk | 2 +- .../audiodecoder.timidity/package.mk | 10 +- .../audiodecoder.upse/package.mk | 2 +- .../audiodecoder.usf/package.mk | 2 +- .../audiodecoder.vgmstream/package.mk | 2 +- .../audiodecoder.wsr/package.mk | 2 +- .../audioencoder.flac/package.mk | 2 +- .../audioencoder.lame/package.mk | 2 +- .../audioencoder.vorbis/package.mk | 2 +- .../audioencoder.wav/package.mk | 2 +- .../game.libretro.2048/package.mk | 2 +- .../game.libretro.4do/package.mk | 2 +- .../game.libretro.atari800/package.mk | 2 +- .../game.libretro.beetle-bsnes/package.mk | 2 +- .../game.libretro.beetle-gba/package.mk | 2 +- .../game.libretro.beetle-lynx/package.mk | 2 +- .../game.libretro.beetle-ngp/package.mk | 2 +- .../game.libretro.beetle-pce-fast/package.mk | 2 +- .../game.libretro.beetle-pcfx/package.mk | 2 +- .../game.libretro.beetle-psx/package.mk | 2 +- .../game.libretro.beetle-saturn/package.mk | 2 +- .../package.mk | 2 +- .../game.libretro.beetle-vb/package.mk | 2 +- .../game.libretro.beetle-wswan/package.mk | 2 +- .../game.libretro.bluemsx/package.mk | 2 +- .../game.libretro.bnes/package.mk | 2 +- .../package.mk | 2 +- .../package.mk | 2 +- .../package.mk | 2 +- .../game.libretro.cap32/package.mk | 2 +- .../game.libretro.desmume/package.mk | 2 +- .../game.libretro.dinothawr/package.mk | 2 +- .../game.libretro.dolphin/package.mk | 2 +- .../game.libretro.dosbox/package.mk | 2 +- .../game.libretro.fbalpha/package.mk | 2 +- .../game.libretro.fceumm/package.mk | 2 +- .../game.libretro.fmsx/package.mk | 2 +- .../game.libretro.fsuae/package.mk | 2 +- .../game.libretro.fuse/package.mk | 2 +- .../game.libretro.gambatte/package.mk | 2 +- .../game.libretro.genplus/package.mk | 2 +- .../game.libretro.gw/package.mk | 2 +- .../game.libretro.handy/package.mk | 2 +- .../game.libretro.hatari/package.mk | 2 +- .../game.libretro.mame/package.mk | 2 +- .../game.libretro.mame2000/package.mk | 2 +- .../game.libretro.mame2003/package.mk | 2 +- .../game.libretro.mame2003_plus/package.mk | 2 +- .../game.libretro.mame2010/package.mk | 2 +- .../game.libretro.melonds/package.mk | 2 +- .../game.libretro.mesen/package.mk | 2 +- .../game.libretro.meteor/package.mk | 2 +- .../game.libretro.mgba/package.mk | 2 +- .../game.libretro.mrboom/package.mk | 2 +- .../game.libretro.mupen64plus/package.mk | 2 +- .../game.libretro.nestopia/package.mk | 2 +- .../game.libretro.nx/package.mk | 2 +- .../game.libretro.o2em/package.mk | 2 +- .../game.libretro.pcsx-rearmed/package.mk | 2 +- .../game.libretro.picodrive/package.mk | 2 +- .../game.libretro.pokemini/package.mk | 2 +- .../game.libretro.ppsspp/package.mk | 2 +- .../game.libretro.prboom/package.mk | 2 +- .../game.libretro.prosystem/package.mk | 2 +- .../game.libretro.quicknes/package.mk | 2 +- .../game.libretro.reicast/package.mk | 2 +- .../game.libretro.sameboy/package.mk | 2 +- .../game.libretro.scummvm/package.mk | 4 +- .../game.libretro.snes9x/package.mk | 2 +- .../game.libretro.snes9x2002/package.mk | 2 +- .../game.libretro.snes9x2010/package.mk | 2 +- .../game.libretro.stella/package.mk | 2 +- .../game.libretro.tgbdual/package.mk | 2 +- .../game.libretro.tyrquake/package.mk | 2 +- .../game.libretro.uae/package.mk | 2 +- .../game.libretro.uae4arm/package.mk | 2 +- .../game.libretro.vba-next/package.mk | 2 +- .../game.libretro.vbam/package.mk | 2 +- .../game.libretro.vecx/package.mk | 2 +- .../game.libretro.vice/package.mk | 2 +- .../game.libretro.virtualjaguar/package.mk | 2 +- .../game.libretro.vram-test/package.mk | 2 +- .../game.libretro.yabause/package.mk | 2 +- .../game.libretro/package.mk | 2 +- .../imagedecoder.heif/package.mk | 2 +- .../imagedecoder.mpo/package.mk | 2 +- .../imagedecoder.raw/package.mk | 2 +- .../inputstream.adaptive/package.mk | 12 +- .../inputstream.ffmpegdirect/package.mk | 2 +- .../inputstream.rtmp/package.mk | 2 +- .../peripheral.joystick/package.mk | 2 +- .../peripheral.xarcade/package.mk | 2 +- .../kodi-binary-addons/pvr.argustv/package.mk | 4 +- .../kodi-binary-addons/pvr.demo/package.mk | 2 +- .../kodi-binary-addons/pvr.dvblink/package.mk | 2 +- .../pvr.dvbviewer/package.mk | 2 +- .../kodi-binary-addons/pvr.filmon/package.mk | 2 +- .../kodi-binary-addons/pvr.freebox/package.mk | 2 +- .../pvr.hdhomerun/package.mk | 2 +- .../kodi-binary-addons/pvr.hts/package.mk | 2 +- .../pvr.iptvsimple/package.mk | 2 +- .../pvr.mediaportal.tvserver/package.mk | 4 +- .../kodi-binary-addons/pvr.mythtv/package.mk | 2 +- .../kodi-binary-addons/pvr.nextpvr/package.mk | 4 +- .../kodi-binary-addons/pvr.njoy/package.mk | 2 +- .../kodi-binary-addons/pvr.octonet/package.mk | 2 +- .../kodi-binary-addons/pvr.pctv/package.mk | 2 +- .../pvr.sledovanitv.cz/package.mk | 2 +- .../kodi-binary-addons/pvr.stalker/package.mk | 2 +- .../kodi-binary-addons/pvr.teleboy/package.mk | 2 +- .../kodi-binary-addons/pvr.vbox/package.mk | 2 +- .../pvr.vdr.vnsi/package.mk | 2 +- .../kodi-binary-addons/pvr.vuplus/package.mk | 2 +- .../kodi-binary-addons/pvr.waipu/package.mk | 2 +- .../kodi-binary-addons/pvr.wmc/package.mk | 2 +- .../kodi-binary-addons/pvr.zattoo/package.mk | 2 +- .../screensaver.asteroids/package.mk | 2 +- .../screensaver.asterwave/package.mk | 4 +- .../screensaver.biogenesis/package.mk | 4 +- .../screensaver.greynetic/package.mk | 4 +- .../screensaver.matrixtrails/package.mk | 4 +- .../screensaver.pingpong/package.mk | 4 +- .../screensaver.pyro/package.mk | 4 +- .../screensaver.shadertoy/package.mk | 10 +- .../screensaver.stars/package.mk | 4 +- .../vfs.libarchive/package.mk | 2 +- .../kodi-binary-addons/vfs.rar/package.mk | 2 +- .../kodi-binary-addons/vfs.sacd/package.mk | 2 +- .../kodi-binary-addons/vfs.sftp/package.mk | 2 +- .../visualization.fishbmc/package.mk | 2 +- .../visualization.goom/package.mk | 2 +- .../visualization.matrix/package.mk | 10 +- .../visualization.pictureit/package.mk | 2 +- .../visualization.projectm/package.mk | 6 +- .../visualization.shadertoy/package.mk | 10 +- .../visualization.spectrum/package.mk | 2 +- .../visualization.starburst/package.mk | 2 +- .../visualization.waveform/package.mk | 2 +- packages/mediacenter/kodi-platform/package.mk | 8 +- .../mediacenter/kodi-theme-Estuary/package.mk | 4 +- packages/mediacenter/kodi/package.mk | 328 +++++++++--------- packages/mediacenter/p8-platform/package.mk | 6 +- 161 files changed, 372 insertions(+), 372 deletions(-) diff --git a/packages/mediacenter/JsonSchemaBuilder/package.mk b/packages/mediacenter/JsonSchemaBuilder/package.mk index 950f3c4f51..d5782836b6 100644 --- a/packages/mediacenter/JsonSchemaBuilder/package.mk +++ b/packages/mediacenter/JsonSchemaBuilder/package.mk @@ -7,14 +7,14 @@ PKG_VERSION="0" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_DEPENDS_HOST="toolchain:host" -PKG_DEPENDS_UNPACK="$MEDIACENTER" +PKG_DEPENDS_UNPACK="${MEDIACENTER}" PKG_LONGDESC="kodi-platform:" -PKG_CMAKE_SCRIPT="$(get_build_dir $MEDIACENTER)/tools/depends/native/JsonSchemaBuilder/CMakeLists.txt" +PKG_CMAKE_SCRIPT="$(get_build_dir ${MEDIACENTER})/tools/depends/native/JsonSchemaBuilder/CMakeLists.txt" PKG_CMAKE_OPTS_HOST="-Wno-dev" makeinstall_host() { - mkdir -p $TOOLCHAIN/bin - cp JsonSchemaBuilder $TOOLCHAIN/bin + mkdir -p ${TOOLCHAIN}/bin + cp JsonSchemaBuilder ${TOOLCHAIN}/bin } diff --git a/packages/mediacenter/LibreELEC-settings/package.mk b/packages/mediacenter/LibreELEC-settings/package.mk index ce9dec633d..e129308466 100644 --- a/packages/mediacenter/LibreELEC-settings/package.mk +++ b/packages/mediacenter/LibreELEC-settings/package.mk @@ -25,7 +25,7 @@ post_makeinstall_target() { mkdir -p ${INSTALL}/usr/lib/libreelec cp ${PKG_DIR}/scripts/* ${INSTALL}/usr/lib/libreelec sed -e "s/@DISTRONAME@/${DISTRONAME}/g" \ - -i $INSTALL/usr/lib/libreelec/backup-restore + -i ${INSTALL}/usr/lib/libreelec/backup-restore ADDON_INSTALL_DIR=${INSTALL}/usr/share/kodi/addons/service.libreelec.settings python_compile ${ADDON_INSTALL_DIR}/resources/lib/ diff --git a/packages/mediacenter/TexturePacker/package.mk b/packages/mediacenter/TexturePacker/package.mk index 15f436a6c4..9ce30cbf7c 100644 --- a/packages/mediacenter/TexturePacker/package.mk +++ b/packages/mediacenter/TexturePacker/package.mk @@ -7,18 +7,18 @@ PKG_VERSION="0" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_DEPENDS_HOST="lzo:host libpng:host libjpeg-turbo:host giflib:host" -PKG_DEPENDS_UNPACK="$MEDIACENTER" +PKG_DEPENDS_UNPACK="${MEDIACENTER}" PKG_LONGDESC="kodi-platform:" -PKG_CMAKE_SCRIPT="$(get_build_dir $MEDIACENTER)/tools/depends/native/TexturePacker/CMakeLists.txt" +PKG_CMAKE_SCRIPT="$(get_build_dir ${MEDIACENTER})/tools/depends/native/TexturePacker/CMakeLists.txt" PKG_CMAKE_OPTS_HOST="-Wno-dev" pre_configure_host() { - export CXXFLAGS="$CXXFLAGS -std=c++11 -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -I$(get_build_dir $MEDIACENTER)/xbmc/platform/linux" + export CXXFLAGS="${CXXFLAGS} -std=c++11 -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -I$(get_build_dir ${MEDIACENTER})/xbmc/platform/linux" } makeinstall_host() { - mkdir -p $TOOLCHAIN/bin - cp TexturePacker $TOOLCHAIN/bin + mkdir -p ${TOOLCHAIN}/bin + cp TexturePacker ${TOOLCHAIN}/bin } diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.2sf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.2sf/package.mk index 6af9537bdd..9ef8818a87 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.2sf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.2sf/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.2sf" -PKG_URL="https://github.com/xbmc/audiodecoder.2sf/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.2sf/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.2sf" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk index 20b123e2aa..bd585f6144 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.asap/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.asap" -PKG_URL="https://github.com/xbmc/audiodecoder.asap/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.asap/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.asap" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk index 683277957e..b46e3835fa 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.dumb/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.dumb" -PKG_URL="https://github.com/xbmc/audiodecoder.dumb/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.dumb/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.dumb" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.fluidsynth/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.fluidsynth/package.mk index 7fa149fa1b..3f89992b92 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.fluidsynth/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.fluidsynth/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.fluidsynth" -PKG_URL="https://github.com/xbmc/audiodecoder.fluidsynth/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.fluidsynth/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform fluidsynth" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.fluidsynth" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.gme/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.gme/package.mk index 5a4fd9edc4..e1eac42d8a 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.gme/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.gme/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.gme" -PKG_URL="https://github.com/xbmc/audiodecoder.gme/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.gme/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.gme" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.gsf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.gsf/package.mk index 739d8de13d..e2aafa8c04 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.gsf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.gsf/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.gsf" -PKG_URL="https://github.com/xbmc/audiodecoder.gsf/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.gsf/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.gsf" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk index 3c2d088d7b..fd84447b00 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.modplug/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.modplug" -PKG_URL="https://github.com/xbmc/audiodecoder.modplug/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.modplug/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libmodplug" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.modplug" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.ncsf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.ncsf/package.mk index ca2cd76f3c..85a26b2676 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.ncsf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.ncsf/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.ncsf" -PKG_URL="https://github.com/xbmc/audiodecoder.ncsf/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.ncsf/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.ncsf" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk index be6aebe08a..d271cbe7c9 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.nosefart/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.nosefart" -PKG_URL="https://github.com/xbmc/audiodecoder.nosefart/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.nosefart/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.nosefart" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.openmpt/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.openmpt/package.mk index 54dfc447cd..56979c638b 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.openmpt/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.openmpt/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.openmpt" -PKG_URL="https://github.com/xbmc/audiodecoder.openmpt/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.openmpt/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libopenmpt" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.openmpt" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.organya/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.organya/package.mk index f2d4840ec5..e10718cd54 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.organya/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.organya/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.organya" -PKG_URL="https://github.com/xbmc/audiodecoder.organya/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.organya/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.organya" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.qsf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.qsf/package.mk index 4d9d85b83c..351c97a1e3 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.qsf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.qsf/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.qsf" -PKG_URL="https://github.com/xbmc/audiodecoder.qsf/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.qsf/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.qsf" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.sacd/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.sacd/package.mk index 9fa4fcdccf..086e55a06a 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.sacd/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.sacd/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.sacd" -PKG_URL="https://github.com/xbmc/audiodecoder.sacd/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.sacd/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform wavpack" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.sacd" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk index 67392af8b6..2094cb0ca8 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.sidplay/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.sidplay" -PKG_URL="https://github.com/xbmc/audiodecoder.sidplay/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.sidplay/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform sidplay-libs" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.sidplay" @@ -18,4 +18,4 @@ PKG_LONGDESC="audiodecoder.sidplay" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_CMAKE_OPTS_TARGET="-DSIDPLAY2_LIBRARIES=$SYSROOT_PREFIX/usr/lib" +PKG_CMAKE_OPTS_TARGET="-DSIDPLAY2_LIBRARIES=${SYSROOT_PREFIX}/usr/lib" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk index fe88d8da66..8c9492557c 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.snesapu/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.snesapu" -PKG_URL="https://github.com/xbmc/audiodecoder.snesapu/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.snesapu/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.snesapu" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.ssf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.ssf/package.mk index e5b6d2b7ad..08da90d051 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.ssf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.ssf/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.ssf" -PKG_URL="https://github.com/xbmc/audiodecoder.ssf/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.ssf/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.ssf" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk index c73ddcc776..07d371af58 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.stsound/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.stsound" -PKG_URL="https://github.com/xbmc/audiodecoder.stsound/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.stsound/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.stsound" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk index 55ab32bd3b..e603b3dc1d 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.timidity/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.timidity" -PKG_URL="https://github.com/xbmc/audiodecoder.timidity/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.timidity/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.timidity" @@ -19,12 +19,12 @@ PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" pre_configure_target() { - CFLAGS="$CFLAGS -fcommon" + CFLAGS+=" -fcommon" } addon() { - install_binary_addon $PKG_ADDON_ID + install_binary_addon ${PKG_ADDON_ID} - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID - cp -P $PKG_BUILD/.$TARGET_NAME/lib/timidity/libtimidity_*.so $ADDON_BUILD/$PKG_ADDON_ID/ + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID} + cp -P ${PKG_BUILD}/.${TARGET_NAME}/lib/timidity/libtimidity_*.so ${ADDON_BUILD}/${PKG_ADDON_ID}/ } diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk index 04d0edaee9..a5478eca0f 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.upse/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.upse" -PKG_URL="https://github.com/xbmc/audiodecoder.upse/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.upse/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.upse" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk index e43986f0e5..e55befa149 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.usf" -PKG_URL="https://github.com/xbmc/audiodecoder.usf/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.usf/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.usf" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk index efd2efddf4..beb56ff18e 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.vgmstream/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.vgmstream" -PKG_URL="https://github.com/xbmc/audiodecoder.vgmstream/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.vgmstream/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.vgmstream" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk index 5cc6f9f71a..c7343d1501 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.wsr/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audiodecoder.wsr" -PKG_URL="https://github.com/xbmc/audiodecoder.wsr/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audiodecoder.wsr/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audiodecoder.wsr" diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk index f0b582a321..5217f94151 100644 --- a/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audioencoder.flac/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audioencoder.flac" -PKG_URL="https://github.com/xbmc/audioencoder.flac/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audioencoder.flac/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform flac" PKG_SECTION="" PKG_SHORTDESC="audioencoder.flac: A audioencoder addon for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk index c98300f3b2..4be7892f6d 100644 --- a/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audioencoder.lame/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audioencoder.lame" -PKG_URL="https://github.com/xbmc/audioencoder.lame/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audioencoder.lame/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform lame" PKG_SECTION="" PKG_SHORTDESC="audioencoder.lame: A audioencoder addon for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk index 5b6b3d6cc2..6fc0fec3de 100644 --- a/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audioencoder.vorbis/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audioencoder.vorbis" -PKG_URL="https://github.com/xbmc/audioencoder.vorbis/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audioencoder.vorbis/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libogg libvorbis" PKG_SECTION="" PKG_SHORTDESC="audioencoder.vorbis: A audioencoder addon for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk b/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk index 7cc0811cb4..4d2b70a3b2 100644 --- a/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audioencoder.wav/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/audioencoder.wav" -PKG_URL="https://github.com/xbmc/audioencoder.wav/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/audioencoder.wav/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="audioencoder.wav: A audioencoder addon for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.2048/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.2048/package.mk index bccacd291c..80eac2a639 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.2048/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.2048/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.2048" -PKG_URL="https://github.com/kodi-game/game.libretro.2048/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.2048/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-2048" PKG_SECTION="" PKG_LONGDESC="game.libretro.2048: 2048 for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.4do/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.4do/package.mk index 9ee8776de4..2903168c94 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.4do/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.4do/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.4do" -PKG_URL="https://github.com/kodi-game/game.libretro.4do/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.4do/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-4do" PKG_SECTION="" PKG_LONGDESC="game.libretro.4do: 4DO for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.atari800/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.atari800/package.mk index b7424ebd9a..d706b6e7cb 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.atari800/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.atari800/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.atari800" -PKG_URL="https://github.com/kodi-game/game.libretro.atari800/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.atari800/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-atari800" PKG_SECTION="" PKG_LONGDESC="game.libretro.atari800: atari800 for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-bsnes/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-bsnes/package.mk index d524cadfc8..14bf1dca4c 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-bsnes/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-bsnes/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.beetle-bsnes" -PKG_URL="https://github.com/kodi-game/game.libretro.beetle-bsnes/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.beetle-bsnes/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-beetle-bsnes" PKG_SECTION="" PKG_LONGDESC="game.libretro.beetle-bsnes: Beetle bSNES for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-gba/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-gba/package.mk index 1b85189015..1482f37dec 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-gba/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-gba/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.beetle-gba" -PKG_URL="https://github.com/kodi-game/game.libretro.beetle-gba/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.beetle-gba/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-beetle-gba" PKG_SECTION="" PKG_LONGDESC="game.libretro.beetle-gba: Beetle GBA for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-lynx/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-lynx/package.mk index bc9ef43920..37153d1aa2 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-lynx/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-lynx/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.beetle-lynx" -PKG_URL="https://github.com/kodi-game/game.libretro.beetle-lynx/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.beetle-lynx/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-beetle-lynx" PKG_SECTION="" PKG_LONGDESC="game.libretro.beetle-lynx: Beetle lynx for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-ngp/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-ngp/package.mk index 15350c37ab..8546802f2f 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-ngp/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-ngp/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.beetle-ngp" -PKG_URL="https://github.com/kodi-game/game.libretro.beetle-ngp/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.beetle-ngp/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-beetle-ngp" PKG_SECTION="" PKG_LONGDESC="game.libretro.beetle-ngp: Beetle ngp for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-pce-fast/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-pce-fast/package.mk index da21f4b9ac..ded6418cf3 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-pce-fast/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-pce-fast/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.beetle-pce-fast" -PKG_URL="https://github.com/kodi-game/game.libretro.beetle-pce-fast/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.beetle-pce-fast/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-beetle-pce-fast" PKG_SECTION="" PKG_LONGDESC="game.libretro.beetle-pce-fast: Beetle PCE Fast for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-pcfx/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-pcfx/package.mk index 6fdc08c34f..be8c7eb58a 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-pcfx/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-pcfx/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.beetle-pcfx" -PKG_URL="https://github.com/kodi-game/game.libretro.beetle-pcfx/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.beetle-pcfx/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-beetle-pcfx" PKG_SECTION="" PKG_LONGDESC="game.libretro.beetle-pcfx: Beetle pcfx for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-psx/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-psx/package.mk index 6e1e9d9072..d13689c805 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-psx/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-psx/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.beetle-psx" -PKG_URL="https://github.com/kodi-game/game.libretro.beetle-psx/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.beetle-psx/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-beetle-psx" PKG_SECTION="" PKG_LONGDESC="game.libretro.beetle-psx: Beetle PSX for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-saturn/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-saturn/package.mk index 56b40788a3..3eefbd7685 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-saturn/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-saturn/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="none" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.beetle-saturn" -PKG_URL="https://github.com/kodi-game/game.libretro.beetle-saturn/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.beetle-saturn/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-beetle-saturn" PKG_SECTION="" PKG_LONGDESC="game.libretro.beetle-saturn: beetle-saturn for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-supergrafx/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-supergrafx/package.mk index b876e2f6ba..d37bcdb86c 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-supergrafx/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-supergrafx/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.beetle-supergrafx" -PKG_URL="https://github.com/kodi-game/game.libretro.beetle-supergrafx/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.beetle-supergrafx/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-beetle-supergrafx" PKG_SECTION="" PKG_LONGDESC="game.libretro.beetle-supergrafx: Beetle supergrafx for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-vb/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-vb/package.mk index 4fafcbb1cd..d8db27c8b3 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-vb/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-vb/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.beetle-vb" -PKG_URL="https://github.com/kodi-game/game.libretro.beetle-vb/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.beetle-vb/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-beetle-vb" PKG_SECTION="" PKG_LONGDESC="game.libretro.beetle-vb: Beetle vb for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-wswan/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-wswan/package.mk index f3782d7dfb..b0c28585af 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-wswan/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.beetle-wswan/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.beetle-wswan" -PKG_URL="https://github.com/kodi-game/game.libretro.beetle-wswan/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.beetle-wswan/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-beetle-wswan" PKG_SECTION="" PKG_LONGDESC="game.libretro.beetle-wswan: Beetle wswan for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.bluemsx/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.bluemsx/package.mk index 4ca467ed83..1eac9fe95c 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.bluemsx/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.bluemsx/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.bluemsx" -PKG_URL="https://github.com/kodi-game/game.libretro.bluemsx/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.bluemsx/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-bluemsx" PKG_SECTION="" PKG_LONGDESC="game.libretro.bluemsx: BlueMSX for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.bnes/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.bnes/package.mk index fb58438c49..e6b4c4fa47 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.bnes/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.bnes/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.bnes" -PKG_URL="https://github.com/kodi-game/game.libretro.bnes/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.bnes/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-bnes" PKG_SECTION="" PKG_LONGDESC="game.libretro.bnes: bNES for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.bsnes-mercury-accuracy/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.bsnes-mercury-accuracy/package.mk index b17e1a93b9..cd5b45b0c1 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.bsnes-mercury-accuracy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.bsnes-mercury-accuracy/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.bsnes-mercury-accuracy" -PKG_URL="https://github.com/kodi-game/game.libretro.bsnes-mercury-accuracy/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.bsnes-mercury-accuracy/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-bsnes-mercury-accuracy" PKG_SECTION="" PKG_LONGDESC="game.libretro.bsnes-mercury-accuracy: bSNES Mercury for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.bsnes-mercury-balanced/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.bsnes-mercury-balanced/package.mk index a237121b27..f2e565166b 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.bsnes-mercury-balanced/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.bsnes-mercury-balanced/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.bsnes-mercury-balanced" -PKG_URL="https://github.com/kodi-game/game.libretro.bsnes-mercury-balanced/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.bsnes-mercury-balanced/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-bsnes-mercury-balanced" PKG_SECTION="" PKG_LONGDESC="game.libretro.bsnes-mercury-balanced: bSNES Mercury for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.bsnes-mercury-performance/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.bsnes-mercury-performance/package.mk index c6765af1e2..f84e7ff0f5 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.bsnes-mercury-performance/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.bsnes-mercury-performance/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.bsnes-mercury-performance" -PKG_URL="https://github.com/kodi-game/game.libretro.bsnes-mercury-performance/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.bsnes-mercury-performance/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-bsnes-mercury-performance" PKG_SECTION="" PKG_LONGDESC="game.libretro.bsnes-mercury-performance: bSNES Mercury for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.cap32/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.cap32/package.mk index ba1274602a..7aa489454a 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.cap32/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.cap32/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.cap32" -PKG_URL="https://github.com/kodi-game/game.libretro.cap32/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.cap32/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-cap32" PKG_SECTION="" PKG_LONGDESC="game.libretro.cap32: cap32 for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.desmume/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.desmume/package.mk index 07f657ceea..5906eb4fc9 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.desmume/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.desmume/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="none" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.desmume" -PKG_URL="https://github.com/kodi-game/game.libretro.desmume/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.desmume/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-desmume" PKG_SECTION="" PKG_LONGDESC="game.libretro.desmume: DESMuME GameClient for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.dinothawr/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.dinothawr/package.mk index 0360677d12..6cc2d41659 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.dinothawr/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.dinothawr/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.dinothawr" -PKG_URL="https://github.com/kodi-game/game.libretro.dinothawr/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.dinothawr/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-dinothawr" PKG_SECTION="" PKG_LONGDESC="game.libretro.dinothawr: dinothawr for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.dolphin/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.dolphin/package.mk index df997a4350..ef41cebbe3 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.dolphin/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.dolphin/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="none" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.dolphin" -PKG_URL="https://github.com/kodi-game/game.libretro.dolphin/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.dolphin/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-dolphin" PKG_SECTION="" PKG_LONGDESC="game.libretro.dolphin: Dolphin for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.dosbox/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.dosbox/package.mk index 9dfc9b3ee5..564e5c616a 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.dosbox/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.dosbox/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.dosbox" -PKG_URL="https://github.com/kodi-game/game.libretro.dosbox/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.dosbox/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-dosbox" PKG_SECTION="" PKG_LONGDESC="game.libretro.dosbox: DOSBox for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.fbalpha/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.fbalpha/package.mk index aed20d1eb4..2cc318fb59 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.fbalpha/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.fbalpha/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.fbalpha" -PKG_URL="https://github.com/kodi-game/game.libretro.fbalpha/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.fbalpha/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-fbalpha" PKG_SECTION="" PKG_LONGDESC="game.libretro.fbalpha: fba for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.fceumm/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.fceumm/package.mk index 2646a39825..74cd77795c 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.fceumm/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.fceumm/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.fceumm" -PKG_URL="https://github.com/kodi-game/game.libretro.fceumm/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.fceumm/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-fceumm" PKG_SECTION="" PKG_LONGDESC="game.libretro.fceumm: FCEUmm emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.fmsx/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.fmsx/package.mk index 9815551cb7..91bf986e55 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.fmsx/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.fmsx/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.fmsx" -PKG_URL="https://github.com/kodi-game/game.libretro.fmsx/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.fmsx/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-fmsx" PKG_SECTION="" PKG_LONGDESC="game.libretro.fmsx: fmsx for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.fsuae/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.fsuae/package.mk index 2869f7b31d..50f2956d06 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.fsuae/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.fsuae/package.mk @@ -8,7 +8,7 @@ PKG_REV="105" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.fsuae" -PKG_URL="https://github.com/kodi-game/game.libretro.fsuae/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.fsuae/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-fsuae" PKG_LONGDESC="game.libretro.fsuae: fsuae emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.fuse/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.fuse/package.mk index f24c0030c4..bd230d8d4f 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.fuse/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.fuse/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.fuse" -PKG_URL="https://github.com/kodi-game/game.libretro.fuse/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.fuse/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-fuse" PKG_SECTION="" PKG_LONGDESC="game.libretro.fuse: fuse for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.gambatte/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.gambatte/package.mk index 938abc97a2..b794d1d3ae 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.gambatte/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.gambatte/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.gambatte" -PKG_URL="https://github.com/kodi-game/game.libretro.gambatte/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.gambatte/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-gambatte" PKG_SECTION="" PKG_LONGDESC="game.libretro.gambatte: Gambatte emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.genplus/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.genplus/package.mk index 4d3a8487ae..2f88715a9a 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.genplus/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.genplus/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.genplus" -PKG_URL="https://github.com/kodi-game/game.libretro.genplus/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.genplus/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-genplus" PKG_SECTION="" PKG_LONGDESC="game.libretro.genplus: Genesis Plus GX emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.gw/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.gw/package.mk index b14705abf6..568998f564 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.gw/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.gw/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.gw" -PKG_URL="https://github.com/kodi-game/game.libretro.gw/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.gw/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-gw" PKG_SECTION="" PKG_LONGDESC="game.libretro.gw: gw for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.handy/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.handy/package.mk index b0a08000b7..202f053c71 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.handy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.handy/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.handy" -PKG_URL="https://github.com/kodi-game/game.libretro.handy/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.handy/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-handy" PKG_SECTION="" PKG_LONGDESC="game.libretro.handy: handy for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.hatari/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.hatari/package.mk index fb31a1d79a..5b867e195f 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.hatari/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.hatari/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.hatari" -PKG_URL="https://github.com/kodi-game/game.libretro.hatari/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.hatari/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-hatari" PKG_SECTION="" PKG_LONGDESC="game.libretro.hatari: hatari for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.mame/package.mk index 4786dcc234..8021849c52 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.mame/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.mame" -PKG_URL="https://github.com/kodi-game/game.libretro.mame/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.mame/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-mame" PKG_SECTION="" PKG_LONGDESC="game.libretro.mame: MAME emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/package.mk index e7066c8947..8679eb9fa7 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2000/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="13cc6c4a70949ecea7b5dc6bbc681ff10bf7617ab90dd5f4c6945b542b3d204a" PKG_REV="1" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.mame2000" -PKG_URL="https://github.com/kodi-game/game.libretro.mame2000/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.mame2000/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-mame2000" PKG_SECTION="" PKG_LONGDESC="game.libretro.mame2000: MAME 2000 emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/package.mk index a8e715b805..dd22f6495f 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="a1e3e2e9fdcd0fcfeeed5aabebae8363fd9626ab61d7591447719b7832ebb8ec" PKG_REV="1" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.mame2003" -PKG_URL="https://github.com/kodi-game/game.libretro.mame2003/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.mame2003/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-mame2003" PKG_SECTION="" PKG_LONGDESC="game.libretro.mame2003: MAME 2003 emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003_plus/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003_plus/package.mk index c051d523cf..e6a5be9207 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003_plus/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2003_plus/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="acc6f66f825d3e914692ec776c4b2073ff074b63d08d1846dfbbcd5895645858" PKG_REV="1" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.mame2003_plus" -PKG_URL="https://github.com/kodi-game/game.libretro.mame2003_plus/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.mame2003_plus/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-mame2003_plus" PKG_SECTION="" PKG_LONGDESC="game.libretro.mame2003_plus: MAME 2003 Plus emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/package.mk index 3e17d1c64b..d5cfe74007 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.mame2010/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="d8f1062809f2d6788773244567107d6abfae8742a7ee6cc696d3ae6b251bd49d" PKG_REV="1" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.mame2010" -PKG_URL="https://github.com/kodi-game/game.libretro.mame2010/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.mame2010/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-mame2010" PKG_SECTION="" PKG_LONGDESC="game.libretro.mame2010: MAME emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.melonds/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.melonds/package.mk index fc1d6ac89e..e8777f0149 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.melonds/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.melonds/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="none" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.melonds" -PKG_URL="https://github.com/kodi-game/game.libretro.melonds/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.melonds/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-melonds" PKG_SECTION="" PKG_LONGDESC="game.libretro.melonds: melonDS emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mesen/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.mesen/package.mk index 1cb2436131..80609df305 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.mesen/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.mesen/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.mesen" -PKG_URL="https://github.com/kodi-game/game.libretro.mesen/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.mesen/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-mesen" PKG_SECTION="" PKG_LONGDESC="game.libretro.mesen: mesen for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.meteor/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.meteor/package.mk index 2d571f40e9..0362a866cf 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.meteor/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.meteor/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.meteor" -PKG_URL="https://github.com/kodi-game/game.libretro.meteor/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.meteor/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-meteor" PKG_SECTION="" PKG_LONGDESC="game.libretro.meteor: Meteor GBA emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mgba/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.mgba/package.mk index 64bf713cc9..ecbc285dc4 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.mgba/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.mgba/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.mgba" -PKG_URL="https://github.com/kodi-game/game.libretro.mgba/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.mgba/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-mgba" PKG_SECTION="" PKG_LONGDESC="game.libretro.mgba: mGBA emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mrboom/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.mrboom/package.mk index 3ad49cf5a3..75de64a521 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.mrboom/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.mrboom/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.mrboom" -PKG_URL="https://github.com/kodi-game/game.libretro.mrboom/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.mrboom/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-mrboom" PKG_SECTION="" PKG_LONGDESC="game.libretro.mrboom: mrboom for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.mupen64plus/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.mupen64plus/package.mk index 26e0520460..f1ec519b11 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.mupen64plus/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.mupen64plus/package.mk @@ -9,7 +9,7 @@ PKG_REV="115" PKG_ARCH="none" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.mupen64plus" -PKG_URL="https://github.com/kodi-game/game.libretro.mupen64plus/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.mupen64plus/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-mupen64plus" PKG_SECTION="" PKG_LONGDESC="game.libretro.mupen64plus: Mupen 64 Plus emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.nestopia/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.nestopia/package.mk index 8af66b0f23..d248de0925 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.nestopia/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.nestopia/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.nestopia" -PKG_URL="https://github.com/kodi-game/game.libretro.nestopia/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.nestopia/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-nestopia" PKG_SECTION="" PKG_LONGDESC="game.libretro.nestopia: Nestopia emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.nx/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.nx/package.mk index 2043585500..88da7ed4da 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.nx/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.nx/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.nx" -PKG_URL="https://github.com/kodi-game/game.libretro.nx/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.nx/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-nx" PKG_SECTION="" PKG_LONGDESC="game.libretro.nx: nx for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.o2em/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.o2em/package.mk index 98c360b3e9..f150c22bd2 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.o2em/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.o2em/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.o2em" -PKG_URL="https://github.com/kodi-game/game.libretro.o2em/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.o2em/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-o2em" PKG_SECTION="" PKG_LONGDESC="game.libretro.o2em: o2em for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.pcsx-rearmed/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.pcsx-rearmed/package.mk index 78a8bf1336..cb706279e9 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.pcsx-rearmed/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.pcsx-rearmed/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.pcsx-rearmed" -PKG_URL="https://github.com/kodi-game/game.libretro.pcsx-rearmed/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.pcsx-rearmed/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-pcsx-rearmed" PKG_SECTION="" PKG_LONGDESC="game.libretro.pcsx-rearmed: PCSX Rearmed for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.picodrive/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.picodrive/package.mk index ba904ddf21..e2c5d3bac8 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.picodrive/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.picodrive/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.picodrive" -PKG_URL="https://github.com/kodi-game/game.libretro.picodrive/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.picodrive/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-picodrive" PKG_SECTION="" PKG_LONGDESC="game.libretro.picodrive: picodrive for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.pokemini/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.pokemini/package.mk index de523ebf56..d75d1a05fc 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.pokemini/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.pokemini/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.pokemini" -PKG_URL="https://github.com/kodi-game/game.libretro.pokemini/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.pokemini/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-pokemini" PKG_SECTION="" PKG_LONGDESC="game.libretro.pokemini: PokeMini emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.ppsspp/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.ppsspp/package.mk index 284dcf635e..6339c19374 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.ppsspp/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.ppsspp/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="none" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.ppsspp" -PKG_URL="https://github.com/kodi-game/game.libretro.ppsspp/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.ppsspp/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-ppsspp" PKG_SECTION="" PKG_LONGDESC="game.libretro.ppsspp: ppsspp for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.prboom/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.prboom/package.mk index 327f21f45c..c5e9466edf 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.prboom/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.prboom/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.prboom" -PKG_URL="https://github.com/kodi-game/game.libretro.prboom/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.prboom/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-prboom" PKG_SECTION="" PKG_LONGDESC="game.libretro.prboom: prboom for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.prosystem/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.prosystem/package.mk index 0e38dd3528..97e927dcf3 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.prosystem/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.prosystem/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.prosystem" -PKG_URL="https://github.com/kodi-game/game.libretro.prosystem/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.prosystem/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-prosystem" PKG_SECTION="" PKG_LONGDESC="game.libretro.prosystem: Prosystem for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.quicknes/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.quicknes/package.mk index e84e1b3641..b38214631e 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.quicknes/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.quicknes/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.quicknes" -PKG_URL="https://github.com/kodi-game/game.libretro.quicknes/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.quicknes/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-quicknes" PKG_SECTION="" PKG_LONGDESC="game.libretro.quicknes: QuickNES emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.reicast/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.reicast/package.mk index d79e0feadc..83173893a8 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.reicast/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.reicast/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="none" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.reicast" -PKG_URL="https://github.com/kodi-game/game.libretro.reicast/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.reicast/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-reicast" PKG_SECTION="" PKG_LONGDESC="game.libretro.reicast: reicast for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.sameboy/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.sameboy/package.mk index 267a6eebff..6fc559b297 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.sameboy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.sameboy/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.sameboy" -PKG_URL="https://github.com/kodi-game/game.libretro.sameboy/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.sameboy/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-sameboy" PKG_SECTION="" PKG_LONGDESC="game.libretro.sameboy: SameBoy emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.scummvm/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.scummvm/package.mk index 70fd9023db..0e2d58c83c 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.scummvm/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.scummvm/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.scummvm" -PKG_URL="https://github.com/kodi-game/game.libretro.scummvm/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.scummvm/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-scummvm" PKG_SECTION="" PKG_LONGDESC="game.libretro.scummvm: scummvm for Kodi" @@ -17,5 +17,5 @@ PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.gameclient" pre_configure_target() { - export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` + export LDFLAGS=$(echo ${LDFLAGS} | sed -e "s|-Wl,--as-needed||") } diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.snes9x/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.snes9x/package.mk index 9aa925f678..90cf0559c2 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.snes9x/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.snes9x/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.snes9x" -PKG_URL="https://github.com/kodi-game/game.libretro.snes9x/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.snes9x/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-snes9x" PKG_SECTION="" PKG_LONGDESC="game.libretro.snes9x: snes9x for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.snes9x2002/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.snes9x2002/package.mk index 04256a8e4f..d89249cc0a 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.snes9x2002/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.snes9x2002/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="arm" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.snes9x2002" -PKG_URL="https://github.com/kodi-game/game.libretro.snes9x2002/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.snes9x2002/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-snes9x2002" PKG_SECTION="" PKG_LONGDESC="game.libretro.snes9x2002: snes9x2002 for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.snes9x2010/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.snes9x2010/package.mk index 049f6400ae..d47f046017 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.snes9x2010/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.snes9x2010/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.snes9x2010" -PKG_URL="https://github.com/kodi-game/game.libretro.snes9x2010/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.snes9x2010/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-snes9x2010" PKG_SECTION="" PKG_LONGDESC="game.libretro.snes9x2010: snes9x2010 for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.stella/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.stella/package.mk index 59c912e436..f5b1889034 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.stella/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.stella/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.stella" -PKG_URL="https://github.com/kodi-game/game.libretro.stella/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.stella/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-stella" PKG_SECTION="" PKG_LONGDESC="game.libretro.stella: Stella emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.tgbdual/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.tgbdual/package.mk index 346a6bf54a..05594836c1 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.tgbdual/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.tgbdual/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.tgbdual" -PKG_URL="https://github.com/kodi-game/game.libretro.tgbdual/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.tgbdual/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-tgbdual" PKG_SECTION="" PKG_LONGDESC="game.libretro.tgbdual: tgbdual for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.tyrquake/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.tyrquake/package.mk index 49630719f7..f9b937ca26 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.tyrquake/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.tyrquake/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.tyrquake" -PKG_URL="https://github.com/kodi-game/game.libretro.tyrquake/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.tyrquake/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-tyrquake" PKG_SECTION="" PKG_LONGDESC="game.libretro.tyrquake: tyrquake for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.uae/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.uae/package.mk index 44fe92a348..9116e3bdb3 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.uae/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.uae/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.uae" -PKG_URL="https://github.com/kodi-game/game.libretro.uae/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.uae/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-uae" PKG_SECTION="" PKG_LONGDESC="game.libretro.uae: uae emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.uae4arm/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.uae4arm/package.mk index da4d08b343..90efd8b357 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.uae4arm/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.uae4arm/package.mk @@ -8,7 +8,7 @@ PKG_REV="103" PKG_ARCH="arm" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.uae4arm" -PKG_URL="https://github.com/kodi-game/game.libretro.uae4arm/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.uae4arm/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-uae4arm" PKG_SECTION="" PKG_LONGDESC="game.libretro.uae4arm: uae4arm emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.vba-next/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.vba-next/package.mk index de49fdb871..9636fe0b75 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.vba-next/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.vba-next/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.vba-next" -PKG_URL="https://github.com/kodi-game/game.libretro.vba-next/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.vba-next/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-vba-next" PKG_SECTION="" PKG_LONGDESC="game.libretro.vba-next: VBA-Next emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.vbam/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.vbam/package.mk index cfd56b8bc0..cca6c8faf9 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.vbam/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.vbam/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.vbam" -PKG_URL="https://github.com/kodi-game/game.libretro.vbam/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.vbam/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-vbam" PKG_SECTION="" PKG_LONGDESC="game.libretro.vbam: VBA-M emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.vecx/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.vecx/package.mk index 3aa2ba7e06..1bc008a8f8 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.vecx/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.vecx/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.vecx" -PKG_URL="https://github.com/kodi-game/game.libretro.vecx/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.vecx/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-vecx" PKG_SECTION="" PKG_LONGDESC="game.libretro.vecx: vecx for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.vice/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.vice/package.mk index bda349224d..da610674bd 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.vice/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.vice/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.vice" -PKG_URL="https://github.com/kodi-game/game.libretro.vice/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.vice/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-vice" PKG_SECTION="" PKG_LONGDESC="game.libretro.vice: vice emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.virtualjaguar/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.virtualjaguar/package.mk index 251ac1d394..564541ea3f 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.virtualjaguar/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.virtualjaguar/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.virtualjaguar" -PKG_URL="https://github.com/kodi-game/game.libretro.virtualjaguar/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.virtualjaguar/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-virtualjaguar" PKG_SECTION="" PKG_LONGDESC="game.libretro.virtualjaguar: VirtualJaguar for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.vram-test/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.vram-test/package.mk index 7f442e7535..b82679f2aa 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.vram-test/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.vram-test/package.mk @@ -8,7 +8,7 @@ PKG_REV="101" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.vram-test" -PKG_URL="https://github.com/kodi-game/game.libretro.vram-test/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.vram-test/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-vram-test" PKG_SECTION="" PKG_LONGDESC="game.libretro.vram-test: vram-test emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.yabause/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.yabause/package.mk index d22741ef3c..b8b1655766 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.yabause/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.yabause/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.yabause" -PKG_URL="https://github.com/kodi-game/game.libretro.yabause/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro.yabause/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libretro-yabause" PKG_SECTION="" PKG_LONGDESC="game.libretro.yabause: Yabause emulator for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro/package.mk index 916cb59339..78838a911f 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro" -PKG_URL="https://github.com/kodi-game/game.libretro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/game.libretro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain tinyxml kodi" PKG_SECTION="" PKG_LONGDESC="game.libretro is a thin wrapper for libretro" diff --git a/packages/mediacenter/kodi-binary-addons/imagedecoder.heif/package.mk b/packages/mediacenter/kodi-binary-addons/imagedecoder.heif/package.mk index 9857752a01..5190b49a45 100644 --- a/packages/mediacenter/kodi-binary-addons/imagedecoder.heif/package.mk +++ b/packages/mediacenter/kodi-binary-addons/imagedecoder.heif/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/imagedecoder.heif" -PKG_URL="https://github.com/xbmc/imagedecoder.heif/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/imagedecoder.heif/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libheif" PKG_SECTION="" PKG_SHORTDESC="imagedecoder.heif" diff --git a/packages/mediacenter/kodi-binary-addons/imagedecoder.mpo/package.mk b/packages/mediacenter/kodi-binary-addons/imagedecoder.mpo/package.mk index ad12fba79c..f268c2ed6c 100644 --- a/packages/mediacenter/kodi-binary-addons/imagedecoder.mpo/package.mk +++ b/packages/mediacenter/kodi-binary-addons/imagedecoder.mpo/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/imagedecoder.mpo" -PKG_URL="https://github.com/xbmc/imagedecoder.mpo/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/imagedecoder.mpo/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libjpeg-turbo" PKG_SECTION="" PKG_SHORTDESC="imagedecoder.mpo" diff --git a/packages/mediacenter/kodi-binary-addons/imagedecoder.raw/package.mk b/packages/mediacenter/kodi-binary-addons/imagedecoder.raw/package.mk index b6de8bb0b8..2973ba1dda 100644 --- a/packages/mediacenter/kodi-binary-addons/imagedecoder.raw/package.mk +++ b/packages/mediacenter/kodi-binary-addons/imagedecoder.raw/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/imagedecoder.raw" -PKG_URL="https://github.com/xbmc/imagedecoder.raw/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/imagedecoder.raw/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libraw" PKG_SECTION="" PKG_SHORTDESC="imagedecoder.raw" diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk index b2a45c6de0..bcdefdeff1 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.adaptive/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/peak3d/inputstream.adaptive" -PKG_URL="https://github.com/peak3d/inputstream.adaptive/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/peak3d/inputstream.adaptive/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="inputstream.adaptive" @@ -16,13 +16,13 @@ PKG_LONGDESC="inputstream.adaptive" PKG_IS_ADDON="yes" -if [ "$TARGET_ARCH" = "x86_64" ] || [ "$TARGET_ARCH" = "arm" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET nss" +if [ "${TARGET_ARCH}" = "x86_64" ] || [ "${TARGET_ARCH}" = "arm" ]; then + PKG_DEPENDS_TARGET+=" nss" fi addon() { - install_binary_addon $PKG_ADDON_ID + install_binary_addon ${PKG_ADDON_ID} - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID - cp -P $PKG_BUILD/.$TARGET_NAME/wvdecrypter/libssd_wv.so $ADDON_BUILD/$PKG_ADDON_ID + mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID} + cp -P ${PKG_BUILD}/.${TARGET_NAME}/wvdecrypter/libssd_wv.so ${ADDON_BUILD}/${PKG_ADDON_ID} } diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.ffmpegdirect/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.ffmpegdirect/package.mk index 094dbfc1df..7f022e04a5 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.ffmpegdirect/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.ffmpegdirect/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL2+" PKG_SITE="https://github.com/xbmc/inputstream.ffmpegdirect" -PKG_URL="https://github.com/xbmc/inputstream.ffmpegdirect/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/inputstream.ffmpegdirect/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform bzip2 ffmpeg gmp gnutls libpng libxml2 nettle xz zlib zvbi" PKG_SECTION="" PKG_SHORTDESC="inputstream.ffmpegdirect" diff --git a/packages/mediacenter/kodi-binary-addons/inputstream.rtmp/package.mk b/packages/mediacenter/kodi-binary-addons/inputstream.rtmp/package.mk index 32f6e30f6c..8bace6c5a5 100644 --- a/packages/mediacenter/kodi-binary-addons/inputstream.rtmp/package.mk +++ b/packages/mediacenter/kodi-binary-addons/inputstream.rtmp/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/inputstream.rtmp" -PKG_URL="https://github.com/xbmc/inputstream.rtmp/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/inputstream.rtmp/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform rtmpdump" PKG_SECTION="" PKG_SHORTDESC="inputstream.rtmp" diff --git a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk index 9e75b2f614..3d17ffe318 100644 --- a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk +++ b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/peripheral.joystick" -PKG_URL="https://github.com/xbmc/peripheral.joystick/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/peripheral.joystick/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform p8-platform" PKG_SECTION="" PKG_SHORTDESC="peripheral.joystick: Joystick support in Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/peripheral.xarcade/package.mk b/packages/mediacenter/kodi-binary-addons/peripheral.xarcade/package.mk index 3e07be588f..8d9fea924f 100644 --- a/packages/mediacenter/kodi-binary-addons/peripheral.xarcade/package.mk +++ b/packages/mediacenter/kodi-binary-addons/peripheral.xarcade/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/peripheral.xarcade" -PKG_URL="https://github.com/kodi-game/peripheral.xarcade/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-game/peripheral.xarcade/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="X-Arcade Tankstick support for Kodi" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk index af6a5c3431..b89719d442 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.argustv/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.argustv" -PKG_URL="https://github.com/kodi-pvr/pvr.argustv/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.argustv/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform jsoncpp" PKG_SECTION="" PKG_SHORTDESC="pvr.argustv" @@ -19,5 +19,5 @@ PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" pre_configure_target() { - CXXFLAGS="$CXXFLAGS -Wno-narrowing" + CXXFLAGS+=" -Wno-narrowing" } diff --git a/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk index d2685734ea..df4005ace2 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.demo/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.demo" -PKG_URL="https://github.com/kodi-pvr/pvr.demo/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.demo/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="pvr.demo" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk index 426d4bc55e..0f680a310b 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.dvblink/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.dvblink" -PKG_URL="https://github.com/kodi-pvr/pvr.dvblink/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.dvblink/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform tinyxml2" PKG_SECTION="" PKG_SHORTDESC="pvr.dvblink" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk index abedbc8ba5..5f51b9d893 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.dvbviewer/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.dvbviewer" -PKG_URL="https://github.com/kodi-pvr/pvr.dvbviewer/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.dvbviewer/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="pvr.dvbviewer" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk index 4ed2a0903d..c6a61a1e7f 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.filmon/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.filmon" -PKG_URL="https://github.com/kodi-pvr/pvr.filmon/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.filmon/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform jsoncpp" PKG_SECTION="" PKG_SHORTDESC="pvr.filmon" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.freebox/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.freebox/package.mk index 5e32c624e7..1ba97f4b5e 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.freebox/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.freebox/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/aassif/pvr.freebox" -PKG_URL="https://github.com/aassif/pvr.freebox/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/aassif/pvr.freebox/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform rapidjson openssl zlib" PKG_SECTION="" PKG_SHORTDESC="pvr.freebox" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk index 9079b9ef05..3c53d848df 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.hdhomerun/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.hdhomerun" -PKG_URL="https://github.com/kodi-pvr/pvr.hdhomerun/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.hdhomerun/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform jsoncpp libhdhomerun" PKG_SECTION="" PKG_SHORTDESC="pvr.hdhomerun" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk index 2e48bfe096..2b0b572f62 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.hts/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.hts" -PKG_URL="https://github.com/kodi-pvr/pvr.hts/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.hts/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="pvr.hts" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk index b03d9bfb51..b96a1a37d8 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.iptvsimple/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.iptvsimple" -PKG_URL="https://github.com/kodi-pvr/pvr.iptvsimple/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.iptvsimple/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform pugixml zlib" PKG_SECTION="" PKG_SHORTDESC="pvr.iptvsimple" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk index 03e9763e7e..9c2299ed7f 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.mediaportal.tvserver/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.mediaportal.tvserver" -PKG_URL="https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="pvr.mediaportal.tvserver" @@ -19,5 +19,5 @@ PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" pre_configure_target() { - CXXFLAGS="$CXXFLAGS -Wno-narrowing -DXLOCALE_NOT_USED" + CXXFLAGS+=" -Wno-narrowing -DXLOCALE_NOT_USED" } diff --git a/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk index c9eb9cbe04..79f5d63bca 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.mythtv/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/janbar/pvr.mythtv" -PKG_URL="https://github.com/janbar/pvr.mythtv/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/janbar/pvr.mythtv/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="pvr.mythtv" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk index 6574188efa..fedf7d3161 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.nextpvr/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.nextpvr" -PKG_URL="https://github.com/kodi-pvr/pvr.nextpvr/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.nextpvr/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform tinyxml2" PKG_SECTION="" PKG_SHORTDESC="pvr.nextpvr" @@ -19,5 +19,5 @@ PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.pvrclient" pre_configure_target() { - CXXFLAGS="$CXXFLAGS -Wno-narrowing" + CXXFLAGS+=" -Wno-narrowing" } diff --git a/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk index 097a656a84..4bdcfa2ae6 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.njoy/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.njoy" -PKG_URL="https://github.com/kodi-pvr/pvr.njoy/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.njoy/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="pvr.njoy" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.octonet/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.octonet/package.mk index 1f229f43c5..8d15a80ea6 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.octonet/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.octonet/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/DigitalDevices/pvr.octonet" -PKG_URL="https://github.com/DigitalDevices/pvr.octonet/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/DigitalDevices/pvr.octonet/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform jsoncpp" PKG_SECTION="" PKG_SHORTDESC="A pvr plugin for DigitalDevices Octonet Sat>IP servers" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk index f54a5dfc0d..5d08cfab0c 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.pctv/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.pctv" -PKG_URL="https://github.com/kodi-pvr/pvr.pctv/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.pctv/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform jsoncpp" PKG_SECTION="" PKG_SHORTDESC="pvr.pctv" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk index 1e5980f9d5..ca18787d2e 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.sledovanitv.cz/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/palinek/pvr.sledovanitv.cz" -PKG_URL="https://github.com/palinek/pvr.sledovanitv.cz/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/palinek/pvr.sledovanitv.cz/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform jsoncpp" PKG_SECTION="" PKG_SHORTDESC="pvr.sledovanitv.cz" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk index 69f17b2650..646d0762c0 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.stalker/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.stalker" -PKG_URL="https://github.com/kodi-pvr/pvr.stalker/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.stalker/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform jsoncpp tinyxml" PKG_SECTION="" PKG_SHORTDESC="pvr.stalker" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.teleboy/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.teleboy/package.mk index 21e8e95894..869f97fa55 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.teleboy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.teleboy/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/rbuehlma/pvr.teleboy" -PKG_URL="https://github.com/rbuehlma/pvr.teleboy/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/rbuehlma/pvr.teleboy/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="pvr.teleboy" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk index 3907cd140d..c726a5f0ea 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.vbox/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.vbox" -PKG_URL="https://github.com/kodi-pvr/pvr.vbox/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.vbox/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform tinyxml2" PKG_SECTION="" PKG_SHORTDESC="pvr.vbox" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk index 52f2721601..f2beda9db7 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.vdr.vnsi/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.vdr.vnsi" -PKG_URL="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.vdr.vnsi/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="pvr.vdr.vnsi" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk index 30da1340b4..52673d1eb7 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.vuplus/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.vuplus" -PKG_URL="https://github.com/kodi-pvr/pvr.vuplus/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.vuplus/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform nlohmann-json" PKG_SECTION="" PKG_SHORTDESC="pvr.vuplus" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk index 552da8d425..dd142a7ac8 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.waipu/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/flubshi/pvr.waipu" -PKG_URL="https://github.com/flubshi/pvr.waipu/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/flubshi/pvr.waipu/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform rapidjson" PKG_SECTION="" PKG_SHORTDESC="pvr.waipu" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk index a6e49f1db4..45255ef158 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.wmc/package.mk @@ -9,7 +9,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-pvr/pvr.wmc" -PKG_URL="https://github.com/kodi-pvr/pvr.wmc/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/kodi-pvr/pvr.wmc/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="pvr.wmc" diff --git a/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk b/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk index c7e0228fea..de2e832e20 100644 --- a/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk +++ b/packages/mediacenter/kodi-binary-addons/pvr.zattoo/package.mk @@ -8,7 +8,7 @@ PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/rbuehlma/pvr.zattoo" -PKG_URL="https://github.com/rbuehlma/pvr.zattoo/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/rbuehlma/pvr.zattoo/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform tinyxml2" PKG_SECTION="" PKG_SHORTDESC="pvr.zattoo" diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.asteroids/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.asteroids/package.mk index 3ec65a9754..5c958ab02e 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.asteroids/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.asteroids/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/screensaver.asteroids" -PKG_URL="https://github.com/xbmc/screensaver.asteroids/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/screensaver.asteroids/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_SHORTDESC="screensaver.asteroids" diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk index 8087d0fb95..9504cdd189 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/screensaver.asterwave" -PKG_URL="https://github.com/xbmc/screensaver.asterwave/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/screensaver.asterwave/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform soil glm" PKG_SECTION="" PKG_SHORTDESC="screensaver.asterwave" @@ -18,6 +18,6 @@ PKG_LONGDESC="screensaver.asterwave" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.ui.screensaver" -if [ "$OPENGL" = "no" ] ; then +if [ "${OPENGL}" = "no" ]; then exit 0 fi diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.biogenesis/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.biogenesis/package.mk index 003b2de65e..835c72e88f 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.biogenesis/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.biogenesis/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/screensaver.biogenesis" -PKG_URL="https://github.com/xbmc/screensaver.biogenesis/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/screensaver.biogenesis/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="screensaver.biogenesis" @@ -18,6 +18,6 @@ PKG_LONGDESC="screensaver.biogenesis" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.ui.screensaver" -if [ "$OPENGL" = "no" ] ; then +if [ "${OPENGL}" = "no" ]; then exit 0 fi diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk index 94ef29ceb0..65f4611f32 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/screensaver.greynetic" -PKG_URL="https://github.com/xbmc/screensaver.greynetic/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/screensaver.greynetic/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_SHORTDESC="screensaver.greynetic" @@ -18,6 +18,6 @@ PKG_LONGDESC="screensaver.greynetic" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.ui.screensaver" -if [ "$OPENGL" = "no" ] ; then +if [ "${OPENGL}" = "no" ]; then exit 0 fi diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.matrixtrails/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.matrixtrails/package.mk index 6ef32373fc..ee7fe0a4f5 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.matrixtrails/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.matrixtrails/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/screensaver.matrixtrails" -PKG_URL="https://github.com/xbmc/screensaver.matrixtrails/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/screensaver.matrixtrails/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform soil" PKG_SECTION="" PKG_SHORTDESC="screensaver.matrixtrails" @@ -18,6 +18,6 @@ PKG_LONGDESC="screensaver.matrixtrails" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.ui.screensaver" -if [ "$OPENGL" = "no" ] ; then +if [ "${OPENGL}" = "no" ]; then exit 0 fi diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk index 2a7ccf6f3a..4d42552277 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.pingpong/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/screensaver.pingpong" -PKG_URL="https://github.com/xbmc/screensaver.pingpong/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/screensaver.pingpong/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_SHORTDESC="screensaver.pingpong" @@ -18,6 +18,6 @@ PKG_LONGDESC="screensaver.pingpong" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.ui.screensaver" -if [ "$OPENGL" = "no" ] ; then +if [ "${OPENGL}" = "no" ]; then exit 0 fi diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.pyro/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.pyro/package.mk index a5fc5c336f..9b478ecfc4 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.pyro/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.pyro/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/screensaver.pyro" -PKG_URL="https://github.com/xbmc/screensaver.pyro/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/screensaver.pyro/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="screensaver.pyro" @@ -18,6 +18,6 @@ PKG_LONGDESC="screensaver.pyro" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.ui.screensaver" -if [ "$OPENGL" = "no" ] ; then +if [ "${OPENGL}" = "no" ]; then exit 0 fi diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk index 43320e2bfe..e97d12b96c 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.shadertoy/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/screensaver.shadertoy" -PKG_URL="https://github.com/xbmc/screensaver.shadertoy/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/screensaver.shadertoy/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_SHORTDESC="screensaver.shadertoy" @@ -18,12 +18,12 @@ PKG_LONGDESC="screensaver.shadertoy" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.ui.screensaver" -if [ ! "$OPENGL" = "no" ]; then +if [ ! "${OPENGL}" = "no" ]; then # for OpenGL (GLX) support - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL glew" + PKG_DEPENDS_TARGET+=" ${OPENGL} glew" fi -if [ "$OPENGLES_SUPPORT" = yes ]; then +if [ "${OPENGLES_SUPPORT}" = yes ]; then # for OpenGL-ES support - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGLES" + PKG_DEPENDS_TARGET+=" ${OPENGLES}" fi diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.stars/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.stars/package.mk index f0c32afd45..3e2392ba6d 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.stars/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.stars/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/screensaver.stars" -PKG_URL="https://github.com/xbmc/screensaver.stars/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/screensaver.stars/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="screensaver.stars" @@ -18,6 +18,6 @@ PKG_LONGDESC="screensaver.stars" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.ui.screensaver" -if [ "$OPENGL" = "no" ] ; then +if [ "${OPENGL}" = "no" ]; then exit 0 fi diff --git a/packages/mediacenter/kodi-binary-addons/vfs.libarchive/package.mk b/packages/mediacenter/kodi-binary-addons/vfs.libarchive/package.mk index 7788b72a82..fed5066179 100644 --- a/packages/mediacenter/kodi-binary-addons/vfs.libarchive/package.mk +++ b/packages/mediacenter/kodi-binary-addons/vfs.libarchive/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/vfs.libarchive" -PKG_URL="https://github.com/xbmc/vfs.libarchive/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/vfs.libarchive/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform bzip2 libarchive lz4 lzo xz zlib" PKG_SECTION="" PKG_SHORTDESC="vfs.libarchive" diff --git a/packages/mediacenter/kodi-binary-addons/vfs.rar/package.mk b/packages/mediacenter/kodi-binary-addons/vfs.rar/package.mk index a68f1f5993..bba02b62b8 100644 --- a/packages/mediacenter/kodi-binary-addons/vfs.rar/package.mk +++ b/packages/mediacenter/kodi-binary-addons/vfs.rar/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/vfs.rar" -PKG_URL="https://github.com/xbmc/vfs.rar/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/vfs.rar/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="vfs.rar" diff --git a/packages/mediacenter/kodi-binary-addons/vfs.sacd/package.mk b/packages/mediacenter/kodi-binary-addons/vfs.sacd/package.mk index dce1050731..dd16e13abc 100644 --- a/packages/mediacenter/kodi-binary-addons/vfs.sacd/package.mk +++ b/packages/mediacenter/kodi-binary-addons/vfs.sacd/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/vfs.sacd" -PKG_URL="https://github.com/xbmc/vfs.sacd/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/vfs.sacd/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform" PKG_SECTION="" PKG_SHORTDESC="vfs.sacd" diff --git a/packages/mediacenter/kodi-binary-addons/vfs.sftp/package.mk b/packages/mediacenter/kodi-binary-addons/vfs.sftp/package.mk index 8e72024194..604fff12df 100644 --- a/packages/mediacenter/kodi-binary-addons/vfs.sftp/package.mk +++ b/packages/mediacenter/kodi-binary-addons/vfs.sftp/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPLv2" PKG_SITE="https://github.com/xbmc/vfs.sftp" -PKG_URL="https://github.com/xbmc/vfs.sftp/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/vfs.sftp/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libssh" PKG_SECTION="" PKG_SHORTDESC="vfs.sftp" diff --git a/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk index 1136d24a1a..abee660db8 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.fishbmc/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/visualization.fishbmc" -PKG_URL="https://github.com/xbmc/visualization.fishbmc/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/visualization.fishbmc/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_SHORTDESC="visualization.fishbmc" diff --git a/packages/mediacenter/kodi-binary-addons/visualization.goom/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.goom/package.mk index aba28e3232..56ddcb6c09 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.goom/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.goom/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/visualization.goom" -PKG_URL="https://github.com/xbmc/visualization.goom/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/visualization.goom/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_SHORTDESC="visualization.goom" diff --git a/packages/mediacenter/kodi-binary-addons/visualization.matrix/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.matrix/package.mk index 0ad48b54c4..062c088927 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.matrix/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.matrix/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="20ceaa89ed55a3513154a77db7b14eb37e1fa6c30556ff0b5c3f4ad6450caa9e" PKG_REV="1" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/visualization.matrix" -PKG_URL="https://github.com/xbmc/visualization.matrix/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/visualization.matrix/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_LONGDESC="visualization.matrix" @@ -15,12 +15,12 @@ PKG_LONGDESC="visualization.matrix" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.player.musicviz" -if [ ! "$OPENGL" = "no" ]; then +if [ ! "${OPENGL}" = "no" ]; then # for OpenGL (GLX) support - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL glew" + PKG_DEPENDS_TARGET+=" ${OPENGL} glew" fi -if [ "$OPENGLES_SUPPORT" = yes ]; then +if [ "${OPENGLES_SUPPORT}" = yes ]; then # for OpenGL-ES support - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGLES" + PKG_DEPENDS_TARGET+=" ${OPENGLES}" fi diff --git a/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk index 7ed04d789a..27398c3dfb 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" -PKG_URL="https://github.com/linuxwhatelse/visualization.pictureit/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/linuxwhatelse/visualization.pictureit/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_SHORTDESC="visualization.pictureit" diff --git a/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk index 1cd99af770..30b780897e 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/visualization.projectm" -PKG_URL="https://github.com/xbmc/visualization.projectm/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/visualization.projectm/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform libprojectM" PKG_SECTION="" PKG_SHORTDESC="visualization.projectm" @@ -18,10 +18,10 @@ PKG_LONGDESC="visualization.projectm" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.player.musicviz" -if [ "$OPENGL" = "no" ] ; then +if [ "${OPENGL}" = "no" ]; then exit 0 fi pre_configure_target() { - export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"` + export LDFLAGS=$(echo ${LDFLAGS} | sed -e "s|-Wl,--as-needed||") } diff --git a/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk index bed52ca4b0..aa3051d637 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.shadertoy/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/visualization.shadertoy" -PKG_URL="https://github.com/xbmc/visualization.shadertoy/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/visualization.shadertoy/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_SHORTDESC="visualization.shadertoy" @@ -18,12 +18,12 @@ PKG_LONGDESC="visualization.shadertoy" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="xbmc.player.musicviz" -if [ ! "$OPENGL" = "no" ]; then +if [ ! "${OPENGL}" = "no" ]; then # for OpenGL (GLX) support - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL glew" + PKG_DEPENDS_TARGET+=" ${OPENGL} glew" fi -if [ "$OPENGLES_SUPPORT" = yes ]; then +if [ "${OPENGLES_SUPPORT}" = yes ]; then # for OpenGL-ES support - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGLES" + PKG_DEPENDS_TARGET+=" ${OPENGLES}" fi diff --git a/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk index 53cf812001..6132c5de49 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.spectrum/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/visualization.spectrum" -PKG_URL="https://github.com/xbmc/visualization.spectrum/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/visualization.spectrum/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_SHORTDESC="visualization.spectrum" diff --git a/packages/mediacenter/kodi-binary-addons/visualization.starburst/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.starburst/package.mk index 80ce839853..3cc164135b 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.starburst/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.starburst/package.mk @@ -8,7 +8,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/visualization.starburst" -PKG_URL="https://github.com/xbmc/visualization.starburst/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/visualization.starburst/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_SHORTDESC="visualization.starburst" diff --git a/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk index ae9b9b9b3d..d966c73b10 100644 --- a/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk +++ b/packages/mediacenter/kodi-binary-addons/visualization.waveform/package.mk @@ -9,7 +9,7 @@ PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/visualization.waveform" -PKG_URL="https://github.com/xbmc/visualization.waveform/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/visualization.waveform/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_SHORTDESC="visualization.waveform" diff --git a/packages/mediacenter/kodi-platform/package.mk b/packages/mediacenter/kodi-platform/package.mk index c5ad77689d..be6b145c76 100644 --- a/packages/mediacenter/kodi-platform/package.mk +++ b/packages/mediacenter/kodi-platform/package.mk @@ -7,15 +7,15 @@ PKG_VERSION="809c5e9d711e378561440a896fcb7dbcd009eb3d" PKG_SHA256="159165ae641da5eb273885ce53b8a4b84e62a595c4974f9d12c1b5d1428ef25c" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" -PKG_URL="https://github.com/xbmc/kodi-platform/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain tinyxml $MEDIACENTER p8-platform" +PKG_URL="https://github.com/xbmc/kodi-platform/archive/${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain tinyxml ${MEDIACENTER} p8-platform" PKG_LONGDESC="kodi-platform:" PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_LIBDIR:STRING=lib \ -DCMAKE_INSTALL_LIBDIR_NOARCH:STRING=lib \ - -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ + -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=${SYSROOT_PREFIX}/usr \ -DBUILD_SHARED_LIBS=0" post_makeinstall_target() { - rm -rf $INSTALL/usr/lib/kodiplatform + rm -rf ${INSTALL}/usr/lib/kodiplatform } diff --git a/packages/mediacenter/kodi-theme-Estuary/package.mk b/packages/mediacenter/kodi-theme-Estuary/package.mk index e467a1e595..6a7bcb492c 100644 --- a/packages/mediacenter/kodi-theme-Estuary/package.mk +++ b/packages/mediacenter/kodi-theme-Estuary/package.mk @@ -11,6 +11,6 @@ PKG_LONGDESC="Kodi Mediacenter default theme." PKG_TOOLCHAIN="manual" makeinstall_target() { - mkdir -p $INSTALL/usr/share/kodi/addons/ - cp -a $(get_install_dir kodi)/.noinstall/skin.estuary $INSTALL/usr/share/kodi/addons/ + mkdir -p ${INSTALL}/usr/share/kodi/addons/ + cp -a $(get_install_dir kodi)/.noinstall/skin.estuary ${INSTALL}/usr/share/kodi/addons/ } diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 816f3b3c15..5a38aa664f 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -7,137 +7,137 @@ PKG_VERSION="19.0RC1-Matrix" PKG_SHA256="96621a997221f75b151dc76575bc137d1e890d43a9ca37ad8f09f7431f290c9b" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" -PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python3 zlib systemd lzo pcre swig:host libass curl fontconfig fribidi tinyxml libjpeg-turbo freetype libcdio taglib libxml2 libxslt rapidjson sqlite ffmpeg crossguid libdvdnav libhdhomerun libfmt lirc libfstrcmp flatbuffers:host flatbuffers libudfread spdlog" PKG_LONGDESC="A free and open source cross-platform media player." PKG_BUILD_FLAGS="+speed" configure_package() { # Single threaded LTO is very slow so rely on Kodi for parallel LTO support - if [ "$LTO_SUPPORT" = "yes" ] && ! build_with_debug; then - PKG_KODI_USE_LTO="-DUSE_LTO=$CONCURRENCY_MAKE_LEVEL" + if [ "${LTO_SUPPORT}" = "yes" ] && ! build_with_debug; then + PKG_KODI_USE_LTO="-DUSE_LTO=${CONCURRENCY_MAKE_LEVEL}" fi get_graphicdrivers - if [ "$TARGET_ARCH" = "x86_64" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pciutils" + if [ "${TARGET_ARCH}" = "x86_64" ]; then + PKG_DEPENDS_TARGET+=" pciutils" fi - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET dbus" + PKG_DEPENDS_TARGET+=" dbus" - if [ "$DISPLAYSERVER" = "x11" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXext libdrm libXrandr" + if [ "${DISPLAYSERVER}" = "x11" ]; then + PKG_DEPENDS_TARGET+=" libX11 libXext libdrm libXrandr" KODI_XORG="-DCORE_PLATFORM_NAME=x11 -DAPP_RENDER_SYSTEM=gl" - elif [ "$DISPLAYSERVER" = "weston" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET wayland waylandpp" - CFLAGS="$CFLAGS -DMESA_EGL_NO_X11_HEADERS" - CXXFLAGS="$CXXFLAGS -DMESA_EGL_NO_X11_HEADERS" + elif [ "${DISPLAYSERVER}" = "weston" ]; then + PKG_DEPENDS_TARGET+=" wayland waylandpp" + CFLAGS+=" -DMESA_EGL_NO_X11_HEADERS" + CXXFLAGS+=" -DMESA_EGL_NO_X11_HEADERS" KODI_XORG="-DCORE_PLATFORM_NAME=wayland \ -DAPP_RENDER_SYSTEM=gles \ -DWAYLANDPP_PROTOCOLS_DIR=${SYSROOT_PREFIX}/usr/share/waylandpp/protocols" fi - if [ ! "$OPENGL" = "no" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL glu" + if [ ! "${OPENGL}" = "no" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL} glu" fi - if [ "$OPENGLES_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGLES" + if [ "${OPENGLES_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" ${OPENGLES}" fi - if [ "$ALSA_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET alsa-lib" + if [ "${ALSA_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" alsa-lib" KODI_ALSA="-DENABLE_ALSA=ON" else KODI_ALSA="-DENABLE_ALSA=OFF" fi - if [ "$PULSEAUDIO_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio" + if [ "${PULSEAUDIO_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" pulseaudio" KODI_PULSEAUDIO="-DENABLE_PULSEAUDIO=ON" else KODI_PULSEAUDIO="-DENABLE_PULSEAUDIO=OFF" fi - if [ "$CEC_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libcec" + if [ "${CEC_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" libcec" KODI_CEC="-DENABLE_CEC=ON" else KODI_CEC="-DENABLE_CEC=OFF" fi - if [ "$CEC_FRAMEWORK_SUPPORT" = "yes" ]; then + if [ "${CEC_FRAMEWORK_SUPPORT}" = "yes" ]; then PKG_PATCH_DIRS+=" cec-framework" fi - if [ "$KODI_OPTICAL_SUPPORT" = yes ]; then + if [ "${KODI_OPTICAL_SUPPORT}" = yes ]; then KODI_OPTICAL="-DENABLE_OPTICAL=ON" else KODI_OPTICAL="-DENABLE_OPTICAL=OFF" fi - if [ "$KODI_DVDCSS_SUPPORT" = yes ]; then + if [ "${KODI_DVDCSS_SUPPORT}" = yes ]; then KODI_DVDCSS="-DENABLE_DVDCSS=ON \ - -DLIBDVDCSS_URL=$SOURCES/libdvdcss/libdvdcss-$(get_pkg_version libdvdcss).tar.gz" + -DLIBDVDCSS_URL=${SOURCES}/libdvdcss/libdvdcss-$(get_pkg_version libdvdcss).tar.gz" else KODI_DVDCSS="-DENABLE_DVDCSS=OFF" fi - if [ "$KODI_BLURAY_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libbluray" + if [ "${KODI_BLURAY_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" libbluray" KODI_BLURAY="-DENABLE_BLURAY=ON" else KODI_BLURAY="-DENABLE_BLURAY=OFF" fi - if [ "$AVAHI_DAEMON" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi nss-mdns" + if [ "${AVAHI_DAEMON}" = yes ]; then + PKG_DEPENDS_TARGET+=" avahi nss-mdns" KODI_AVAHI="-DENABLE_AVAHI=ON" else KODI_AVAHI="-DENABLE_AVAHI=OFF" fi - case "$KODI_MYSQL_SUPPORT" in - mysql) PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mysql" + 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" + 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 - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libplist" + if [ "${KODI_AIRPLAY_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" libplist" KODI_AIRPLAY="-DENABLE_PLIST=ON" else KODI_AIRPLAY="-DENABLE_PLIST=OFF" fi - if [ "$KODI_AIRTUNES_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libshairplay" + if [ "${KODI_AIRTUNES_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" libshairplay" KODI_AIRTUNES="-DENABLE_AIRTUNES=ON" else KODI_AIRTUNES="-DENABLE_AIRTUNES=OFF" fi - if [ "$KODI_NFS_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libnfs" + if [ "${KODI_NFS_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" libnfs" KODI_NFS="-DENABLE_NFS=ON" else KODI_NFS="-DENABLE_NFS=OFF" fi - if [ "$KODI_SAMBA_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET samba" + if [ "${KODI_SAMBA_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" samba" fi - if [ "$KODI_WEBSERVER_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libmicrohttpd" + if [ "${KODI_WEBSERVER_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" libmicrohttpd" fi - if [ "$KODI_UPNP_SUPPORT" = yes ]; then + if [ "${KODI_UPNP_SUPPORT}" = yes ]; then KODI_UPNP="-DENABLE_UPNP=ON" else KODI_UPNP="-DENABLE_UPNP=OFF" @@ -149,49 +149,49 @@ configure_package() { KODI_NEON="-DENABLE_NEON=OFF" fi - if [ "$VDPAU_SUPPORT" = "yes" -a "$DISPLAYSERVER" = "x11" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau" + if [ "${VDPAU_SUPPORT}" = "yes" -a "${DISPLAYSERVER}" = "x11" ]; then + PKG_DEPENDS_TARGET+=" libvdpau" KODI_VDPAU="-DENABLE_VDPAU=ON" else KODI_VDPAU="-DENABLE_VDPAU=OFF" fi - if [ "$VAAPI_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libva" + if [ "${VAAPI_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" libva" KODI_VAAPI="-DENABLE_VAAPI=ON" else KODI_VAAPI="-DENABLE_VAAPI=OFF" fi - if [ "$TARGET_ARCH" = "x86_64" ]; then - KODI_ARCH="-DWITH_CPU=$TARGET_ARCH" + if [ "${TARGET_ARCH}" = "x86_64" ]; then + KODI_ARCH="-DWITH_CPU=${TARGET_ARCH}" else - KODI_ARCH="-DWITH_ARCH=$TARGET_ARCH" + KODI_ARCH="-DWITH_ARCH=${TARGET_ARCH}" fi - if [ ! "$KODIPLAYER_DRIVER" = default ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $KODIPLAYER_DRIVER libinput libxkbcommon" - if [ "$OPENGLES_SUPPORT" = yes -a "$KODIPLAYER_DRIVER" = "$OPENGLES" ]; then + if [ ! "${KODIPLAYER_DRIVER}" = default ]; then + PKG_DEPENDS_TARGET+=" ${KODIPLAYER_DRIVER} libinput libxkbcommon" + if [ "${OPENGLES_SUPPORT}" = yes -a "${KODIPLAYER_DRIVER}" = "${OPENGLES}" ]; then KODI_PLAYER="-DCORE_PLATFORM_NAME=gbm -DAPP_RENDER_SYSTEM=gles" - CFLAGS="$CFLAGS -DEGL_NO_X11" - CXXFLAGS="$CXXFLAGS -DEGL_NO_X11" - PKG_APPLIANCE_XML="$PKG_DIR/config/appliance-gbm.xml" + CFLAGS+=" -DEGL_NO_X11" + CXXFLAGS+=" -DEGL_NO_X11" + PKG_APPLIANCE_XML="${PKG_DIR}/config/appliance-gbm.xml" fi fi - KODI_LIBDVD="$KODI_DVDCSS \ - -DLIBDVDNAV_URL=$SOURCES/libdvdnav/libdvdnav-$(get_pkg_version libdvdnav).tar.gz \ - -DLIBDVDREAD_URL=$SOURCES/libdvdread/libdvdread-$(get_pkg_version libdvdread).tar.gz" + KODI_LIBDVD="${KODI_DVDCSS} \ + -DLIBDVDNAV_URL=${SOURCES}/libdvdnav/libdvdnav-$(get_pkg_version libdvdnav).tar.gz \ + -DLIBDVDREAD_URL=${SOURCES}/libdvdread/libdvdread-$(get_pkg_version libdvdread).tar.gz" - PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \ - -DWITH_TEXTUREPACKER=$TOOLCHAIN/bin/TexturePacker \ - -DWITH_JSONSCHEMABUILDER=$TOOLCHAIN/bin/JsonSchemaBuilder \ - -DDEPENDS_PATH=$PKG_BUILD/depends \ - -DSWIG_EXECUTABLE=$TOOLCHAIN/bin/swig \ - -DPYTHON_EXECUTABLE=$TOOLCHAIN/bin/$PKG_PYTHON_VERSION \ - -DPYTHON_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include/$PKG_PYTHON_VERSION \ - -DGIT_VERSION=$PKG_VERSION \ - -DFFMPEG_PATH=$SYSROOT_PREFIX/usr \ + PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=${TOOLCHAIN} \ + -DWITH_TEXTUREPACKER=${TOOLCHAIN}/bin/TexturePacker \ + -DWITH_JSONSCHEMABUILDER=${TOOLCHAIN}/bin/JsonSchemaBuilder \ + -DDEPENDS_PATH=${PKG_BUILD}/depends \ + -DSWIG_EXECUTABLE=${TOOLCHAIN}/bin/swig \ + -DPYTHON_EXECUTABLE=${TOOLCHAIN}/bin/${PKG_PYTHON_VERSION} \ + -DPYTHON_INCLUDE_DIRS=${SYSROOT_PREFIX}/usr/include/${PKG_PYTHON_VERSION} \ + -DGIT_VERSION=${PKG_VERSION} \ + -DFFMPEG_PATH=${SYSROOT_PREFIX}/usr \ -DENABLE_INTERNAL_FFMPEG=OFF \ -DENABLE_INTERNAL_CROSSGUID=OFF \ -DENABLE_INTERNAL_UDFREAD=OFF \ @@ -208,144 +208,144 @@ configure_package() { -DENABLE_TESTING=OFF \ -DENABLE_INTERNAL_FLATBUFFERS=OFF \ -DENABLE_LCMS2=OFF \ - $PKG_KODI_USE_LTO \ - $KODI_ARCH \ - $KODI_NEON \ - $KODI_VDPAU \ - $KODI_VAAPI \ - $KODI_CEC \ - $KODI_XORG \ - $KODI_SAMBA \ - $KODI_NFS \ - $KODI_LIBDVD \ - $KODI_AVAHI \ - $KODI_UPNP \ - $KODI_MYSQL \ - $KODI_AIRPLAY \ - $KODI_AIRTUNES \ - $KODI_OPTICAL \ - $KODI_BLURAY \ - $KODI_PLAYER" + ${PKG_KODI_USE_LTO} \ + ${KODI_ARCH} \ + ${KODI_NEON} \ + ${KODI_VDPAU} \ + ${KODI_VAAPI} \ + ${KODI_CEC} \ + ${KODI_XORG} \ + ${KODI_SAMBA} \ + ${KODI_NFS} \ + ${KODI_LIBDVD} \ + ${KODI_AVAHI} \ + ${KODI_UPNP} \ + ${KODI_MYSQL} \ + ${KODI_AIRPLAY} \ + ${KODI_AIRTUNES} \ + ${KODI_OPTICAL} \ + ${KODI_BLURAY} \ + ${KODI_PLAYER}" } pre_configure_target() { - export LIBS="$LIBS -lncurses" + export LIBS="${LIBS} -lncurses" } post_makeinstall_target() { - mkdir -p $INSTALL/.noinstall - mv $INSTALL/usr/share/kodi/addons/skin.estouchy \ - $INSTALL/usr/share/kodi/addons/skin.estuary \ - $INSTALL/usr/share/kodi/addons/service.xbmc.versioncheck \ - $INSTALL/.noinstall + mkdir -p ${INSTALL}/.noinstall + mv ${INSTALL}/usr/share/kodi/addons/skin.estouchy \ + ${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 - rm -rf $INSTALL/usr/bin/xbmc - rm -rf $INSTALL/usr/bin/xbmc-standalone - rm -rf $INSTALL/usr/share/kodi/cmake - rm -rf $INSTALL/usr/share/applications - rm -rf $INSTALL/usr/share/icons - rm -rf $INSTALL/usr/share/pixmaps - rm -rf $INSTALL/usr/share/xsessions + rm -rf ${INSTALL}/usr/bin/kodi + rm -rf ${INSTALL}/usr/bin/kodi-standalone + rm -rf ${INSTALL}/usr/bin/xbmc + rm -rf ${INSTALL}/usr/bin/xbmc-standalone + rm -rf ${INSTALL}/usr/share/kodi/cmake + rm -rf ${INSTALL}/usr/share/applications + rm -rf ${INSTALL}/usr/share/icons + rm -rf ${INSTALL}/usr/share/pixmaps + 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 + 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 # 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 + -i ${INSTALL}/usr/lib/kodi/kodi.sh - cp $PKG_DIR/config/kodi.conf $INSTALL/usr/lib/kodi/kodi.conf + cp ${PKG_DIR}/config/kodi.conf ${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" = "weston" ]; then - echo "WAYLAND_DISPLAY=wayland-0" >> $INSTALL/usr/lib/kodi/kodi.conf + if [ "${DISPLAYSERVER}" = "x11" ]; then + echo "DISPLAY=:0.0" >> ${INSTALL}/usr/lib/kodi/kodi.conf + elif [ "${DISPLAYSERVER}" = "weston" ]; then + echo "WAYLAND_DISPLAY=wayland-0" >> ${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 + 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 + mkdir -p ${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 + 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 - 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.kodi.game $INSTALL/usr/share/kodi/addons + 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.kodi.game ${INSTALL}/usr/share/kodi/addons - mkdir -p $INSTALL/usr/share/kodi/config + mkdir -p ${INSTALL}/usr/share/kodi/config - ln -sf /run/libreelec/cacert.pem $INSTALL/usr/share/kodi/system/certs/cacert.pem + ln -sf /run/libreelec/cacert.pem ${INSTALL}/usr/share/kodi/system/certs/cacert.pem - mkdir -p $INSTALL/usr/share/kodi/system/settings + 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 + ${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 - $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 + ${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 - $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 + ${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 - $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_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 - mkdir -p $INSTALL/usr/cache/libreelec - cp $PKG_DIR/config/network_wait $INSTALL/usr/cache/libreelec + mkdir -p ${INSTALL}/usr/cache/libreelec + cp ${PKG_DIR}/config/network_wait ${INSTALL}/usr/cache/libreelec # update addon manifest - ADDON_MANIFEST=$INSTALL/usr/share/kodi/system/addon-manifest.xml - xmlstarlet ed -L -d "/addons/addon[text()='service.xbmc.versioncheck']" $ADDON_MANIFEST - xmlstarlet ed -L -d "/addons/addon[text()='skin.estouchy']" $ADDON_MANIFEST - xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "repository.kodi.game" $ADDON_MANIFEST - xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "repository.libreelec.tv" $ADDON_MANIFEST - if [ -n "$DISTRO_PKG_SETTINGS" ]; then - xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "$DISTRO_PKG_SETTINGS_ID" $ADDON_MANIFEST + ADDON_MANIFEST=${INSTALL}/usr/share/kodi/system/addon-manifest.xml + xmlstarlet ed -L -d "/addons/addon[text()='service.xbmc.versioncheck']" ${ADDON_MANIFEST} + xmlstarlet ed -L -d "/addons/addon[text()='skin.estouchy']" ${ADDON_MANIFEST} + xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "repository.kodi.game" ${ADDON_MANIFEST} + xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "repository.libreelec.tv" ${ADDON_MANIFEST} + if [ -n "${DISTRO_PKG_SETTINGS}" ]; then + xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "${DISTRO_PKG_SETTINGS_ID}" ${ADDON_MANIFEST} fi - if [ "$DRIVER_ADDONS_SUPPORT" = "yes" ]; then - xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "script.program.driverselect" $ADDON_MANIFEST + if [ "${DRIVER_ADDONS_SUPPORT}" = "yes" ]; then + xmlstarlet ed -L --subnode "/addons" -t elem -n "addon" -v "script.program.driverselect" ${ADDON_MANIFEST} fi # more binaddons cross compile badness meh - sed -e "s:INCLUDE_DIR /usr/include/kodi:INCLUDE_DIR $SYSROOT_PREFIX/usr/include/kodi:g" \ - -e "s:CMAKE_MODULE_PATH /usr/lib/kodi /usr/share/kodi/cmake:CMAKE_MODULE_PATH $SYSROOT_PREFIX/usr/share/kodi/cmake:g" \ - -i $SYSROOT_PREFIX/usr/share/kodi/cmake/KodiConfig.cmake + sed -e "s:INCLUDE_DIR /usr/include/kodi:INCLUDE_DIR ${SYSROOT_PREFIX}/usr/include/kodi:g" \ + -e "s:CMAKE_MODULE_PATH /usr/lib/kodi /usr/share/kodi/cmake:CMAKE_MODULE_PATH ${SYSROOT_PREFIX}/usr/share/kodi/cmake:g" \ + -i ${SYSROOT_PREFIX}/usr/share/kodi/cmake/KodiConfig.cmake - 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 + 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 fi # Compile kodi Python site-packages to .pyc bytecode, and remove .py source code - python_compile $INSTALL/usr/lib/$PKG_PYTHON_VERSION/site-packages/kodi + python_compile ${INSTALL}/usr/lib/${PKG_PYTHON_VERSION}/site-packages/kodi - debug_strip $INSTALL/usr/lib/kodi/kodi.bin + debug_strip ${INSTALL}/usr/lib/kodi/kodi.bin } post_install() { diff --git a/packages/mediacenter/p8-platform/package.mk b/packages/mediacenter/p8-platform/package.mk index a35ebe33ba..fd2e51da62 100644 --- a/packages/mediacenter/p8-platform/package.mk +++ b/packages/mediacenter/p8-platform/package.mk @@ -7,15 +7,15 @@ PKG_VERSION="cee64e9dc0b69e8d286dc170a78effaabfa09c44" PKG_SHA256="8d2c3c2e2951a3f202aadd774ce52e2096468a6470ef4c926dbb13bb564ea378" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" -PKG_URL="https://github.com/xbmc/platform/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/platform/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Platform support library used by libCEC and binary add-ons for Kodi" PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_LIBDIR:STRING=lib \ -DCMAKE_INSTALL_LIBDIR_NOARCH:STRING=lib \ - -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=$SYSROOT_PREFIX/usr \ + -DCMAKE_INSTALL_PREFIX_TOOLCHAIN=${SYSROOT_PREFIX}/usr \ -DBUILD_SHARED_LIBS=0" post_makeinstall_target() { - rm -rf $INSTALL/usr + rm -rf ${INSTALL}/usr } From e6217f9b01097f95f1f11a1cdd54f04f901e2ce1 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:10 +0000 Subject: [PATCH 15/27] multimedia: automated code cleanup Signed-off-by: Ian Leonard --- packages/multimedia/SDL2/package.mk | 34 +++++++------- packages/multimedia/aom/package.mk | 2 +- packages/multimedia/gmmlib/package.mk | 2 +- .../multimedia/intel-vaapi-driver/package.mk | 8 ++-- packages/multimedia/libaacs/package.mk | 10 ++--- packages/multimedia/libass/package.mk | 4 +- packages/multimedia/libbdplus/package.mk | 14 +++--- packages/multimedia/libbluray/package.mk | 10 ++--- packages/multimedia/libdvdcss/package.mk | 2 +- packages/multimedia/libdvdnav/package.mk | 2 +- packages/multimedia/libdvdread/package.mk | 6 +-- packages/multimedia/libhdhomerun/package.mk | 18 ++++---- packages/multimedia/libmpeg2/package.mk | 4 +- packages/multimedia/libudfread/package.mk | 2 +- packages/multimedia/libva/package.mk | 8 ++-- packages/multimedia/media-driver/package.mk | 2 +- packages/multimedia/rtmpdump/package.mk | 44 +++++++++---------- 17 files changed, 86 insertions(+), 86 deletions(-) diff --git a/packages/multimedia/SDL2/package.mk b/packages/multimedia/SDL2/package.mk index f8be65386d..3f305dd6e4 100644 --- a/packages/multimedia/SDL2/package.mk +++ b/packages/multimedia/SDL2/package.mk @@ -7,12 +7,12 @@ PKG_VERSION="2.0.14" PKG_SHA256="d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc" PKG_LICENSE="GPL" PKG_SITE="https://www.libsdl.org/" -PKG_URL="https://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://www.libsdl.org/release/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain alsa-lib systemd dbus" PKG_LONGDESC="A cross-platform multimedia library designed to provide fast access to the graphics framebuffer and audio device. " PKG_BUILD_FLAGS="+pic" -if [ "$TARGET_ARCH" = "x86_64" ]; then +if [ "${TARGET_ARCH}" = "x86_64" ]; then PKG_DEPENDS_TARGET+=" nasm:host" PKG_SDL2_X86ASM="-DASSEMBLY=ON" else @@ -24,7 +24,7 @@ PKG_CMAKE_OPTS_TARGET="-DSDL_STATIC=ON \ -DSDL_SHARED=OFF \ -DLIBC=ON \ -DGCC_ATOMICS=ON \ - $PKG_SDL2_X86ASM \ + ${PKG_SDL2_X86ASM} \ -DALTIVEC=OFF \ -DOSS=OFF \ -DALSA=ON \ @@ -59,10 +59,10 @@ PKG_CMAKE_OPTS_TARGET="-DSDL_STATIC=ON \ -DVIDEO_KMSDRM=OFF \ -DRENDER_D3D=OFF" -if [ "$DISPLAYSERVER" = "x11" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXrandr" +if [ "${DISPLAYSERVER}" = "x11" ]; then + PKG_DEPENDS_TARGET+=" libX11 libXrandr" - PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET \ + PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ -DVIDEO_X11=ON \ -DX11_SHARED=ON \ -DVIDEO_X11_XCURSOR=OFF \ @@ -73,36 +73,36 @@ if [ "$DISPLAYSERVER" = "x11" ]; then -DVIDEO_X11_XSHAPE=OFF \ -DVIDEO_X11_XVM=OFF" else - PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET \ + PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ -DVIDEO_X11=OFF" fi -if [ ! "$OPENGL" = "no" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL" +if [ ! "${OPENGL}" = "no" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL}" - PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET \ + PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ -DVIDEO_OPENGL=ON \ -DVIDEO_OPENGLES=OFF" else - PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET \ + PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ -DVIDEO_OPENGL=OFF \ -DVIDEO_OPENGLES=ON" fi -if [ "$PULSEAUDIO_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio" +if [ "${PULSEAUDIO_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" pulseaudio" - PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET \ + PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ -DPULSEAUDIO=ON \ -DPULSEAUDIO_SHARED=ON" else - PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_TARGET \ + PKG_CMAKE_OPTS_TARGET="${PKG_CMAKE_OPTS_TARGET} \ -DPULSEAUDIO=OFF \ -DPULSEAUDIO_SHARED=OFF" fi post_makeinstall_target() { - sed -e "s:\(['=\" ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/sdl2-config + sed -e "s:\(['=\" ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/sdl2-config - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/multimedia/aom/package.mk b/packages/multimedia/aom/package.mk index 0d38628e93..73e967d922 100644 --- a/packages/multimedia/aom/package.mk +++ b/packages/multimedia/aom/package.mk @@ -16,7 +16,7 @@ PKG_CMAKE_OPTS_TARGET="-DENABLE_CCACHE=1 \ -DENABLE_TESTS=0 \ -DENABLE_TOOLS=0" -if [ "$TARGET_ARCH" = "x86_64" ]; then +if [ "${TARGET_ARCH}" = "x86_64" ]; then PKG_DEPENDS_TARGET+=" nasm:host" fi diff --git a/packages/multimedia/gmmlib/package.mk b/packages/multimedia/gmmlib/package.mk index 73665863bf..c4c73ceea4 100644 --- a/packages/multimedia/gmmlib/package.mk +++ b/packages/multimedia/gmmlib/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="d54d547f9f9e74196dead6a338923039ea10c859f1f693f33f10be1562b81d6d" PKG_ARCH="x86_64" PKG_LICENSE="MIT" PKG_SITE="https://01.org/linuxmedia" -PKG_URL="https://github.com/intel/gmmlib/archive/intel-gmmlib-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/intel/gmmlib/archive/intel-gmmlib-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="gmmlib: The Intel(R) Graphics Memory Management Library provides device specific and buffer management for the Intel(R) Graphics Compute Runtime for OpenCL(TM) and the Intel(R) Media Driver for VAAPI." diff --git a/packages/multimedia/intel-vaapi-driver/package.mk b/packages/multimedia/intel-vaapi-driver/package.mk index 0b3b5bd49e..4b4c0ff6cf 100644 --- a/packages/multimedia/intel-vaapi-driver/package.mk +++ b/packages/multimedia/intel-vaapi-driver/package.mk @@ -8,14 +8,14 @@ PKG_SHA256="03cd7e16acc94f828b6e7f3087863d8ca06e99ffa3385588005b1984bdd56157" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://01.org/linuxmedia" -PKG_URL="https://github.com/intel/intel-vaapi-driver/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/intel/intel-vaapi-driver/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libva libdrm" PKG_LONGDESC="intel-vaapi-driver: VA-API user mode driver for Intel GEN Graphics family" PKG_TOOLCHAIN="meson" -if [ "$DISPLAYSERVER" = "x11" ]; then +if [ "${DISPLAYSERVER}" = "x11" ]; then DISPLAYSERVER_LIBVA="-Dwith_x11=yes -Dwith_wayland=no" -elif [ "$DISPLAYSERVER" = "weston" ]; then +elif [ "${DISPLAYSERVER}" = "weston" ]; then DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=yes" else DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_wayland=no" @@ -23,5 +23,5 @@ fi PKG_MESON_OPTS_TARGET="-Denable_hybrid_code=false \ -Denable_tests=false \ - $DISPLAYSERVER_LIBVA" + ${DISPLAYSERVER_LIBVA}" diff --git a/packages/multimedia/libaacs/package.mk b/packages/multimedia/libaacs/package.mk index 0b82def679..06a92a2d07 100644 --- a/packages/multimedia/libaacs/package.mk +++ b/packages/multimedia/libaacs/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.11.0" PKG_SHA256="6d884381fbb659e2a565eba91e72499778635975e4b3d6fd94ab364a25965387" PKG_LICENSE="GPL" PKG_SITE="http://www.videolan.org/developers/libaacs.html" -PKG_URL="http://download.videolan.org/pub/videolan/libaacs/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://download.videolan.org/pub/videolan/libaacs/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libgcrypt" PKG_LONGDESC="libaacs is a research project to implement the Advanced Access Content System specification." PKG_TOOLCHAIN="autotools" @@ -14,11 +14,11 @@ PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--disable-werror \ --disable-extra-warnings \ --disable-optimizations \ - --with-libgcrypt-prefix=$SYSROOT_PREFIX/usr \ - --with-libgpg-error-prefix=$SYSROOT_PREFIX/usr \ + --with-libgcrypt-prefix=${SYSROOT_PREFIX}/usr \ + --with-libgpg-error-prefix=${SYSROOT_PREFIX}/usr \ --with-gnu-ld" post_makeinstall_target() { - mkdir -p $INSTALL/usr/config/aacs - cp -P ../KEYDB.cfg $INSTALL/usr/config/aacs + mkdir -p ${INSTALL}/usr/config/aacs + cp -P ../KEYDB.cfg ${INSTALL}/usr/config/aacs } diff --git a/packages/multimedia/libass/package.mk b/packages/multimedia/libass/package.mk index f41a17f31b..040e4cf9cf 100644 --- a/packages/multimedia/libass/package.mk +++ b/packages/multimedia/libass/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.15.0" PKG_SHA256="9f09230c9a0aa68ef7aa6a9e2ab709ca957020f842e52c5b2e52b801a7d9e833" PKG_LICENSE="BSD" PKG_SITE="https://github.com/libass/libass" -PKG_URL="https://github.com/libass/libass/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://github.com/libass/libass/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain freetype fontconfig fribidi harfbuzz" PKG_LONGDESC="A portable subtitle renderer for the ASS/SSA (Advanced Substation Alpha/Substation Alpha) subtitle format." @@ -16,7 +16,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-test \ --disable-silent-rules \ --with-gnu-ld" -if [ $TARGET_ARCH = "x86_64" ]; then +if [ ${TARGET_ARCH} = "x86_64" ]; then PKG_DEPENDS_TARGET+=" nasm:host" PKG_CONFIGURE_OPTS_TARGET+=" --enable-asm" fi diff --git a/packages/multimedia/libbdplus/package.mk b/packages/multimedia/libbdplus/package.mk index 40f8044f02..a7f34a868e 100644 --- a/packages/multimedia/libbdplus/package.mk +++ b/packages/multimedia/libbdplus/package.mk @@ -6,20 +6,20 @@ PKG_VERSION="0.1.2" PKG_SHA256="a631cae3cd34bf054db040b64edbfc8430936e762eb433b1789358ac3d3dc80a" PKG_LICENSE="GPL" PKG_SITE="https://www.videolan.org/developers/libbdplus.html" -PKG_URL="http://download.videolan.org/pub/videolan/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://download.videolan.org/pub/videolan/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libgcrypt libgpg-error" PKG_LONGDESC="libbdplus is a research project to implement the BD+ System Specifications." PKG_CONFIGURE_OPTS_TARGET="--disable-werror \ --disable-extra-warnings \ --disable-optimizations \ - --with-libgcrypt-prefix=$SYSROOT_PREFIX/usr \ - --with-gpg-error-prefix=$SYSROOT_PREFIX/usr \ + --with-libgcrypt-prefix=${SYSROOT_PREFIX}/usr \ + --with-gpg-error-prefix=${SYSROOT_PREFIX}/usr \ --with-gnu-ld" -if [ "$BLURAY_AACS_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libaacs" - PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --with-libaacs" +if [ "${BLURAY_AACS_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" libaacs" + PKG_CONFIGURE_OPTS_TARGET+=" --with-libaacs" else - PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --without-libaacs" + PKG_CONFIGURE_OPTS_TARGET+=" --without-libaacs" fi diff --git a/packages/multimedia/libbluray/package.mk b/packages/multimedia/libbluray/package.mk index c6f5df5ac9..17f7eaa0cb 100644 --- a/packages/multimedia/libbluray/package.mk +++ b/packages/multimedia/libbluray/package.mk @@ -7,17 +7,17 @@ PKG_VERSION="1.1.2" PKG_SHA256="a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42" PKG_LICENSE="LGPL" PKG_SITE="https://www.videolan.org/developers/libbluray.html" -PKG_URL="http://download.videolan.org/pub/videolan/libbluray/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://download.videolan.org/pub/videolan/libbluray/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain fontconfig freetype libxml2" PKG_LONGDESC="libbluray is an open-source library designed for Blu-Ray Discs playback for media players." PKG_TOOLCHAIN="autotools" -if [ "$BLURAY_AACS_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libaacs" +if [ "${BLURAY_AACS_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" libaacs" fi -if [ "$BLURAY_BDPLUS_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libbdplus" +if [ "${BLURAY_BDPLUS_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" libbdplus" fi PKG_CONFIGURE_OPTS_TARGET="--disable-werror \ diff --git a/packages/multimedia/libdvdcss/package.mk b/packages/multimedia/libdvdcss/package.mk index 07d5443511..4f6fc54818 100644 --- a/packages/multimedia/libdvdcss/package.mk +++ b/packages/multimedia/libdvdcss/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.4.2-Leia-Beta-5" PKG_SHA256="38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/libdvdcss" -PKG_URL="https://github.com/xbmc/libdvdcss/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/libdvdcss/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="libdvdcss is a simple library designed for accessing DVDs as a block device without having to bother about the decryption." PKG_TOOLCHAIN="manual" diff --git a/packages/multimedia/libdvdnav/package.mk b/packages/multimedia/libdvdnav/package.mk index 4748b57592..a6c72bc481 100644 --- a/packages/multimedia/libdvdnav/package.mk +++ b/packages/multimedia/libdvdnav/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="9277007ce2263b908e9ce3091cc31b3dd87c351c" PKG_SHA256="e50db40a823ddc795d1fe5f18db2517fb3e05fe0c4a88abf1578d95d7a1cce63" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/libdvdnav" -PKG_URL="https://github.com/xbmc/libdvdnav/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/libdvdnav/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libdvdread" PKG_LONGDESC="libdvdnav is a library that allows easy use of sophisticated DVD navigation features such as DVD menus, multiangle playback and even interactive DVD games." PKG_TOOLCHAIN="manual" diff --git a/packages/multimedia/libdvdread/package.mk b/packages/multimedia/libdvdread/package.mk index ff20343762..4da8793c4e 100644 --- a/packages/multimedia/libdvdread/package.mk +++ b/packages/multimedia/libdvdread/package.mk @@ -7,11 +7,11 @@ PKG_VERSION="bd6b329f0137ab6a9f779a28dd96f04713735e17" PKG_SHA256="2d9d6d185dd25a983d6dfc2a00207cafdc396a969c227d5edd84b6215b2fba89" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/libdvdread" -PKG_URL="https://github.com/xbmc/libdvdread/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/xbmc/libdvdread/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="libdvdread is a library which provides a simple foundation for reading DVDs." PKG_TOOLCHAIN="manual" -if [ "$KODI_DVDCSS_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libdvdcss" +if [ "${KODI_DVDCSS_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" libdvdcss" fi diff --git a/packages/multimedia/libhdhomerun/package.mk b/packages/multimedia/libhdhomerun/package.mk index 60d03880ee..28b9719f15 100644 --- a/packages/multimedia/libhdhomerun/package.mk +++ b/packages/multimedia/libhdhomerun/package.mk @@ -11,18 +11,18 @@ PKG_URL="https://github.com/Silicondust/libhdhomerun/archive/${PKG_VERSION}.tar. PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The library provides functionality to setup the HDHomeRun." -PKG_MAKE_OPTS_TARGET="CROSS_COMPILE=$TARGET_PREFIX" +PKG_MAKE_OPTS_TARGET="CROSS_COMPILE=${TARGET_PREFIX}" makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -PR hdhomerun_config $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -PR hdhomerun_config ${INSTALL}/usr/bin - mkdir -p $INSTALL/usr/lib/ - cp -PR libhdhomerun.so $INSTALL/usr/lib/ + mkdir -p ${INSTALL}/usr/lib/ + cp -PR libhdhomerun.so ${INSTALL}/usr/lib/ - mkdir -p $SYSROOT_PREFIX/usr/include/hdhomerun - cp *.h $SYSROOT_PREFIX/usr/include/hdhomerun + mkdir -p ${SYSROOT_PREFIX}/usr/include/hdhomerun + cp *.h ${SYSROOT_PREFIX}/usr/include/hdhomerun - mkdir -p $SYSROOT_PREFIX/usr/lib - cp libhdhomerun.so $SYSROOT_PREFIX/usr/lib + mkdir -p ${SYSROOT_PREFIX}/usr/lib + cp libhdhomerun.so ${SYSROOT_PREFIX}/usr/lib } diff --git a/packages/multimedia/libmpeg2/package.mk b/packages/multimedia/libmpeg2/package.mk index 692732281d..9b4b5bfe1c 100644 --- a/packages/multimedia/libmpeg2/package.mk +++ b/packages/multimedia/libmpeg2/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.5.1" PKG_SHA256="dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4" PKG_LICENSE="GPLv2" PKG_SITE="http://libmpeg2.sourceforge.net/" -PKG_URL="http://libmpeg2.sourceforge.net/files/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://libmpeg2.sourceforge.net/files/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The MPEG Library is a collection of C routines to decode MPEG-1 and MPEG-2 movies." @@ -15,5 +15,5 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-sdl \ --without-x" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/multimedia/libudfread/package.mk b/packages/multimedia/libudfread/package.mk index b6562e8710..dabdc997c3 100644 --- a/packages/multimedia/libudfread/package.mk +++ b/packages/multimedia/libudfread/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.1.1" PKG_SHA256="5d237ff81caa46856dc75b8ddd1f17c0e262eea08ef59a466cc850585f1680dc" PKG_LICENSE="LGPLv2.1" PKG_SITE="https://code.videolan.org/videolan/libudfread" -PKG_URL="https://code.videolan.org/videolan/$PKG_NAME/-/archive/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://code.videolan.org/videolan/${PKG_NAME}/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="UDF reader" PKG_TOOLCHAIN="autotools" diff --git a/packages/multimedia/libva/package.mk b/packages/multimedia/libva/package.mk index 82942677e7..54a2a3d792 100644 --- a/packages/multimedia/libva/package.mk +++ b/packages/multimedia/libva/package.mk @@ -8,14 +8,14 @@ PKG_SHA256="f04d5c829da602690f9f098a6d92065507ec9d0c957c1a6df3dea4e2de1204c5" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://01.org/linuxmedia" -PKG_URL="https://github.com/intel/libva/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/intel/libva/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Libva is an implementation for VA-API (VIdeo Acceleration API)." PKG_TOOLCHAIN="meson" -if [ "$DISPLAYSERVER" = "x11" ]; then +if [ "${DISPLAYSERVER}" = "x11" ]; then PKG_DEPENDS_TARGET="toolchain libX11 libXext libXfixes libdrm" DISPLAYSERVER_LIBVA="-Dwith_x11=yes -Dwith_glx=no -Dwith_wayland=no" -elif [ "$DISPLAYSERVER" = "weston" ]; then +elif [ "${DISPLAYSERVER}" = "weston" ]; then DISPLAYSERVER_LIBVA="-Dwith_x11=no -Dwith_glx=no -Dwith_wayland=yes" PKG_DEPENDS_TARGET="toolchain libdrm wayland" else @@ -26,4 +26,4 @@ fi PKG_MESON_OPTS_TARGET="-Ddisable_drm=false \ -Denable_docs=false \ -Denable_va_messaging=true \ - $DISPLAYSERVER_LIBVA" + ${DISPLAYSERVER_LIBVA}" diff --git a/packages/multimedia/media-driver/package.mk b/packages/multimedia/media-driver/package.mk index 6627862893..93e132beb3 100644 --- a/packages/multimedia/media-driver/package.mk +++ b/packages/multimedia/media-driver/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="3d856a963127ddd6690fc6dac521d7674947675d5f20452f1e6f45c0fc83f9e6" PKG_ARCH="x86_64" PKG_LICENSE="MIT" PKG_SITE="https://01.org/linuxmedia" -PKG_URL="https://github.com/intel/media-driver/archive/intel-media-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/intel/media-driver/archive/intel-media-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libva libdrm gmmlib" PKG_LONGDESC="media-driver: The Intel(R) Media Driver for VAAPI is a new VA-API (Video Acceleration API) user mode driver supporting hardware accelerated decoding, encoding, and video post processing for GEN based graphics hardware." diff --git a/packages/multimedia/rtmpdump/package.mk b/packages/multimedia/rtmpdump/package.mk index 81d8a8390f..4811c6e3ef 100644 --- a/packages/multimedia/rtmpdump/package.mk +++ b/packages/multimedia/rtmpdump/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="c5f04a58fc2aeea6296ca7c44ee4734c18401aa3" PKG_SHA256="fd8c21263d93fbde8bee8aa6c5f6a657789674bb0f9e74f050651504d5f43b46" PKG_LICENSE="GPL" PKG_SITE="http://rtmpdump.mplayerhq.hu/" -PKG_URL="http://repo.or.cz/rtmpdump.git/snapshot/$PKG_VERSION.tar.gz" +PKG_URL="http://repo.or.cz/rtmpdump.git/snapshot/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain zlib openssl" PKG_LONGDESC="rtmpdump is a toolkit for RTMP streams." PKG_BUILD_FLAGS="+pic" @@ -17,56 +17,56 @@ make_target() { incdir=/usr/include/librtmp \ libdir=/usr/lib \ mandir=/usr/share/man \ - CC="$CC" \ - LD="$LD" \ - AR="$AR" \ + CC="${CC}" \ + LD="${LD}" \ + AR="${AR}" \ SHARED=no \ CRYPTO="OPENSSL" \ OPT="" \ - XCFLAGS="$CFLAGS" \ - XCFLAGS="$CFLAGS -Wno-unused-but-set-variable -Wno-unused-const-variable" \ - XLDFLAGS="$LDFLAGS" \ + XCFLAGS="${CFLAGS}" \ + XCFLAGS="${CFLAGS} -Wno-unused-but-set-variable -Wno-unused-const-variable" \ + XLDFLAGS="${LDFLAGS}" \ XLIBS="-lm" } makeinstall_target() { - make DESTDIR=$SYSROOT_PREFIX \ + make DESTDIR=${SYSROOT_PREFIX} \ prefix=/usr \ incdir=/usr/include/librtmp \ libdir=/usr/lib \ mandir=/usr/share/man \ - CC="$CC" \ - LD="$LD" \ - AR="$AR" \ + CC="${CC}" \ + LD="${LD}" \ + AR="${AR}" \ SHARED=no \ CRYPTO="OPENSSL" \ OPT="" \ - XCFLAGS="$CFLAGS" \ - XLDFLAGS="$LDFLAGS" \ + XCFLAGS="${CFLAGS}" \ + XLDFLAGS="${LDFLAGS}" \ XLIBS="-lm" \ install - make DESTDIR=$INSTALL \ + make DESTDIR=${INSTALL} \ prefix=/usr \ incdir=/usr/include/librtmp \ libdir=/usr/lib \ mandir=/usr/share/man \ - CC="$CC" \ - LD="$LD" \ - AR="$AR" \ + CC="${CC}" \ + LD="${LD}" \ + AR="${AR}" \ SHARED=no \ CRYPTO="OPENSSL" \ OPT="" \ - XCFLAGS="$CFLAGS" \ - XLDFLAGS="$LDFLAGS" \ + XCFLAGS="${CFLAGS}" \ + XLDFLAGS="${LDFLAGS}" \ XLIBS="-lm" \ install } post_makeinstall_target() { - rm -rf $INSTALL/usr/sbin + 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 +# mkdir -p ${INSTALL}/usr/lib +# ln -sf librtmp.so.1 ${INSTALL}/usr/lib/librtmp.so.0 } From 3baf91e87d93471e6030f73a7908630f4e278dc4 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:12 +0000 Subject: [PATCH 16/27] network: automated code cleanup Signed-off-by: Ian Leonard --- packages/network/avahi/package.mk | 38 ++++---- packages/network/bluez/package.mk | 30 +++---- packages/network/connman/package.mk | 30 +++---- packages/network/ethtool/package.mk | 2 +- packages/network/iptables/package.mk | 14 +-- packages/network/iw/package.mk | 8 +- packages/network/iwd/package.mk | 2 +- packages/network/libdnet/package.mk | 8 +- packages/network/libmnl/package.mk | 2 +- packages/network/libnfs/package.mk | 4 +- packages/network/libnftnl/package.mk | 2 +- packages/network/libnl/package.mk | 2 +- packages/network/libshairplay/package.mk | 8 +- packages/network/libssh/package.mk | 18 ++-- packages/network/libtirpc/package.mk | 2 +- packages/network/netbase/package.mk | 8 +- packages/network/nss-mdns/package.mk | 6 +- packages/network/openssh/package.mk | 24 +++--- packages/network/openvpn/package.mk | 6 +- packages/network/rpcbind/package.mk | 2 +- packages/network/rsync/package.mk | 2 +- packages/network/samba/package.mk | 96 ++++++++++----------- packages/network/wireguard-tools/package.mk | 14 +-- packages/network/wireless-regdb/package.mk | 4 +- packages/network/wpa_supplicant/package.mk | 20 ++--- 25 files changed, 176 insertions(+), 176 deletions(-) diff --git a/packages/network/avahi/package.mk b/packages/network/avahi/package.mk index dfcd11e2ab..d47b7340e2 100644 --- a/packages/network/avahi/package.mk +++ b/packages/network/avahi/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.8" PKG_SHA256="c15e750ef7c6df595fb5f2ce10cac0fee2353649600e6919ad08ae8871e4945f" PKG_LICENSE="GPL" PKG_SITE="http://avahi.org/" -PKG_URL="https://github.com/lathiat/avahi/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/lathiat/avahi/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain expat libdaemon dbus connman gettext" PKG_LONGDESC="Service Discovery for Linux using mDNS/DNS-SD, compatible with Bonjour." PKG_TOOLCHAIN="configure" @@ -60,31 +60,31 @@ pre_configure_target() { post_makeinstall_target() { # disable wide-area - sed -e "s,^.*enable-wide-area=.*$,enable-wide-area=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf + sed -e "s,^.*enable-wide-area=.*$,enable-wide-area=no,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf # publish-hinfo - sed -e "s,^.*publish-hinfo=.*$,publish-hinfo=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf + sed -e "s,^.*publish-hinfo=.*$,publish-hinfo=no,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf # publish-workstation - sed -e "s,^.*publish-workstation=.*$,publish-workstation=no,g" -i $INSTALL/etc/avahi/avahi-daemon.conf + sed -e "s,^.*publish-workstation=.*$,publish-workstation=no,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf # browse domains? - sed -e "s,^.*browse-domains=.*$,# browse-domains=,g" -i $INSTALL/etc/avahi/avahi-daemon.conf + sed -e "s,^.*browse-domains=.*$,# browse-domains=,g" -i ${INSTALL}/etc/avahi/avahi-daemon.conf # set root user as default - sed -e "s,22,22\n path=/storage\n u=root,g" -i $INSTALL/etc/avahi/services/sftp-ssh.service + sed -e "s,22,22\n path=/storage\n u=root,g" -i ${INSTALL}/etc/avahi/services/sftp-ssh.service - rm -rf $INSTALL/etc/avahi/avahi-dnsconfd.action - rm -rf $INSTALL/etc/avahi/services/ssh.service - if [ ! $SFTP_SERVER = "yes" ]; then - rm -rf $INSTALL/etc/avahi/services/sftp-ssh.service + rm -rf ${INSTALL}/etc/avahi/avahi-dnsconfd.action + rm -rf ${INSTALL}/etc/avahi/services/ssh.service + if [ ! ${SFTP_SERVER} = "yes" ]; then + rm -rf ${INSTALL}/etc/avahi/services/sftp-ssh.service fi - rm -rf $INSTALL/usr/lib/systemd - rm -f $INSTALL/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service - rm -f $INSTALL/usr/sbin/avahi-dnsconfd - rm -f $INSTALL/usr/bin/avahi-bookmarks - rm -f $INSTALL/usr/bin/avahi-publish* - rm -f $INSTALL/usr/bin/avahi-resolve* - rm -f $INSTALL/usr/lib/libdns_sd* + rm -rf ${INSTALL}/usr/lib/systemd + rm -f ${INSTALL}/usr/share/dbus-1/system-services/org.freedesktop.Avahi.service + rm -f ${INSTALL}/usr/sbin/avahi-dnsconfd + rm -f ${INSTALL}/usr/bin/avahi-bookmarks + rm -f ${INSTALL}/usr/bin/avahi-publish* + rm -f ${INSTALL}/usr/bin/avahi-resolve* + rm -f ${INSTALL}/usr/lib/libdns_sd* - mkdir -p $INSTALL/usr/share/services - cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services + mkdir -p ${INSTALL}/usr/share/services + cp -P ${PKG_DIR}/default.d/*.conf ${INSTALL}/usr/share/services } post_install() { diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk index 0bc8afa131..35c24bae3c 100644 --- a/packages/network/bluez/package.mk +++ b/packages/network/bluez/package.mk @@ -19,7 +19,7 @@ else BLUEZ_CONFIG="--disable-debug" fi -BLUEZ_CONFIG="$BLUEZ_CONFIG --enable-monitor --enable-test" +BLUEZ_CONFIG+=" --enable-monitor --enable-test" PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \ --disable-silent-rules \ @@ -34,35 +34,35 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-dependency-tracking \ --disable-experimental \ --enable-sixaxis \ --with-gnu-ld \ - $BLUEZ_CONFIG \ + ${BLUEZ_CONFIG} \ storagedir=/storage/.cache/bluetooth" pre_configure_target() { # bluez fails to build in subdirs - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} export LIBS="-lncurses" } post_makeinstall_target() { - rm -rf $INSTALL/usr/lib/systemd - rm -rf $INSTALL/usr/bin/bccmd - rm -rf $INSTALL/usr/bin/bluemoon - rm -rf $INSTALL/usr/bin/ciptool - rm -rf $INSTALL/usr/share/dbus-1 + rm -rf ${INSTALL}/usr/lib/systemd + rm -rf ${INSTALL}/usr/bin/bccmd + rm -rf ${INSTALL}/usr/bin/bluemoon + rm -rf ${INSTALL}/usr/bin/ciptool + rm -rf ${INSTALL}/usr/share/dbus-1 - mkdir -p $INSTALL/etc/bluetooth - cp src/main.conf $INSTALL/etc/bluetooth - sed -i $INSTALL/etc/bluetooth/main.conf \ + mkdir -p ${INSTALL}/etc/bluetooth + cp src/main.conf ${INSTALL}/etc/bluetooth + sed -i ${INSTALL}/etc/bluetooth/main.conf \ -e "s|^#\[Policy\]|\[Policy\]|g" \ -e "s|^#AutoEnable.*|AutoEnable=true|g" - mkdir -p $INSTALL/usr/share/services - cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services + mkdir -p ${INSTALL}/usr/share/services + cp -P ${PKG_DIR}/default.d/*.conf ${INSTALL}/usr/share/services # bluez looks in /etc/firmware/ - ln -sf /usr/lib/firmware $INSTALL/etc/firmware + ln -sf /usr/lib/firmware ${INSTALL}/etc/firmware } post_install() { diff --git a/packages/network/connman/package.mk b/packages/network/connman/package.mk index 0390ec7843..7c8a3cf9e0 100644 --- a/packages/network/connman/package.mk +++ b/packages/network/connman/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="40947be3848b0a864a366f8d67ce347265ea98c4" # 1.38 + HEAD 12/12/20 PKG_SHA256="d59e93caf297f0ad8d2034fcf956747ba879266e2ad9b7e42abcce86867083e6" PKG_LICENSE="GPL" PKG_SITE="http://www.connman.net" -PKG_URL="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-$PKG_VERSION.tar.gz" +PKG_URL="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain glib readline dbus iptables" PKG_LONGDESC="A modular network connection manager." PKG_TOOLCHAIN="autotools" @@ -44,13 +44,13 @@ PKG_CONFIGURE_OPTS_TARGET="--srcdir=.. \ --with-systemdunitdir=/usr/lib/systemd/system \ --disable-silent-rules" -if [ "$WIREGUARD_SUPPORT" = "yes" ]; then +if [ "${WIREGUARD_SUPPORT}" = "yes" ]; then PKG_CONFIGURE_OPTS_TARGET+=" --enable-wireguard=builtin" else PKG_CONFIGURE_OPTS_TARGET+=" --disable-wireguard" fi -case "$WIRELESS_DAEMON" in +case "${WIRELESS_DAEMON}" in wpa_supplicant) PKG_DEPENDS_TARGET+=" wpa_supplicant" PKG_CONFIGURE_OPTS_TARGET+=" WPASUPPLICANT=/usr/bin/wpa_supplicant \ @@ -69,18 +69,18 @@ PKG_MAKE_OPTS_TARGET="storagedir=/storage/.cache/connman \ statedir=/run/connman" post_makeinstall_target() { - rm -rf $INSTALL/usr/lib/systemd - rm -rf $INSTALL/usr/lib/tmpfiles.d/connman_resolvconf.conf + rm -rf ${INSTALL}/usr/lib/systemd + rm -rf ${INSTALL}/usr/lib/tmpfiles.d/connman_resolvconf.conf - mkdir -p $INSTALL/usr/bin - cp -P client/connmanctl $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -P client/connmanctl ${INSTALL}/usr/bin - mkdir -p $INSTALL/usr/lib/connman - cp -P $PKG_DIR/scripts/connman-setup $INSTALL/usr/lib/connman + mkdir -p ${INSTALL}/usr/lib/connman + cp -P ${PKG_DIR}/scripts/connman-setup ${INSTALL}/usr/lib/connman - mkdir -p $INSTALL/etc/connman - cp ../src/main.conf $INSTALL/etc/connman - sed -i $INSTALL/etc/connman/main.conf \ + mkdir -p ${INSTALL}/etc/connman + cp ../src/main.conf ${INSTALL}/etc/connman + sed -i ${INSTALL}/etc/connman/main.conf \ -e "s|^# BackgroundScanning.*|BackgroundScanning = true|g" \ -e "s|^# UseGatewaysAsTimeservers.*|UseGatewaysAsTimeservers = false|g" \ -e "s|^# FallbackNameservers.*|FallbackNameservers = 8.8.8.8,8.8.4.4|g" \ @@ -91,8 +91,8 @@ post_makeinstall_target() { -e "s|^# PersistentTetheringMode.*|PersistentTetheringMode = true|g" \ -e "s|^# NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb|NetworkInterfaceBlacklist = vmnet,vboxnet,virbr,ifb,docker,veth,zt|g" - mkdir -p $INSTALL/usr/share/connman/ - cp $PKG_DIR/config/settings $INSTALL/usr/share/connman/ + mkdir -p ${INSTALL}/usr/share/connman/ + cp ${PKG_DIR}/config/settings ${INSTALL}/usr/share/connman/ } post_install() { @@ -100,7 +100,7 @@ post_install() { add_group system 430 enable_service connman.service - if [ "$WIREGUARD_SUPPORT" = "yes" ]; then + if [ "${WIREGUARD_SUPPORT}" = "yes" ]; then enable_service connman-vpn.service fi } diff --git a/packages/network/ethtool/package.mk b/packages/network/ethtool/package.mk index 7f47f03280..f9a28bc629 100644 --- a/packages/network/ethtool/package.mk +++ b/packages/network/ethtool/package.mk @@ -7,6 +7,6 @@ PKG_VERSION="5.10" PKG_SHA256="817d5396a9307b4c637b435d4c558b8f5f964a1464a035ca3c0180f4cc93cfcf" PKG_LICENSE="GPL" PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/" -PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://www.kernel.org/pub/software/network/ethtool/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libmnl" PKG_LONGDESC="Ethtool is used for querying settings of an ethernet device and changing them." diff --git a/packages/network/iptables/package.mk b/packages/network/iptables/package.mk index 59ab8fe4e7..450e839e88 100644 --- a/packages/network/iptables/package.mk +++ b/packages/network/iptables/package.mk @@ -7,20 +7,20 @@ PKG_VERSION="1.8.6" PKG_SHA256="a0f4fe0c3eb8faa5bd9c8376d132f340b9558e750c91deb2d5028aa3d0047767" PKG_LICENSE="GPL" PKG_SITE="http://www.netfilter.org/" -PKG_URL="http://www.netfilter.org/projects/iptables/files/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.netfilter.org/projects/iptables/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain linux:host libmnl libnftnl" PKG_LONGDESC="IP packet filter administration." PKG_TOOLCHAIN="autotools" post_makeinstall_target() { - mkdir -p $INSTALL/usr/config/iptables/ - cp -PR $PKG_DIR/config/README $INSTALL/usr/config/iptables/ + mkdir -p ${INSTALL}/usr/config/iptables/ + cp -PR ${PKG_DIR}/config/README ${INSTALL}/usr/config/iptables/ - mkdir -p $INSTALL/etc/iptables/ - cp -PR $PKG_DIR/config/* $INSTALL/etc/iptables/ + mkdir -p ${INSTALL}/etc/iptables/ + cp -PR ${PKG_DIR}/config/* ${INSTALL}/etc/iptables/ - mkdir -p $INSTALL/usr/lib/libreelec - cp $PKG_DIR/scripts/iptables_helper $INSTALL/usr/lib/libreelec + mkdir -p ${INSTALL}/usr/lib/libreelec + cp ${PKG_DIR}/scripts/iptables_helper ${INSTALL}/usr/lib/libreelec } post_install() { diff --git a/packages/network/iw/package.mk b/packages/network/iw/package.mk index 223c7257b5..600179dc59 100644 --- a/packages/network/iw/package.mk +++ b/packages/network/iw/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="5.9" PKG_SHA256="293a07109aeb7e36267cf59e3ce52857e9ffae3a6666eb8ac77894b1839fe1f2" PKG_LICENSE="PUBLIC_DOMAIN" PKG_SITE="http://wireless.kernel.org/en/users/Documentation/iw" -PKG_URL="https://www.kernel.org/pub/software/network/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://www.kernel.org/pub/software/network/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libnl" PKG_LONGDESC="A new nl80211 based CLI configuration utility for wireless devices." # iw fails at runtime with lto enabled pre_configure_target() { - export LDFLAGS="$LDFLAGS -pthread" + export LDFLAGS="${LDFLAGS} -pthread" } post_makeinstall_target() { - mkdir -p $INSTALL/usr/lib/iw - cp $PKG_DIR/scripts/setregdomain $INSTALL/usr/lib/iw + mkdir -p ${INSTALL}/usr/lib/iw + cp ${PKG_DIR}/scripts/setregdomain ${INSTALL}/usr/lib/iw } diff --git a/packages/network/iwd/package.mk b/packages/network/iwd/package.mk index b060b1ddaf..505d7e8baa 100644 --- a/packages/network/iwd/package.mk +++ b/packages/network/iwd/package.mk @@ -33,7 +33,7 @@ post_makeinstall_target() { -e 's|^\(ProtectControlGroups=.*\)$|#\1|g' \ -e 's|^\(ProtectKernelModules=.*\)$|#\1|g' \ -e 's|^\(ConfigurationDirectory=.*\)$|#\1|g' \ - -i $INSTALL/usr/lib/systemd/system/iwd.service + -i ${INSTALL}/usr/lib/systemd/system/iwd.service } post_install() { diff --git a/packages/network/libdnet/package.mk b/packages/network/libdnet/package.mk index 6e14fdb52c..aaae711a08 100644 --- a/packages/network/libdnet/package.mk +++ b/packages/network/libdnet/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.14" PKG_SHA256="592599c54a57102a177270f3a2caabda2c2ac7768b977d7458feba97da923dfe" PKG_LICENSE="BSD" PKG_SITE="https://github.com/ofalk/libdnet" -PKG_URL="https://github.com/ofalk/libdnet/archive/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/ofalk/libdnet/archive/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A simplified, portable interface to several low-level networking routines" PKG_TOOLCHAIN="autotools" @@ -20,10 +20,10 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_strlcat=no \ --disable-python" pre_configure_target() { - export CFLAGS+=" -I$PKG_BUILD/include" + export CFLAGS+=" -I${PKG_BUILD}/include" } post_makeinstall_target() { - cp $SYSROOT_PREFIX/usr/bin/dnet-config \ - $TOOLCHAIN/bin/dnet-config + cp ${SYSROOT_PREFIX}/usr/bin/dnet-config \ + ${TOOLCHAIN}/bin/dnet-config } diff --git a/packages/network/libmnl/package.mk b/packages/network/libmnl/package.mk index ec2eb2b51d..a7cee1dfbb 100644 --- a/packages/network/libmnl/package.mk +++ b/packages/network/libmnl/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="1.0.4" PKG_SHA256="171f89699f286a5854b72b91d06e8f8e3683064c5901fb09d954a9ab6f551f81" PKG_LICENSE="GPL" PKG_SITE="http://netfilter.org/projects/libmnl" -PKG_URL="http://netfilter.org/projects/libmnl/files/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://netfilter.org/projects/libmnl/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A minimalistic user-space library oriented to Netlink developers." diff --git a/packages/network/libnfs/package.mk b/packages/network/libnfs/package.mk index 6dacdd2415..b723ae318e 100644 --- a/packages/network/libnfs/package.mk +++ b/packages/network/libnfs/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="4.0.0" PKG_SHA256="6ee77e9fe220e2d3e3b1f53cfea04fb319828cc7dbb97dd9df09e46e901d797d" PKG_LICENSE="LGPL2.1+" PKG_SITE="https://github.com/sahlberg/libnfs" -PKG_URL="https://github.com/sahlberg/libnfs/archive/libnfs-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/sahlberg/libnfs/archive/libnfs-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A client library for accessing NFS shares over a network." PKG_TOOLCHAIN="autotools" @@ -15,5 +15,5 @@ PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--disable-examples" pre_configure_target() { - export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64" + export CFLAGS="${CFLAGS} -D_FILE_OFFSET_BITS=64" } diff --git a/packages/network/libnftnl/package.mk b/packages/network/libnftnl/package.mk index 3f1d15b7b8..079387dbcd 100644 --- a/packages/network/libnftnl/package.mk +++ b/packages/network/libnftnl/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.8" PKG_SHA256="04a3fa5b08b736268f7e65836b9f05d9d5f438181467bee3c76c3c4a4f3ab711" PKG_LICENSE="GPL" PKG_SITE="http://netfilter.org/projects/libnftnl" -PKG_URL="http://netfilter.org/projects/libnftnl/files/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://netfilter.org/projects/libnftnl/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libmnl" PKG_LONGDESC="A userspace library providing a low-level netlink programming interface (API) to the in-kernel nf_tables subsystem." diff --git a/packages/network/libnl/package.mk b/packages/network/libnl/package.mk index ef2a455bb4..251d958ed1 100644 --- a/packages/network/libnl/package.mk +++ b/packages/network/libnl/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="3.5.0" PKG_SHA256="352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa" PKG_LICENSE="LGPL" PKG_SITE="https://github.com/thom311/libnl" -PKG_URL="https://github.com/thom311/libnl/releases/download/libnl${PKG_VERSION//./_}/libnl-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/thom311/libnl/releases/download/libnl${PKG_VERSION//./_}/libnl-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A library for applications dealing with netlink socket." diff --git a/packages/network/libshairplay/package.mk b/packages/network/libshairplay/package.mk index c0969a18d9..78d51a5eb3 100644 --- a/packages/network/libshairplay/package.mk +++ b/packages/network/libshairplay/package.mk @@ -7,16 +7,16 @@ PKG_VERSION="096b61ad14c90169f438e690d096e3fcf87e504e" PKG_SHA256="7e2b013ffe75ea2f13fb12b1aa38b8e2e8b1899ac292d57f05d7b352a3a181cf" PKG_LICENSE="MIT" PKG_SITE="https://github.com/juhovh/shairplay" -PKG_URL="https://github.com/juhovh/shairplay/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/juhovh/shairplay/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain avahi" PKG_LONGDESC="Apple airplay and raop protocol server" PKG_TOOLCHAIN="autotools" pre_configure_target() { - CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/avahi-compat-libdns_sd" + CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/avahi-compat-libdns_sd" } post_makeinstall_target() { - mkdir -p $INSTALL/etc/shairplay - cp -P ../airport.key $INSTALL/etc/shairplay + mkdir -p ${INSTALL}/etc/shairplay + cp -P ../airport.key ${INSTALL}/etc/shairplay } diff --git a/packages/network/libssh/package.mk b/packages/network/libssh/package.mk index 621a039110..4f7eed7125 100644 --- a/packages/network/libssh/package.mk +++ b/packages/network/libssh/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.9.5" PKG_SHA256="acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718" PKG_LICENSE="LGPL" PKG_SITE="http://www.libssh.org/" -PKG_URL="https://www.libssh.org/files/$(get_pkg_version_maj_min)/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://www.libssh.org/files/$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain zlib openssl" PKG_LONGDESC="Library for accessing ssh client services through C libraries." @@ -20,14 +20,14 @@ PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF \ makeinstall_target() { # install static library only - mkdir -p $SYSROOT_PREFIX/usr/lib - cp $PKG_BUILD/.$TARGET_NAME/src/libssh.a $SYSROOT_PREFIX/usr/lib + mkdir -p ${SYSROOT_PREFIX}/usr/lib + cp ${PKG_BUILD}/.${TARGET_NAME}/src/libssh.a ${SYSROOT_PREFIX}/usr/lib - mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig - cp $PKG_BUILD/.$TARGET_NAME/libssh.pc $SYSROOT_PREFIX/usr/lib/pkgconfig + mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig + cp ${PKG_BUILD}/.${TARGET_NAME}/libssh.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig - mkdir -p $SYSROOT_PREFIX/usr/include/libssh - cp $PKG_BUILD/include/libssh/{callbacks.h,legacy.h,libssh.h,server.h,sftp.h,ssh2.h} \ - $PKG_BUILD/.$TARGET_NAME/include/libssh/libssh_version.h \ - $SYSROOT_PREFIX/usr/include/libssh + mkdir -p ${SYSROOT_PREFIX}/usr/include/libssh + cp ${PKG_BUILD}/include/libssh/{callbacks.h,legacy.h,libssh.h,server.h,sftp.h,ssh2.h} \ + ${PKG_BUILD}/.${TARGET_NAME}/include/libssh/libssh_version.h \ + ${SYSROOT_PREFIX}/usr/include/libssh } diff --git a/packages/network/libtirpc/package.mk b/packages/network/libtirpc/package.mk index 7a6d85a800..8f6ca5de86 100644 --- a/packages/network/libtirpc/package.mk +++ b/packages/network/libtirpc/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3.1" PKG_SHA256="245895caf066bec5e3d4375942c8cb4366adad184c29c618d97f724ea309ee17" PKG_LICENSE="GPL" PKG_SITE="https://sourceforge.net/projects/libtirpc/" -PKG_URL="https://downloads.sourceforge.net/project/libtirpc/libtirpc/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="https://downloads.sourceforge.net/project/libtirpc/libtirpc/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A port of Suns Transport-Independent RPC library to Linux." PKG_BUILD_FLAGS="+pic" diff --git a/packages/network/netbase/package.mk b/packages/network/netbase/package.mk index 6ea7b2a2a8..000bcd35f0 100644 --- a/packages/network/netbase/package.mk +++ b/packages/network/netbase/package.mk @@ -6,13 +6,13 @@ PKG_VERSION="6.2" PKG_SHA256="309a24146a06347d654b261e9e07a82fab844b173674a42e223803dd8258541e" PKG_LICENSE="GPL" PKG_SITE="https://salsa.debian.org/md/netbase" -PKG_URL="http://ftp.debian.org/debian/pool/main/n/netbase/netbase_$PKG_VERSION.tar.xz" +PKG_URL="http://ftp.debian.org/debian/pool/main/n/netbase/netbase_${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The netbase package provides data for network services and protocols from the iana db." PKG_TOOLCHAIN="manual" makeinstall_target() { - mkdir -p $INSTALL/etc - cp etc/protocols $INSTALL/etc - cp etc/services $INSTALL/etc + mkdir -p ${INSTALL}/etc + cp etc/protocols ${INSTALL}/etc + cp etc/services ${INSTALL}/etc } diff --git a/packages/network/nss-mdns/package.mk b/packages/network/nss-mdns/package.mk index 53aa3b3f74..baa64e18b1 100644 --- a/packages/network/nss-mdns/package.mk +++ b/packages/network/nss-mdns/package.mk @@ -7,12 +7,12 @@ PKG_VERSION="0.14.1" PKG_SHA256="4fe54bffd20e410fc41382dc6c4708cdfa3a65f50c3753f262dc4c78fd864a6e" PKG_LICENSE="GPL" PKG_SITE="https://github.com/lathiat/nss-mdns" -PKG_URL="https://github.com/lathiat/nss-mdns/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/lathiat/nss-mdns/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain avahi" PKG_LONGDESC="A plugin for nss to allow name resolution via Multicast DNS." PKG_TOOLCHAIN="autotools" post_makeinstall_target() { - mkdir -p $INSTALL/etc - cp $PKG_DIR/config/nsswitch.conf $INSTALL/etc/nsswitch.conf + mkdir -p ${INSTALL}/etc + cp ${PKG_DIR}/config/nsswitch.conf ${INSTALL}/etc/nsswitch.conf } diff --git a/packages/network/openssh/package.mk b/packages/network/openssh/package.mk index 66f864061f..2bc77c3282 100644 --- a/packages/network/openssh/package.mk +++ b/packages/network/openssh/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="8.4p1" PKG_SHA256="5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24" PKG_LICENSE="OSS" PKG_SITE="https://www.openssh.com/" -PKG_URL="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain openssl zlib" PKG_LONGDESC="An open re-implementation of the SSH package." PKG_TOOLCHAIN="autotools" @@ -33,25 +33,25 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_rpc_types_h=no \ --without-pam" pre_configure_target() { - export LD="$CC" - export LDFLAGS="$TARGET_CFLAGS $TARGET_LDFLAGS" + export LD="${CC}" + export LDFLAGS="${TARGET_CFLAGS} ${TARGET_LDFLAGS}" } post_makeinstall_target() { - rm -rf $INSTALL/usr/lib/openssh/ssh-keysign - rm -rf $INSTALL/usr/lib/openssh/ssh-pkcs11-helper - if [ ! $SFTP_SERVER = "yes" ]; then - rm -rf $INSTALL/usr/lib/openssh/sftp-server + rm -rf ${INSTALL}/usr/lib/openssh/ssh-keysign + rm -rf ${INSTALL}/usr/lib/openssh/ssh-pkcs11-helper + if [ ! ${SFTP_SERVER} = "yes" ]; then + rm -rf ${INSTALL}/usr/lib/openssh/sftp-server fi - rm -rf $INSTALL/usr/bin/ssh-add - rm -rf $INSTALL/usr/bin/ssh-agent - rm -rf $INSTALL/usr/bin/ssh-keyscan + rm -rf ${INSTALL}/usr/bin/ssh-add + rm -rf ${INSTALL}/usr/bin/ssh-agent + rm -rf ${INSTALL}/usr/bin/ssh-keyscan sed -e "s|^#PermitRootLogin.*|PermitRootLogin yes|g" \ -e "s|^#StrictModes.*|StrictModes no|g" \ - -i $INSTALL/etc/ssh/sshd_config + -i ${INSTALL}/etc/ssh/sshd_config - debug_strip $INSTALL/usr + debug_strip ${INSTALL}/usr } post_install() { diff --git a/packages/network/openvpn/package.mk b/packages/network/openvpn/package.mk index cdc18f009d..8a2d74cbeb 100644 --- a/packages/network/openvpn/package.mk +++ b/packages/network/openvpn/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.4.10" PKG_SHA256="cf285395a679f0b68c0acde2cb2480e8ead6ca07ff14c1bc52ae65a1243aa377" PKG_LICENSE="GPL" PKG_SITE="https://openvpn.net" -PKG_URL="https://swupdate.openvpn.org/community/releases/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://swupdate.openvpn.org/community/releases/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain lzo openssl" PKG_LONGDESC="A full featured SSL VPN software solution that integrates OpenVPN server capabilities." @@ -22,6 +22,6 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_have_decl_TUNSETPERSIST=no \ --disable-debug" post_makeinstall_target() { - mkdir -p $INSTALL/usr/bin - ln -sf ../sbin/openvpn $INSTALL/usr/bin/openvpn + mkdir -p ${INSTALL}/usr/bin + ln -sf ../sbin/openvpn ${INSTALL}/usr/bin/openvpn } diff --git a/packages/network/rpcbind/package.mk b/packages/network/rpcbind/package.mk index 4d9a667ae8..9733908577 100644 --- a/packages/network/rpcbind/package.mk +++ b/packages/network/rpcbind/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.2.5" PKG_SHA256="2ce360683963b35c19c43f0ee2c7f18aa5b81ef41c3fdbd15ffcb00b8bffda7a" PKG_LICENSE="OSS" PKG_SITE="http://rpcbind.sourceforge.net/" -PKG_URL="$SOURCEFORGE_SRC/rpcbind/rpcbind/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="${SOURCEFORGE_SRC}/rpcbind/rpcbind/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libtirpc systemd" PKG_LONGDESC="The rpcbind utility is a server that converts RPC program numbers into universal addresses." diff --git a/packages/network/rsync/package.mk b/packages/network/rsync/package.mk index eb6076068f..dad8087252 100644 --- a/packages/network/rsync/package.mk +++ b/packages/network/rsync/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="3.2.3" PKG_SHA256="becc3c504ceea499f4167a260040ccf4d9f2ef9499ad5683c179a697146ce50e" PKG_LICENSE="GPLv3" PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html" -PKG_URL="https://download.samba.org/pub/rsync/src/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://download.samba.org/pub/rsync/src/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="autotools:host zlib:host zstd:host" PKG_DEPENDS_TARGET="toolchain zlib openssl" PKG_LONGDESC="A very fast method for bringing remote files into sync." diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index de75766c7a..5b03116bc6 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="4.13.3" PKG_SHA256="c10585d43f33656fe4e1f9ff8bf40ea57d8d5b653521c1cc198fbf4922756541" PKG_LICENSE="GPLv3+" PKG_SITE="https://www.samba.org" -PKG_URL="https://download.samba.org/pub/samba/stable/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://download.samba.org/pub/samba/stable/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain attr heimdal:host e2fsprogs Python3 zlib readline popt libaio connman gnutls" PKG_NEED_UNPACK="$(get_pkg_directory heimdal) $(get_pkg_directory e2fsprogs)" PKG_LONGDESC="A free SMB / CIFS fileserver and client." @@ -16,14 +16,14 @@ PKG_BUILD_FLAGS="-gold" configure_package() { #PKG_WAF_VERBOSE="-v" - if [ "$AVAHI_DAEMON" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi" + if [ "${AVAHI_DAEMON}" = yes ]; then + PKG_DEPENDS_TARGET+=" avahi" SMB_AVAHI="--enable-avahi" else SMB_AVAHI="--disable-avahi" fi - if [ "$TARGET_ARCH" = x86_64 ]; then + if [ "${TARGET_ARCH}" = x86_64 ]; then SMB_AESNI="--accel-aes=intelaesni" else SMB_AESNI="--accel-aes=none" @@ -40,9 +40,9 @@ configure_package() { --with-privatelibdir=/usr/lib \ --with-sockets-dir=/run/samba \ --with-configdir=/run/samba \ - --with-libiconv=$SYSROOT_PREFIX/usr \ + --with-libiconv=${SYSROOT_PREFIX}/usr \ --cross-compile \ - --cross-answers=$PKG_BUILD/cache.txt \ + --cross-answers=${PKG_BUILD}/cache.txt \ --hostcc=gcc \ --enable-fhs \ --without-dmapi \ @@ -50,8 +50,8 @@ configure_package() { --disable-rpath \ --disable-rpath-install \ --disable-rpath-private-install \ - $SMB_AVAHI \ - $SMB_AESNI \ + ${SMB_AVAHI} \ + ${SMB_AESNI} \ --disable-cups \ --disable-iprint \ --with-relro \ @@ -84,35 +84,35 @@ configure_package() { PKG_SAMBA_TARGET="smbclient,client/smbclient,smbtree,nmblookup,testparm" - if [ "$SAMBA_SERVER" = "yes" ]; then + if [ "${SAMBA_SERVER}" = "yes" ]; then PKG_SAMBA_TARGET+=",smbd/smbd,nmbd,smbpasswd" fi } pre_configure_target() { # samba uses its own build directory - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} # work around link issues - export LDFLAGS="$LDFLAGS -lreadline -lncurses" + export LDFLAGS="${LDFLAGS} -lreadline -lncurses" # support 64-bit offsets and seeks on 32-bit platforms - if [ "$TARGET_ARCH" = "arm" ]; then + if [ "${TARGET_ARCH}" = "arm" ]; then export CFLAGS+=" -D_FILE_OFFSET_BITS=64 -D_OFF_T_DEFINED_ -Doff_t=off64_t -Dlseek=lseek64" fi } configure_target() { - cp $PKG_DIR/config/samba4-cache.txt $PKG_BUILD/cache.txt - echo "Checking uname machine type: \"$TARGET_ARCH\"" >> $PKG_BUILD/cache.txt + cp ${PKG_DIR}/config/samba4-cache.txt ${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 + export COMPILE_ET=${TOOLCHAIN}/bin/heimdal_compile_et + export ASN1_COMPILE=${TOOLCHAIN}/bin/heimdal_asn1_compile - PYTHON_CONFIG="$SYSROOT_PREFIX/usr/bin/python3-config" \ + PYTHON_CONFIG="${SYSROOT_PREFIX}/usr/bin/python3-config" \ python_LDFLAGS="" python_LIBDIR="" \ - PYTHON=${TOOLCHAIN}/bin/python3 ./configure $PKG_CONFIGURE_OPTS + PYTHON=${TOOLCHAIN}/bin/python3 ./configure ${PKG_CONFIGURE_OPTS} } # disable icu, there is no buildswitch to disable @@ -123,12 +123,12 @@ pre_make_target() { } make_target() { - ./buildtools/bin/waf build ${PKG_WAF_VERBOSE} --targets=$PKG_SAMBA_TARGET -j$CONCURRENCY_MAKE_LEVEL + ./buildtools/bin/waf build ${PKG_WAF_VERBOSE} --targets=${PKG_SAMBA_TARGET} -j${CONCURRENCY_MAKE_LEVEL} } makeinstall_target() { - ./buildtools/bin/waf install ${PKG_WAF_VERBOSE} --destdir=$SYSROOT_PREFIX --targets=smbclient -j$CONCURRENCY_MAKE_LEVEL - ./buildtools/bin/waf install ${PKG_WAF_VERBOSE} --destdir=$INSTALL --targets=$PKG_SAMBA_TARGET -j$CONCURRENCY_MAKE_LEVEL + ./buildtools/bin/waf install ${PKG_WAF_VERBOSE} --destdir=${SYSROOT_PREFIX} --targets=smbclient -j${CONCURRENCY_MAKE_LEVEL} + ./buildtools/bin/waf install ${PKG_WAF_VERBOSE} --destdir=${INSTALL} --targets=${PKG_SAMBA_TARGET} -j${CONCURRENCY_MAKE_LEVEL} } copy_directory_of_links() { @@ -152,7 +152,7 @@ perform_manual_install() { copy_directory_of_links ${PKG_BUILD}/bin/shared ${INSTALL}/usr/lib copy_directory_of_links ${PKG_BUILD}/bin/shared/private ${INSTALL}/usr/lib - if [ "$SAMBA_SERVER" = "yes" ]; then + if [ "${SAMBA_SERVER}" = "yes" ]; then mkdir -p ${INSTALL}/usr/sbin cp -L ${PKG_BUILD}/bin/smbd ${INSTALL}/usr/sbin cp -L ${PKG_BUILD}/bin/nmbd ${INSTALL}/usr/sbin @@ -162,45 +162,45 @@ perform_manual_install() { post_makeinstall_target() { perform_manual_install - rm -rf $INSTALL/usr/bin - rm -rf $INSTALL/usr/lib/python* - rm -rf $INSTALL/usr/share/perl* - rm -rf $INSTALL/usr/lib64 + rm -rf ${INSTALL}/usr/bin + rm -rf ${INSTALL}/usr/lib/python* + rm -rf ${INSTALL}/usr/share/perl* + rm -rf ${INSTALL}/usr/lib64 - mkdir -p $INSTALL/usr/lib/samba - cp $PKG_DIR/scripts/samba-config $INSTALL/usr/lib/samba - cp $PKG_DIR/scripts/smbd-config $INSTALL/usr/lib/samba - cp $PKG_DIR/scripts/samba-autoshare $INSTALL/usr/lib/samba + mkdir -p ${INSTALL}/usr/lib/samba + cp ${PKG_DIR}/scripts/samba-config ${INSTALL}/usr/lib/samba + cp ${PKG_DIR}/scripts/smbd-config ${INSTALL}/usr/lib/samba + cp ${PKG_DIR}/scripts/samba-autoshare ${INSTALL}/usr/lib/samba if find_file_path config/smb.conf; then - mkdir -p $INSTALL/etc/samba - cp ${FOUND_PATH} $INSTALL/etc/samba - mkdir -p $INSTALL/usr/config - cp $INSTALL/etc/samba/smb.conf $INSTALL/usr/config/samba.conf.sample + mkdir -p ${INSTALL}/etc/samba + cp ${FOUND_PATH} ${INSTALL}/etc/samba + mkdir -p ${INSTALL}/usr/config + cp ${INSTALL}/etc/samba/smb.conf ${INSTALL}/usr/config/samba.conf.sample fi - mkdir -p $INSTALL/usr/bin - cp -PR bin/default/source3/client/smbclient $INSTALL/usr/bin - cp -PR bin/default/source3/utils/smbtree $INSTALL/usr/bin - cp -PR bin/default/source3/utils/nmblookup $INSTALL/usr/bin - cp -PR bin/default/source3/utils/testparm $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -PR bin/default/source3/client/smbclient ${INSTALL}/usr/bin + cp -PR bin/default/source3/utils/smbtree ${INSTALL}/usr/bin + cp -PR bin/default/source3/utils/nmblookup ${INSTALL}/usr/bin + cp -PR bin/default/source3/utils/testparm ${INSTALL}/usr/bin - if [ "$SAMBA_SERVER" = "yes" ]; then - mkdir -p $INSTALL/usr/bin - cp -PR bin/default/source3/utils/smbpasswd $INSTALL/usr/bin + if [ "${SAMBA_SERVER}" = "yes" ]; then + mkdir -p ${INSTALL}/usr/bin + cp -PR bin/default/source3/utils/smbpasswd ${INSTALL}/usr/bin - mkdir -p $INSTALL/usr/lib/systemd/system - cp $PKG_DIR/system.d.opt/* $INSTALL/usr/lib/systemd/system + mkdir -p ${INSTALL}/usr/lib/systemd/system + cp ${PKG_DIR}/system.d.opt/* ${INSTALL}/usr/lib/systemd/system - mkdir -p $INSTALL/usr/share/services - cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services + mkdir -p ${INSTALL}/usr/share/services + cp -P ${PKG_DIR}/default.d/*.conf ${INSTALL}/usr/share/services fi } post_install() { enable_service samba-config.service - if [ "$SAMBA_SERVER" = "yes" ]; then + if [ "${SAMBA_SERVER}" = "yes" ]; then enable_service nmbd.service enable_service smbd.service fi diff --git a/packages/network/wireguard-tools/package.mk b/packages/network/wireguard-tools/package.mk index 33af9026fe..c5ea288c6c 100644 --- a/packages/network/wireguard-tools/package.mk +++ b/packages/network/wireguard-tools/package.mk @@ -6,9 +6,9 @@ PKG_VERSION="1.0.20200827" PKG_SHA256="ec08772216da73a2f6a925927ce794fe9686ba169bb774e451d34199db19795c" PKG_LICENSE="GPLv2" PKG_SITE="https://www.wireguard.com" -PKG_URL="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-v$PKG_VERSION.tar.xz" +PKG_URL="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-v${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain linux" -PKG_NEED_UNPACK="$LINUX_DEPENDS" +PKG_NEED_UNPACK="${LINUX_DEPENDS}" PKG_LONGDESC="WireGuard VPN userspace tools" PKG_TOOLCHAIN="manual" PKG_IS_KERNEL_PKG="yes" @@ -22,10 +22,10 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp $PKG_DIR/scripts/wg-keygen $INSTALL/usr/bin - cp $PKG_BUILD/src/wg $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp ${PKG_DIR}/scripts/wg-keygen ${INSTALL}/usr/bin + cp ${PKG_BUILD}/src/wg ${INSTALL}/usr/bin - mkdir -p $INSTALL/usr - cp -R $PKG_DIR/config $INSTALL/usr + mkdir -p ${INSTALL}/usr + cp -R ${PKG_DIR}/config ${INSTALL}/usr } diff --git a/packages/network/wireless-regdb/package.mk b/packages/network/wireless-regdb/package.mk index 1623c00abb..4ff18cd8e9 100644 --- a/packages/network/wireless-regdb/package.mk +++ b/packages/network/wireless-regdb/package.mk @@ -7,12 +7,12 @@ PKG_VERSION="2020.11.20" PKG_SHA256="b4164490d82ff7b0086e812ac42ab27baf57be24324d4c0ee1c5dd6ba27f2a52" PKG_LICENSE="GPL" PKG_SITE="http://wireless.kernel.org/en/developers/Regulatory" -PKG_URL="https://www.kernel.org/pub/software/network/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://www.kernel.org/pub/software/network/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_LONGDESC="wireless-regdb is a regulatory database" PKG_TOOLCHAIN="manual" makeinstall_target() { - FW_TARGET_DIR=$INSTALL/$(get_full_firmware_dir) + FW_TARGET_DIR=${INSTALL}/$(get_full_firmware_dir) mkdir -p ${FW_TARGET_DIR} cp ${PKG_BUILD}/regulatory.db ${PKG_BUILD}/regulatory.db.p7s ${FW_TARGET_DIR} diff --git a/packages/network/wpa_supplicant/package.mk b/packages/network/wpa_supplicant/package.mk index 09bdbd4b3f..409df694a2 100644 --- a/packages/network/wpa_supplicant/package.mk +++ b/packages/network/wpa_supplicant/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.9" PKG_SHA256="fcbdee7b4a64bea8177973299c8c824419c413ec2e3a95db63dd6a5dc3541f17" PKG_LICENSE="GPL" PKG_SITE="https://w1.fi/wpa_supplicant/" -PKG_URL="https://w1.fi/releases/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://w1.fi/releases/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain dbus libnl openssl" PKG_LONGDESC="A free software implementation of an IEEE 802.11i supplicant." PKG_TOOLCHAIN="make" @@ -17,20 +17,20 @@ PKG_MAKE_OPTS_TARGET="-C wpa_supplicant V=1 LIBDIR=/usr/lib BINDIR=/usr/bin" PKG_MAKEINSTALL_OPTS_TARGET="-C wpa_supplicant V=1 LIBDIR=/usr/lib BINDIR=/usr/bin" configure_target() { - LDFLAGS="$LDFLAGS -lpthread -lm" + LDFLAGS+=" -lpthread -lm" - cp $PKG_DIR/config/makefile.config wpa_supplicant/.config + cp ${PKG_DIR}/config/makefile.config wpa_supplicant/.config } post_makeinstall_target() { - rm -r $INSTALL/usr/bin/wpa_cli + rm -r ${INSTALL}/usr/bin/wpa_cli - mkdir -p $INSTALL/etc/dbus-1/system.d - cp wpa_supplicant/dbus/dbus-wpa_supplicant.conf $INSTALL/etc/dbus-1/system.d + mkdir -p ${INSTALL}/etc/dbus-1/system.d + cp wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${INSTALL}/etc/dbus-1/system.d - mkdir -p $INSTALL/usr/lib/systemd/system - cp wpa_supplicant/systemd/wpa_supplicant.service $INSTALL/usr/lib/systemd/system + mkdir -p ${INSTALL}/usr/lib/systemd/system + cp wpa_supplicant/systemd/wpa_supplicant.service ${INSTALL}/usr/lib/systemd/system - mkdir -p $INSTALL/usr/share/dbus-1/system-services - cp wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service $INSTALL/usr/share/dbus-1/system-services + mkdir -p ${INSTALL}/usr/share/dbus-1/system-services + cp wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service ${INSTALL}/usr/share/dbus-1/system-services } From f6c75028ce96c3e90db148b1822766186f29ad6f Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:12 +0000 Subject: [PATCH 17/27] oem: automated code cleanup Signed-off-by: Ian Leonard --- packages/oem/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/oem/package.mk b/packages/oem/package.mk index 42e98d4e69..6b49c12178 100644 --- a/packages/oem/package.mk +++ b/packages/oem/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="" PKG_LICENSE="various" PKG_SITE="http://www.libreelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain $PROJECT" +PKG_DEPENDS_TARGET="toolchain ${PROJECT}" PKG_SECTION="virtual" PKG_LONGDESC="OEM: Metapackage for various OEM packages" From 04d3c53c8598f02e9946094509a102cc58f7eb42 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:12 +0000 Subject: [PATCH 18/27] print: automated code cleanup Signed-off-by: Ian Leonard --- packages/print/freetype/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/print/freetype/package.mk b/packages/print/freetype/package.mk index adfef48a5e..9ab9e89fc3 100644 --- a/packages/print/freetype/package.mk +++ b/packages/print/freetype/package.mk @@ -7,15 +7,15 @@ PKG_VERSION="2.10.4" PKG_SHA256="86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784" PKG_LICENSE="GPL" PKG_SITE="http://www.freetype.org" -PKG_URL="http://download.savannah.gnu.org/releases/freetype/freetype-$PKG_VERSION.tar.xz" +PKG_URL="http://download.savannah.gnu.org/releases/freetype/freetype-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain zlib libpng" PKG_LONGDESC="The FreeType engine is a free and portable TrueType font rendering engine." PKG_TOOLCHAIN="configure" # package specific configure options -PKG_CONFIGURE_OPTS_TARGET="LIBPNG_CFLAGS=-I$SYSROOT_PREFIX/usr/include \ - LIBPNG_LDFLAGS=-L$SYSROOT_PREFIX/usr/lib \ +PKG_CONFIGURE_OPTS_TARGET="LIBPNG_CFLAGS=-I${SYSROOT_PREFIX}/usr/include \ + LIBPNG_LDFLAGS=-L${SYSROOT_PREFIX}/usr/lib \ --with-zlib" pre_configure_target() { From 54d9d281d7441a74a7d00c2be764c7bafc32b5b1 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:13 +0000 Subject: [PATCH 19/27] python: automated code cleanup Signed-off-by: Ian Leonard --- packages/python/devel/Mako/package.mk | 4 ++-- packages/python/devel/MarkupSafe/package.mk | 4 ++-- packages/python/devel/distutilscross/package.mk | 4 ++-- packages/python/devel/meson/package.mk | 6 +++--- packages/python/devel/ninja/package.mk | 6 +++--- packages/python/devel/pathlib/package.mk | 4 ++-- packages/python/devel/pygobject/package.mk | 8 ++++---- packages/python/devel/setuptools/package.mk | 4 ++-- packages/python/devel/waf/package.mk | 10 +++++----- packages/python/graphics/Pillow/package.mk | 8 ++++---- packages/python/security/pycryptodome/package.mk | 16 ++++++++-------- packages/python/system/dbus-python/package.mk | 8 ++++---- packages/python/system/dbussy/package.mk | 2 +- packages/python/system/simplejson/package.mk | 8 ++++---- 14 files changed, 46 insertions(+), 46 deletions(-) diff --git a/packages/python/devel/Mako/package.mk b/packages/python/devel/Mako/package.mk index 7f19d18a82..7a0f397521 100644 --- a/packages/python/devel/Mako/package.mk +++ b/packages/python/devel/Mako/package.mk @@ -7,11 +7,11 @@ PKG_VERSION="1.1.3" PKG_SHA256="8195c8c1400ceb53496064314c6736719c6f25e7479cd24c77be3d9361cddc27" PKG_LICENSE="GPL" PKG_SITE="https://pypi.org/project/Mako" -PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="Python3:host setuptools:host MarkupSafe:host" PKG_LONGDESC="Mako is a super-fast templating language that borrows the best ideas from the existing templating languages." PKG_TOOLCHAIN="manual" makeinstall_host() { - exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN + exec_thread_safe python3 setup.py install --prefix=${TOOLCHAIN} } diff --git a/packages/python/devel/MarkupSafe/package.mk b/packages/python/devel/MarkupSafe/package.mk index a19bacaf17..c3b7c6c571 100644 --- a/packages/python/devel/MarkupSafe/package.mk +++ b/packages/python/devel/MarkupSafe/package.mk @@ -7,11 +7,11 @@ PKG_VERSION="1.1.1" PKG_SHA256="29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b" PKG_LICENSE="GPL" PKG_SITE="https://pypi.org/project/MarkupSafe/" -PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="Python3:host setuptools:host" PKG_LONGDESC="MarkupSafe implements a XML/HTML/XHTML Markup safe string for Python" PKG_TOOLCHAIN="manual" makeinstall_host() { - exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN + exec_thread_safe python3 setup.py install --prefix=${TOOLCHAIN} } diff --git a/packages/python/devel/distutilscross/package.mk b/packages/python/devel/distutilscross/package.mk index 2536b94078..69ea5b28a2 100644 --- a/packages/python/devel/distutilscross/package.mk +++ b/packages/python/devel/distutilscross/package.mk @@ -7,11 +7,11 @@ PKG_VERSION="0.1" PKG_SHA256="4ed3fb427708c8a3ed5fe9c599532480f581078a1e0aec0e50f40eb58e9f0015" PKG_LICENSE="GPL" PKG_SITE="https://pypi.org/project/distutilscross/" -PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="Python3:host setuptools:host" PKG_LONGDESC="distutilscross enhances distutils to support Cross Compile of Python extensions" PKG_TOOLCHAIN="manual" makeinstall_host() { - exec_thread_safe python setup.py install --prefix=$TOOLCHAIN + exec_thread_safe python setup.py install --prefix=${TOOLCHAIN} } diff --git a/packages/python/devel/meson/package.mk b/packages/python/devel/meson/package.mk index 5236c8994a..a805340afd 100644 --- a/packages/python/devel/meson/package.mk +++ b/packages/python/devel/meson/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.56.0" PKG_SHA256="291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213" PKG_LICENSE="Apache" PKG_SITE="http://mesonbuild.com" -PKG_URL="https://github.com/mesonbuild/meson/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/mesonbuild/meson/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="Python3:host setuptools:host pathlib:host" PKG_LONGDESC="High productivity build system" PKG_TOOLCHAIN="manual" @@ -16,9 +16,9 @@ make_host() { } makeinstall_host() { - exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN --skip-build + exec_thread_safe python3 setup.py install --prefix=${TOOLCHAIN} --skip-build # Avoid using full path to python3 that may exceed 128 byte limit. # Instead use PATH as we know our toolchain is first. - sed -e '1 s/^#!.*$/#!\/usr\/bin\/env python3/' -i $TOOLCHAIN/bin/meson + sed -e '1 s/^#!.*$/#!\/usr\/bin\/env python3/' -i ${TOOLCHAIN}/bin/meson } diff --git a/packages/python/devel/ninja/package.mk b/packages/python/devel/ninja/package.mk index d90993a28a..15dfd11e8a 100644 --- a/packages/python/devel/ninja/package.mk +++ b/packages/python/devel/ninja/package.mk @@ -7,12 +7,12 @@ PKG_VERSION="1.10.2" PKG_SHA256="ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed" PKG_LICENSE="Apache" PKG_SITE="https://ninja-build.org/" -PKG_URL="https://github.com/ninja-build/ninja/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/ninja-build/ninja/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="Python3:host" PKG_LONGDESC="Small build system with a focus on speed" PKG_TOOLCHAIN="cmake-make" makeinstall_host() { - mkdir -p $TOOLCHAIN/bin - cp ninja $TOOLCHAIN/bin + mkdir -p ${TOOLCHAIN}/bin + cp ninja ${TOOLCHAIN}/bin } diff --git a/packages/python/devel/pathlib/package.mk b/packages/python/devel/pathlib/package.mk index 6680fb89c6..6126e25be8 100644 --- a/packages/python/devel/pathlib/package.mk +++ b/packages/python/devel/pathlib/package.mk @@ -6,11 +6,11 @@ PKG_VERSION="1.0.1" PKG_SHA256="6940718dfc3eff4258203ad5021090933e5c04707d5ca8cc9e73c94a7894ea9f" PKG_LICENSE="MIT" PKG_SITE="http://pathlib.readthedocs.org" -PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="Python3:host" PKG_LONGDESC="This module offers a set of classes featuring all the common operations on paths in an easy, object-oriented way" PKG_TOOLCHAIN="manual" makeinstall_host() { - exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN + exec_thread_safe python3 setup.py install --prefix=${TOOLCHAIN} } diff --git a/packages/python/devel/pygobject/package.mk b/packages/python/devel/pygobject/package.mk index 62e919d673..14a258bf6d 100644 --- a/packages/python/devel/pygobject/package.mk +++ b/packages/python/devel/pygobject/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.28.7" PKG_SHA256="bb9d25a3442ca7511385a7c01b057492095c263784ef31231ffe589d83a96a5a" PKG_LICENSE="LGPL" PKG_SITE="http://www.pygtk.org/" -PKG_URL="http://ftp.gnome.org/pub/GNOME/sources/pygobject/$(get_pkg_version_maj_min)/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftp.gnome.org/pub/GNOME/sources/pygobject/$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain Python3 glib libffi" PKG_LONGDESC="A convenient wrapper for the GObject+ library for use in Python programs." PKG_TOOLCHAIN="autotools" @@ -15,12 +15,12 @@ PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--enable-thread --disable-introspection" pre_configure_target() { - export PYTHON_INCLUDES="$($SYSROOT_PREFIX/usr/bin/python3-config --includes)" + export PYTHON_INCLUDES="$(${SYSROOT_PREFIX}/usr/bin/python3-config --includes)" } post_makeinstall_target() { python_remove_source - rm -rf $INSTALL/usr/bin - rm -rf $INSTALL/usr/share/pygobject + rm -rf ${INSTALL}/usr/bin + rm -rf ${INSTALL}/usr/share/pygobject } diff --git a/packages/python/devel/setuptools/package.mk b/packages/python/devel/setuptools/package.mk index 676342cc83..716edb3341 100644 --- a/packages/python/devel/setuptools/package.mk +++ b/packages/python/devel/setuptools/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="51.1.2" PKG_SHA256="1f3db173c1d8f8753dce0b6c18017955863fc39a0613e5c20bfdd107f331fafb" PKG_LICENSE="OSS" PKG_SITE="https://pypi.org/project/setuptools" -PKG_URL="https://github.com/pypa/setuptools/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/pypa/setuptools/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="Python3:host" PKG_LONGDESC="Replaces Setuptools as the standard method for working with Python module distributions." PKG_TOOLCHAIN="manual" @@ -17,5 +17,5 @@ make_host() { } makeinstall_host() { - exec_thread_safe python3 setup.py install --prefix=$TOOLCHAIN + exec_thread_safe python3 setup.py install --prefix=${TOOLCHAIN} } diff --git a/packages/python/devel/waf/package.mk b/packages/python/devel/waf/package.mk index 44f14079a1..5c1d056b48 100644 --- a/packages/python/devel/waf/package.mk +++ b/packages/python/devel/waf/package.mk @@ -6,16 +6,16 @@ PKG_VERSION="2.0.21" PKG_SHA256="7cebf2c5efe53cbb9a4b5bdc4b49ae90ecd64a8fce7a3222d58e591b58215306" PKG_LICENSE="MIT" PKG_SITE="https://waf.io" -PKG_URL="https://waf.io/$PKG_NAME-$PKG_VERSION" +PKG_URL="https://waf.io/${PKG_NAME}-${PKG_VERSION}" PKG_LONGDESC="The Waf build system" PKG_TOOLCHAIN="manual" unpack() { - mkdir -p $PKG_BUILD - cp $SOURCES/$PKG_NAME/$PKG_SOURCE_NAME $PKG_BUILD/waf - chmod a+x $PKG_BUILD/waf + mkdir -p ${PKG_BUILD} + cp ${SOURCES}/${PKG_NAME}/${PKG_SOURCE_NAME} ${PKG_BUILD}/waf + chmod a+x ${PKG_BUILD}/waf } makeinstall_host() { - cp -pf waf $TOOLCHAIN/bin/ + cp -pf waf ${TOOLCHAIN}/bin/ } diff --git a/packages/python/graphics/Pillow/package.mk b/packages/python/graphics/Pillow/package.mk index 30709bf0e4..72f9f4dcd3 100644 --- a/packages/python/graphics/Pillow/package.mk +++ b/packages/python/graphics/Pillow/package.mk @@ -13,8 +13,8 @@ PKG_LONGDESC="The Python Imaging Library adds image processing capabilities to y PKG_TOOLCHAIN="manual" pre_make_target() { - export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" - export LDSHARED="$CC -shared" + export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr" + export LDSHARED="${CC} -shared" } make_target() { @@ -22,11 +22,11 @@ make_target() { } makeinstall_target() { - python3 setup.py install --root=$INSTALL --prefix=/usr + python3 setup.py install --root=${INSTALL} --prefix=/usr } post_makeinstall_target() { python_remove_source - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/python/security/pycryptodome/package.mk b/packages/python/security/pycryptodome/package.mk index db1d023e11..323287a025 100644 --- a/packages/python/security/pycryptodome/package.mk +++ b/packages/python/security/pycryptodome/package.mk @@ -12,11 +12,11 @@ PKG_LONGDESC="PyCryptodome is a self-contained Python package of low-level crypt PKG_TOOLCHAIN="manual" pre_configure_target() { - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} - export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" - export LDSHARED="$CC -shared" + export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr" + export LDSHARED="${CC} -shared" } make_target() { @@ -24,14 +24,14 @@ make_target() { } makeinstall_target() { - python3 setup.py install --root=$INSTALL --prefix=/usr + python3 setup.py install --root=${INSTALL} --prefix=/usr # Remove SelfTest bloat - find $INSTALL -type d -name SelfTest -exec rm -fr "{}" \; 2>/dev/null || true - find $INSTALL -name SOURCES.txt -exec sed -i "/\/SelfTest\//d;" "{}" \; + find ${INSTALL} -type d -name SelfTest -exec rm -fr "{}" \; 2>/dev/null || true + find ${INSTALL} -name SOURCES.txt -exec sed -i "/\/SelfTest\//d;" "{}" \; # Create Cryptodome as an alternative namespace to Crypto (Kodi addons may use either) - ln -sf /usr/lib/$PKG_PYTHON_VERSION/site-packages/Crypto $INSTALL/usr/lib/$PKG_PYTHON_VERSION/site-packages/Cryptodome + ln -sf /usr/lib/${PKG_PYTHON_VERSION}/site-packages/Crypto ${INSTALL}/usr/lib/${PKG_PYTHON_VERSION}/site-packages/Cryptodome } post_makeinstall_target() { diff --git a/packages/python/system/dbus-python/package.mk b/packages/python/system/dbus-python/package.mk index 14ae755047..d352edb254 100644 --- a/packages/python/system/dbus-python/package.mk +++ b/packages/python/system/dbus-python/package.mk @@ -7,15 +7,15 @@ PKG_VERSION="1.2.16" PKG_SHA256="11238f1d86c995d8aed2e22f04a1e3779f0d70e587caffeab4857f3c662ed5a4" PKG_LICENSE="GPL" PKG_SITE="https://freedesktop.org/wiki/Software/dbus" -PKG_URL="https://dbus.freedesktop.org/releases/dbus-python/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://dbus.freedesktop.org/releases/dbus-python/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 dbus dbus-glib" PKG_LONGDESC="D-BUS is a message bus, used for sending messages between applications." PKG_BUILD_FLAGS="+lto" pre_configure_target() { - export PYTHON_CONFIG="$SYSROOT_PREFIX/usr/bin/python3-config" - export PYTHON_INCLUDES="$($SYSROOT_PREFIX/usr/bin/python3-config --includes)" - export PYTHON_LIBS="$($SYSROOT_PREFIX/usr/bin/python3-config --ldflags --embed)" + export PYTHON_CONFIG="${SYSROOT_PREFIX}/usr/bin/python3-config" + export PYTHON_INCLUDES="$(${SYSROOT_PREFIX}/usr/bin/python3-config --includes)" + export PYTHON_LIBS="$(${SYSROOT_PREFIX}/usr/bin/python3-config --ldflags --embed)" } post_makeinstall_target() { diff --git a/packages/python/system/dbussy/package.mk b/packages/python/system/dbussy/package.mk index a43f02cfd6..b113423520 100644 --- a/packages/python/system/dbussy/package.mk +++ b/packages/python/system/dbussy/package.mk @@ -16,7 +16,7 @@ make_target() { } makeinstall_target() { - python3 setup.py install --root=$INSTALL --prefix=/usr + python3 setup.py install --root=${INSTALL} --prefix=/usr } post_makeinstall_target() { diff --git a/packages/python/system/simplejson/package.mk b/packages/python/system/simplejson/package.mk index ef838f2ccc..8e6ba88abd 100644 --- a/packages/python/system/simplejson/package.mk +++ b/packages/python/system/simplejson/package.mk @@ -7,13 +7,13 @@ PKG_VERSION="3.17.2" PKG_SHA256="75ecc79f26d99222a084fbdd1ce5aad3ac3a8bd535cd9059528452da38b68841" PKG_LICENSE="OSS" PKG_SITE="http://pypi.org/project/simplejson" -PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain Python3 distutilscross:host" PKG_LONGDESC="A simple, fast, complete, correct and extensible JSON encoder and decoder for Python 2.5+." PKG_TOOLCHAIN="manual" pre_make_target() { - export PYTHONXCPREFIX="$SYSROOT_PREFIX/usr" + export PYTHONXCPREFIX="${SYSROOT_PREFIX}/usr" } make_target() { @@ -21,11 +21,11 @@ make_target() { } makeinstall_target() { - python3 setup.py install --root=$INSTALL --prefix=/usr + python3 setup.py install --root=${INSTALL} --prefix=/usr } post_makeinstall_target() { python_remove_source - rm -rf $INSTALL/usr/lib/python*/site-packages/*/tests + rm -rf ${INSTALL}/usr/lib/python*/site-packages/*/tests } From ea622a836a0e5ea116693c3560567b25e250352a Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:14 +0000 Subject: [PATCH 20/27] security: automated code cleanup Signed-off-by: Ian Leonard --- packages/security/gnutls/package.mk | 2 +- packages/security/libgcrypt/package.mk | 12 ++--- packages/security/libgpg-error/package.mk | 14 ++--- packages/security/nettle/package.mk | 4 +- packages/security/nspr/package.mk | 12 ++--- packages/security/nss/package.mk | 64 +++++++++++------------ packages/security/openssl/package.mk | 60 ++++++++++----------- 7 files changed, 84 insertions(+), 84 deletions(-) diff --git a/packages/security/gnutls/package.mk b/packages/security/gnutls/package.mk index 7da861e623..03dedb3a52 100644 --- a/packages/security/gnutls/package.mk +++ b/packages/security/gnutls/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="3.7.0" PKG_SHA256="49e2a22691d252c9f24a9829b293a8f359095bc5a818351f05f1c0a5188a1df8" PKG_LICENSE="LGPL2.1" PKG_SITE="https://gnutls.org" -PKG_URL="https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKG_VERSION:0:3}/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKG_VERSION:0:3}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libidn2 nettle zlib" PKG_LONGDESC="A library which provides a secure layer over a reliable transport layer." diff --git a/packages/security/libgcrypt/package.mk b/packages/security/libgcrypt/package.mk index 5747925354..8c5d43182f 100644 --- a/packages/security/libgcrypt/package.mk +++ b/packages/security/libgcrypt/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.8.7" PKG_SHA256="03b70f028299561b7034b8966d7dd77ef16ed139c43440925fe8782561974748" PKG_LICENSE="GPLv2" PKG_SITE="https://www.gnupg.org/" -PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgcrypt/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgcrypt/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libgpg-error" PKG_LONGDESC="A General purpose cryptographic library." PKG_TOOLCHAIN="autotools" @@ -15,17 +15,17 @@ PKG_TOOLCHAIN="autotools" # see for example https://bugs.gentoo.org/show_bug.cgi?id=581114 pre_configure_target() { - PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=$HOST_CC \ + PKG_CONFIGURE_OPTS_TARGET="CC_FOR_BUILD=${HOST_CC} \ ac_cv_sys_symbol_underscore=no \ --enable-asm \ --with-gnu-ld \ - --with-libgpg-error-prefix=$SYSROOT_PREFIX/usr \ + --with-libgpg-error-prefix=${SYSROOT_PREFIX}/usr \ --disable-doc" } post_makeinstall_target() { - sed -e "s:\(['= ]\)\"/usr:\\1\"$SYSROOT_PREFIX/usr:g" -i src/$PKG_NAME-config - cp src/$PKG_NAME-config $SYSROOT_PREFIX/usr/bin + sed -e "s:\(['= ]\)\"/usr:\\1\"${SYSROOT_PREFIX}/usr:g" -i src/${PKG_NAME}-config + cp src/${PKG_NAME}-config ${SYSROOT_PREFIX}/usr/bin - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/security/libgpg-error/package.mk b/packages/security/libgpg-error/package.mk index 3187ee8499..167412999d 100644 --- a/packages/security/libgpg-error/package.mk +++ b/packages/security/libgpg-error/package.mk @@ -7,12 +7,12 @@ PKG_VERSION="1.41" PKG_SHA256="64b078b45ac3c3003d7e352a5e05318880a5778c42331ce1ef33d1a0d9922742" PKG_LICENSE="GPLv2" PKG_SITE="https://www.gnupg.org" -PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgpg-error/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgpg-error/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A library that defines common error values for all GnuPG components." 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" + 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 case ${TARGET_ARCH} in @@ -30,13 +30,13 @@ pre_configure_target() { ;; esac - cp $PKG_BUILD/src/syscfg/lock-obj-pub.$GPGERROR_TUPLE.h $PKG_BUILD/src/syscfg/lock-obj-pub.$GPGERROR_TARGET.h + cp ${PKG_BUILD}/src/syscfg/lock-obj-pub.${GPGERROR_TUPLE}.h ${PKG_BUILD}/src/syscfg/lock-obj-pub.${GPGERROR_TARGET}.h } post_makeinstall_target() { - rm -rf $INSTALL/usr/bin - rm -rf $INSTALL/usr/share + rm -rf ${INSTALL}/usr/bin + rm -rf ${INSTALL}/usr/share - sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i src/gpg-error-config - cp src/gpg-error-config $SYSROOT_PREFIX/usr/bin + sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i src/gpg-error-config + cp src/gpg-error-config ${SYSROOT_PREFIX}/usr/bin } diff --git a/packages/security/nettle/package.mk b/packages/security/nettle/package.mk index 74433eff72..12bac17fb6 100644 --- a/packages/security/nettle/package.mk +++ b/packages/security/nettle/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="3.7" PKG_SHA256="f001f64eb444bf13dd91bceccbc20acbc60c4311d6e2b20878452eb9a9cec75a" PKG_LICENSE="GPL2" PKG_SITE="http://www.lysator.liu.se/~nisse/nettle" -PKG_URL="http://ftpmirror.gnu.org/gnu/nettle/nettle-$PKG_VERSION.tar.gz" +PKG_URL="http://ftpmirror.gnu.org/gnu/nettle/nettle-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain gmp" PKG_LONGDESC="A low-level cryptographic library." @@ -19,5 +19,5 @@ if target_has_feature neon; then fi post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/security/nspr/package.mk b/packages/security/nspr/package.mk index 024d7402d8..6e964f0e72 100644 --- a/packages/security/nspr/package.mk +++ b/packages/security/nspr/package.mk @@ -13,17 +13,17 @@ PKG_LONGDESC="Netscape Portable Runtime (NSPR) provides a platform-neutral API f PKG_TOOLCHAIN="configure" PKG_BUILD_FLAGS="-parallel" -if [ "$TARGET_ARCH" = "x86_64" ] ; then +if [ "${TARGET_ARCH}" = "x86_64" ]; then TARGET_USE_64="--enable-64bit" fi -PKG_CONFIGURE_OPTS_TARGET="--with-pthreads $TARGET_USE_64" -PKG_MAKE_OPTS_TARGET="NSINSTALL=$TOOLCHAIN/bin/nsinstall" -PKG_MAKEINSTALL_OPTS_TARGET="NSINSTALL=$TOOLCHAIN/bin/nsinstall" +PKG_CONFIGURE_OPTS_TARGET="--with-pthreads ${TARGET_USE_64}" +PKG_MAKE_OPTS_TARGET="NSINSTALL=${TOOLCHAIN}/bin/nsinstall" +PKG_MAKEINSTALL_OPTS_TARGET="NSINSTALL=${TOOLCHAIN}/bin/nsinstall" configure_host() { cd $(get_build_dir nss)/nspr - ./configure --with-pthreads --enable-64bit --with-pthreads --prefix=$TOOLCHAIN + ./configure --with-pthreads --enable-64bit --with-pthreads --prefix=${TOOLCHAIN} } pre_make_host() { @@ -33,7 +33,7 @@ pre_make_host() { configure_target() { cd $(get_build_dir nss)/nspr - ./configure --with-pthreads $TARGET_USE_64 $TARGET_CONFIGURE_OPTS + ./configure --with-pthreads ${TARGET_USE_64} ${TARGET_CONFIGURE_OPTS} } pre_make_target() { diff --git a/packages/security/nss/package.mk b/packages/security/nss/package.mk index 1856259b7b..9a8a2b30d6 100644 --- a/packages/security/nss/package.mk +++ b/packages/security/nss/package.mk @@ -15,64 +15,64 @@ PKG_TOOLCHAIN="manual" PKG_BUILD_FLAGS="-parallel" make_host() { - cd $PKG_BUILD/nss + cd ${PKG_BUILD}/nss make clean || true - rm -rf $PKG_BUILD/dist + rm -rf ${PKG_BUILD}/dist - INCLUDES="-I$TOOLCHAIN/include" \ + 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" \ + 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" \ + CC=${CC} LDFLAGS="${LDFLAGS} -L${TOOLCHAIN}/lib" \ V=1 } makeinstall_host() { - cd $PKG_BUILD - $STRIP dist/Linux*/lib/*.so - cp -L dist/Linux*/lib/*.so $TOOLCHAIN/lib - mkdir -p $TOOLCHAIN/include/nss - cp -RL dist/{public,private}/nss/* $TOOLCHAIN/include/nss - cp -L dist/Linux*/lib/pkgconfig/nss.pc $TOOLCHAIN/lib/pkgconfig - cp -L nss/coreconf/nsinstall/*/nsinstall $TOOLCHAIN/bin + cd ${PKG_BUILD} + ${STRIP} dist/Linux*/lib/*.so + cp -L dist/Linux*/lib/*.so ${TOOLCHAIN}/lib + mkdir -p ${TOOLCHAIN}/include/nss + cp -RL dist/{public,private}/nss/* ${TOOLCHAIN}/include/nss + cp -L dist/Linux*/lib/pkgconfig/nss.pc ${TOOLCHAIN}/lib/pkgconfig + cp -L nss/coreconf/nsinstall/*/nsinstall ${TOOLCHAIN}/bin } make_target() { - cd $PKG_BUILD/nss + cd ${PKG_BUILD}/nss local TARGET_USE_64="" - [ "$TARGET_ARCH" = "x86_64" -o "$TARGET_ARCH" = "aarch64" ] && TARGET_USE_64="USE_64=1" + [ "${TARGET_ARCH}" = "x86_64" -o "${TARGET_ARCH}" = "aarch64" ] && TARGET_USE_64="USE_64=1" make clean || true - rm -rf $PKG_BUILD/dist + rm -rf ${PKG_BUILD}/dist - make BUILD_OPT=1 $TARGET_USE_64 \ + make BUILD_OPT=1 ${TARGET_USE_64} \ NSS_USE_SYSTEM_SQLITE=1 \ - NSPR_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include/nspr \ + 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 \ + 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" \ + NSINSTALL=${TOOLCHAIN}/bin/nsinstall \ + CPU_ARCH_TAG=${TARGET_ARCH} \ + CC=${CC} \ + LDFLAGS="${LDFLAGS} -L${SYSROOT_PREFIX}/usr/lib" \ V=1 } makeinstall_target() { - cd $PKG_BUILD - $STRIP dist/Linux*/lib/*.so - cp -L dist/Linux*/lib/*.so $SYSROOT_PREFIX/usr/lib - mkdir -p $SYSROOT_PREFIX/usr/include/nss - cp -RL dist/{public,private}/nss/* $SYSROOT_PREFIX/usr/include/nss - cp -L dist/Linux*/lib/pkgconfig/nss.pc $SYSROOT_PREFIX/usr/lib/pkgconfig + cd ${PKG_BUILD} + ${STRIP} dist/Linux*/lib/*.so + cp -L dist/Linux*/lib/*.so ${SYSROOT_PREFIX}/usr/lib + mkdir -p ${SYSROOT_PREFIX}/usr/include/nss + cp -RL dist/{public,private}/nss/* ${SYSROOT_PREFIX}/usr/include/nss + cp -L dist/Linux*/lib/pkgconfig/nss.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig - mkdir -p $PKG_INSTALL/usr/lib - cp -PL dist/Linux*/lib/*.so $PKG_INSTALL/usr/lib + mkdir -p ${PKG_INSTALL}/usr/lib + cp -PL dist/Linux*/lib/*.so ${PKG_INSTALL}/usr/lib } diff --git a/packages/security/openssl/package.mk b/packages/security/openssl/package.mk index 1f6bb5ec95..e0b70b395a 100644 --- a/packages/security/openssl/package.mk +++ b/packages/security/openssl/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.1i" PKG_SHA256="e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242" PKG_LICENSE="BSD" PKG_SITE="https://www.openssl.org" -PKG_URL="https://www.openssl.org/source/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://www.openssl.org/source/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="ccache:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The Open Source toolkit for Secure Sockets Layer and Transport Layer Security" @@ -30,23 +30,23 @@ PKG_CONFIGURE_OPTS_SHARED="--libdir=lib \ no-zlib-dynamic \ no-static-engine" -PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN \ - --openssldir=$TOOLCHAIN/etc/ssl" +PKG_CONFIGURE_OPTS_HOST="--prefix=${TOOLCHAIN} \ + --openssldir=${TOOLCHAIN}/etc/ssl" PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \ --openssldir=/etc/ssl" post_unpack() { - find $PKG_BUILD/apps -type f | xargs -n 1 -t sed 's|./demoCA|/etc/ssl|' -i + find ${PKG_BUILD}/apps -type f | xargs -n 1 -t sed 's|./demoCA|/etc/ssl|' -i } pre_configure_host() { - mkdir -p $PKG_BUILD/.$HOST_NAME - cp -a $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME/ + mkdir -p ${PKG_BUILD}/.${HOST_NAME} + cp -a ${PKG_BUILD}/* ${PKG_BUILD}/.${HOST_NAME}/ } configure_host() { - cd $PKG_BUILD/.$HOST_NAME - ./Configure $PKG_CONFIGURE_OPTS_HOST $PKG_CONFIGURE_OPTS_SHARED linux-${MACHINE_HARDWARE_NAME} $CFLAGS $LDFLAGS + cd ${PKG_BUILD}/.${HOST_NAME} + ./Configure ${PKG_CONFIGURE_OPTS_HOST} ${PKG_CONFIGURE_OPTS_SHARED} linux-${MACHINE_HARDWARE_NAME} ${CFLAGS} ${LDFLAGS} } makeinstall_host() { @@ -54,10 +54,10 @@ makeinstall_host() { } pre_configure_target() { - mkdir -p $PKG_BUILD/.$TARGET_NAME - cp -a $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME/ + mkdir -p ${PKG_BUILD}/.${TARGET_NAME} + cp -a ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME}/ - case $TARGET_ARCH in + case ${TARGET_ARCH} in x86_64) OPENSSL_TARGET=linux-x86_64 PLATFORM_FLAGS=enable-ec_nistp_64_gcc_128 @@ -72,38 +72,38 @@ pre_configure_target() { } configure_target() { - cd $PKG_BUILD/.$TARGET_NAME - ./Configure $PKG_CONFIGURE_OPTS_TARGET $PKG_CONFIGURE_OPTS_SHARED $PLATFORM_FLAGS $OPENSSL_TARGET $CFLAGS $LDFLAGS + cd ${PKG_BUILD}/.${TARGET_NAME} + ./Configure ${PKG_CONFIGURE_OPTS_TARGET} ${PKG_CONFIGURE_OPTS_SHARED} ${PLATFORM_FLAGS} ${OPENSSL_TARGET} ${CFLAGS} ${LDFLAGS} } makeinstall_target() { - make DESTDIR=$INSTALL install_sw - make DESTDIR=$SYSROOT_PREFIX install_sw + make DESTDIR=${INSTALL} install_sw + make DESTDIR=${SYSROOT_PREFIX} install_sw } post_makeinstall_target() { - rm -rf $INSTALL/etc/ssl/misc - rm -rf $INSTALL/usr/bin/c_rehash + rm -rf ${INSTALL}/etc/ssl/misc + rm -rf ${INSTALL}/usr/bin/c_rehash - debug_strip $INSTALL/usr/bin/openssl + debug_strip ${INSTALL}/usr/bin/openssl # cert from https://curl.haxx.se/docs/caextract.html - mkdir -p $INSTALL/etc/ssl - cp $PKG_DIR/cert/cacert.pem $INSTALL/etc/ssl/cacert.pem.system + mkdir -p ${INSTALL}/etc/ssl + cp ${PKG_DIR}/cert/cacert.pem ${INSTALL}/etc/ssl/cacert.pem.system # give user the chance to include their own CA - mkdir -p $INSTALL/usr/bin - cp $PKG_DIR/scripts/openssl-config $INSTALL/usr/bin - ln -sf /run/libreelec/cacert.pem $INSTALL/etc/ssl/cacert.pem - ln -sf /run/libreelec/cacert.pem $INSTALL/etc/ssl/cert.pem + mkdir -p ${INSTALL}/usr/bin + cp ${PKG_DIR}/scripts/openssl-config ${INSTALL}/usr/bin + ln -sf /run/libreelec/cacert.pem ${INSTALL}/etc/ssl/cacert.pem + ln -sf /run/libreelec/cacert.pem ${INSTALL}/etc/ssl/cert.pem # backwards comatibility - mkdir -p $INSTALL/etc/pki/tls - ln -sf /run/libreelec/cacert.pem $INSTALL/etc/pki/tls/cacert.pem - mkdir -p $INSTALL/etc/pki/tls/certs - ln -sf /run/libreelec/cacert.pem $INSTALL/etc/pki/tls/certs/ca-bundle.crt - mkdir -p $INSTALL/usr/lib/ssl - ln -sf /run/libreelec/cacert.pem $INSTALL/usr/lib/ssl/cert.pem + mkdir -p ${INSTALL}/etc/pki/tls + ln -sf /run/libreelec/cacert.pem ${INSTALL}/etc/pki/tls/cacert.pem + mkdir -p ${INSTALL}/etc/pki/tls/certs + ln -sf /run/libreelec/cacert.pem ${INSTALL}/etc/pki/tls/certs/ca-bundle.crt + mkdir -p ${INSTALL}/usr/lib/ssl + ln -sf /run/libreelec/cacert.pem ${INSTALL}/usr/lib/ssl/cert.pem } post_install() { From b31ce3017042524676574c43651e3a093ec94d78 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:16 +0000 Subject: [PATCH 21/27] sysutils: automated code cleanup Signed-off-by: Ian Leonard --- packages/sysutils/bkeymaps/package.mk | 6 +- packages/sysutils/busybox/package.mk | 192 +++++++++--------- packages/sysutils/dbus/package.mk | 12 +- packages/sysutils/diskdev_cmds/package.mk | 14 +- packages/sysutils/dosfstools/package.mk | 22 +- packages/sysutils/e2fsprogs/package.mk | 66 +++--- packages/sysutils/entropy/package.mk | 8 +- packages/sysutils/ethmactool/package.mk | 4 +- packages/sysutils/eventlircd/package.mk | 12 +- packages/sysutils/evrepeat/package.mk | 2 +- packages/sysutils/fuse/package.mk | 6 +- packages/sysutils/gptfdisk/package.mk | 8 +- packages/sysutils/ir-bpf-decoders/package.mk | 6 +- packages/sysutils/keyutils/package.mk | 10 +- packages/sysutils/kmod/package.mk | 24 +-- packages/sysutils/libevdev/package.mk | 4 +- packages/sysutils/libhid/package.mk | 4 +- packages/sysutils/libusb-compat/package.mk | 4 +- packages/sysutils/lirc/package.mk | 28 +-- .../sysutils/ntfs-3g_ntfsprogs/package.mk | 22 +- packages/sysutils/open-iscsi/package.mk | 12 +- packages/sysutils/open-vm-tools/package.mk | 18 +- packages/sysutils/parted/package.mk | 12 +- packages/sysutils/pciutils/package.mk | 24 +-- packages/sysutils/sed/package.mk | 2 +- packages/sysutils/systemd/package.mk | 188 ++++++++--------- packages/sysutils/terminus-font/package.mk | 2 +- packages/sysutils/tz/package.mk | 14 +- packages/sysutils/udevil/package.mk | 10 +- packages/sysutils/usbutils/package.mk | 6 +- packages/sysutils/util-linux/package.mk | 34 ++-- packages/sysutils/v4l-utils/package.mk | 68 +++---- 32 files changed, 422 insertions(+), 422 deletions(-) diff --git a/packages/sysutils/bkeymaps/package.mk b/packages/sysutils/bkeymaps/package.mk index 1f67dd24dc..1ba5ceb97c 100644 --- a/packages/sysutils/bkeymaps/package.mk +++ b/packages/sysutils/bkeymaps/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.13" PKG_SHA256="59d41ddb0c7a92d8ac155a82ed2875b7880c8957ea4308afa633c8b81e5b8887" PKG_LICENSE="GPL" PKG_SITE="http://www.alpinelinux.org" -PKG_URL="http://dev.alpinelinux.org/archive/bkeymaps/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://dev.alpinelinux.org/archive/bkeymaps/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain busybox" PKG_LONGDESC="bkeymaps: binary keyboard maps for busybox" @@ -15,6 +15,6 @@ make_target() { } makeinstall_target() { - mkdir -p $INSTALL/usr/lib/keymaps - cp -PR bkeymaps/* $INSTALL/usr/lib/keymaps + mkdir -p ${INSTALL}/usr/lib/keymaps + cp -PR bkeymaps/* ${INSTALL}/usr/lib/keymaps } diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 6f1eaec34d..bdec2db98a 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -16,164 +16,164 @@ PKG_LONGDESC="BusyBox combines tiny versions of many common UNIX utilities into PKG_BUILD_FLAGS="-parallel -gold" # nano text editor -if [ "$NANO_EDITOR" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET nano" +if [ "${NANO_EDITOR}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" nano" fi # nfs support -if [ "$NFS_SUPPORT" = yes ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET rpcbind" +if [ "${NFS_SUPPORT}" = yes ]; then + PKG_DEPENDS_TARGET+=" rpcbind" fi -if [ "$TARGET_ARCH" = "x86_64" ]; then +if [ "${TARGET_ARCH}" = "x86_64" ]; then PKG_DEPENDS_TARGET+=" pciutils" fi pre_build_target() { - PKG_MAKE_OPTS_TARGET="ARCH=$TARGET_ARCH \ - HOSTCC=$HOST_CC \ - CROSS_COMPILE=$TARGET_PREFIX \ + PKG_MAKE_OPTS_TARGET="ARCH=${TARGET_ARCH} \ + HOSTCC=${HOST_CC} \ + CROSS_COMPILE=${TARGET_PREFIX} \ KBUILD_VERBOSE=1 \ install" - mkdir -p $PKG_BUILD/.$TARGET_NAME - cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME + mkdir -p ${PKG_BUILD}/.${TARGET_NAME} + cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME} } pre_build_host() { - PKG_MAKE_OPTS_HOST="ARCH=$TARGET_ARCH CROSS_COMPILE= KBUILD_VERBOSE=1 install" + PKG_MAKE_OPTS_HOST="ARCH=${TARGET_ARCH} CROSS_COMPILE= KBUILD_VERBOSE=1 install" - mkdir -p $PKG_BUILD/.$HOST_NAME - cp -RP $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME + mkdir -p ${PKG_BUILD}/.${HOST_NAME} + cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${HOST_NAME} } pre_build_init() { - PKG_MAKE_OPTS_INIT="ARCH=$TARGET_ARCH \ - HOSTCC=$HOST_CC \ - CROSS_COMPILE=$TARGET_PREFIX \ + PKG_MAKE_OPTS_INIT="ARCH=${TARGET_ARCH} \ + HOSTCC=${HOST_CC} \ + CROSS_COMPILE=${TARGET_PREFIX} \ KBUILD_VERBOSE=1 \ install" - mkdir -p $PKG_BUILD/.$TARGET_NAME-init - cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME-init + mkdir -p ${PKG_BUILD}/.${TARGET_NAME}-init + cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME}-init } configure_host() { - cd $PKG_BUILD/.$HOST_NAME - cp $PKG_DIR/config/busybox-host.conf .config + cd ${PKG_BUILD}/.${HOST_NAME} + cp ${PKG_DIR}/config/busybox-host.conf .config # set install dir - sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$PKG_BUILD/.install_host\"|" .config + sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"${PKG_BUILD}/.install_host\"|" .config make oldconfig } configure_target() { - cd $PKG_BUILD/.$TARGET_NAME + cd ${PKG_BUILD}/.${TARGET_NAME} find_file_path config/busybox-target.conf - cp $FOUND_PATH .config + cp ${FOUND_PATH} .config # set install dir - sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$INSTALL/usr\"|" .config + sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"${INSTALL}/usr\"|" .config - if [ ! "$CRON_SUPPORT" = "yes" ] ; then + if [ ! "${CRON_SUPPORT}" = "yes" ]; then sed -i -e "s|^CONFIG_CROND=.*$|# CONFIG_CROND is not set|" .config sed -i -e "s|^CONFIG_FEATURE_CROND_D=.*$|# CONFIG_FEATURE_CROND_D is not set|" .config sed -i -e "s|^CONFIG_CRONTAB=.*$|# CONFIG_CRONTAB is not set|" .config sed -i -e "s|^CONFIG_FEATURE_CROND_SPECIAL_TIMES=.*$|# CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set|" .config fi - if [ ! "$SAMBA_SUPPORT" = yes ]; then + if [ ! "${SAMBA_SUPPORT}" = yes ]; then sed -i -e "s|^CONFIG_FEATURE_MOUNT_CIFS=.*$|# CONFIG_FEATURE_MOUNT_CIFS is not set|" .config fi # optimize for size - CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"` - CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-Os|"` - CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/tirpc" + CFLAGS=$(echo ${CFLAGS} | sed -e "s|-Ofast|-Os|") + CFLAGS=$(echo ${CFLAGS} | sed -e "s|-O.|-Os|") + CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/tirpc" - LDFLAGS="$LDFLAGS -fwhole-program" + LDFLAGS+=" -fwhole-program" make oldconfig } configure_init() { - cd $PKG_BUILD/.$TARGET_NAME-init + cd ${PKG_BUILD}/.${TARGET_NAME}-init find_file_path config/busybox-init.conf - cp $FOUND_PATH .config + cp ${FOUND_PATH} .config # set install dir - sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"$INSTALL/usr\"|" .config + sed -i -e "s|^CONFIG_PREFIX=.*$|CONFIG_PREFIX=\"${INSTALL}/usr\"|" .config # optimize for size - CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"` - CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-Os|"` - CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/tirpc" + CFLAGS=$(echo ${CFLAGS} | sed -e "s|-Ofast|-Os|") + CFLAGS=$(echo ${CFLAGS} | sed -e "s|-O.|-Os|") + CFLAGS+=" -I${SYSROOT_PREFIX}/usr/include/tirpc" - LDFLAGS="$LDFLAGS -fwhole-program" + LDFLAGS+=" -fwhole-program" make oldconfig } makeinstall_host() { - mkdir -p $TOOLCHAIN/bin - cp -R $PKG_BUILD/.install_host/bin/* $TOOLCHAIN/bin + mkdir -p ${TOOLCHAIN}/bin + cp -R ${PKG_BUILD}/.install_host/bin/* ${TOOLCHAIN}/bin } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - [ $TARGET_ARCH = x86_64 ] && cp $PKG_DIR/scripts/getedid $INSTALL/usr/bin - cp $PKG_DIR/scripts/createlog $INSTALL/usr/bin/ - cp $PKG_DIR/scripts/dthelper $INSTALL/usr/bin - ln -sf dthelper $INSTALL/usr/bin/dtfile - ln -sf dthelper $INSTALL/usr/bin/dtflag - ln -sf dthelper $INSTALL/usr/bin/dtname - ln -sf dthelper $INSTALL/usr/bin/dtsoc - cp $PKG_DIR/scripts/ledfix $INSTALL/usr/bin - cp $PKG_DIR/scripts/lsb_release $INSTALL/usr/bin/ - 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/ - ln -sf pastebinit $INSTALL/usr/bin/paste + mkdir -p ${INSTALL}/usr/bin + [ ${TARGET_ARCH} = x86_64 ] && cp ${PKG_DIR}/scripts/getedid ${INSTALL}/usr/bin + cp ${PKG_DIR}/scripts/createlog ${INSTALL}/usr/bin/ + cp ${PKG_DIR}/scripts/dthelper ${INSTALL}/usr/bin + ln -sf dthelper ${INSTALL}/usr/bin/dtfile + ln -sf dthelper ${INSTALL}/usr/bin/dtflag + ln -sf dthelper ${INSTALL}/usr/bin/dtname + ln -sf dthelper ${INSTALL}/usr/bin/dtsoc + cp ${PKG_DIR}/scripts/ledfix ${INSTALL}/usr/bin + cp ${PKG_DIR}/scripts/lsb_release ${INSTALL}/usr/bin/ + 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/ + ln -sf pastebinit ${INSTALL}/usr/bin/paste - mkdir -p $INSTALL/usr/lib/libreelec - cp $PKG_DIR/scripts/functions $INSTALL/usr/lib/libreelec - cp $PKG_DIR/scripts/fs-resize $INSTALL/usr/lib/libreelec - sed -e "s/@DISTRONAME@/$DISTRONAME/g" \ - -i $INSTALL/usr/lib/libreelec/fs-resize + mkdir -p ${INSTALL}/usr/lib/libreelec + cp ${PKG_DIR}/scripts/functions ${INSTALL}/usr/lib/libreelec + cp ${PKG_DIR}/scripts/fs-resize ${INSTALL}/usr/lib/libreelec + sed -e "s/@DISTRONAME@/${DISTRONAME}/g" \ + -i ${INSTALL}/usr/lib/libreelec/fs-resize if listcontains "${FIRMWARE}" "rpi-eeprom"; then - cp $PKG_DIR/scripts/rpi-flash-firmware $INSTALL/usr/lib/libreelec + cp ${PKG_DIR}/scripts/rpi-flash-firmware ${INSTALL}/usr/lib/libreelec fi - mkdir -p $INSTALL/usr/lib/systemd/system-generators/ - cp $PKG_DIR/scripts/libreelec-target-generator $INSTALL/usr/lib/systemd/system-generators/ + mkdir -p ${INSTALL}/usr/lib/systemd/system-generators/ + cp ${PKG_DIR}/scripts/libreelec-target-generator ${INSTALL}/usr/lib/systemd/system-generators/ - mkdir -p $INSTALL/etc - cp $PKG_DIR/config/profile $INSTALL/etc - cp $PKG_DIR/config/inputrc $INSTALL/etc - cp $PKG_DIR/config/suspend-modules.conf $INSTALL/etc + mkdir -p ${INSTALL}/etc + cp ${PKG_DIR}/config/profile ${INSTALL}/etc + cp ${PKG_DIR}/config/inputrc ${INSTALL}/etc + cp ${PKG_DIR}/config/suspend-modules.conf ${INSTALL}/etc # /etc/fstab is needed by... - touch $INSTALL/etc/fstab + touch ${INSTALL}/etc/fstab # /etc/machine-id, needed by systemd and dbus - ln -sf /storage/.cache/systemd-machine-id $INSTALL/etc/machine-id + ln -sf /storage/.cache/systemd-machine-id ${INSTALL}/etc/machine-id # /etc/mtab is needed by udisks etc... - ln -sf /proc/self/mounts $INSTALL/etc/mtab + ln -sf /proc/self/mounts ${INSTALL}/etc/mtab # create /etc/hostname - ln -sf /proc/sys/kernel/hostname $INSTALL/etc/hostname + ln -sf /proc/sys/kernel/hostname ${INSTALL}/etc/hostname } post_install() { - ROOT_PWD="`$TOOLCHAIN/bin/cryptpw -m sha512 $ROOT_PASSWORD`" + ROOT_PWD="$(${TOOLCHAIN}/bin/cryptpw -m sha512 ${ROOT_PASSWORD})" - 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_PWD" 0 0 "Root User" "/storage" "/bin/sh" + add_user root "${ROOT_PWD}" 0 0 "Root User" "/storage" "/bin/sh" add_group root 0 add_group users 100 @@ -188,38 +188,38 @@ post_install() { listcontains "${FIRMWARE}" "rpi-eeprom" && enable_service rpi-flash-firmware.service # cron support - if [ "$CRON_SUPPORT" = "yes" ] ; then - mkdir -p $INSTALL/usr/lib/systemd/system - cp $PKG_DIR/system.d.opt/cron.service $INSTALL/usr/lib/systemd/system + if [ "${CRON_SUPPORT}" = "yes" ]; then + mkdir -p ${INSTALL}/usr/lib/systemd/system + cp ${PKG_DIR}/system.d.opt/cron.service ${INSTALL}/usr/lib/systemd/system enable_service cron.service - mkdir -p $INSTALL/usr/share/services - cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services - cp $PKG_DIR/system.d.opt/cron-defaults.service $INSTALL/usr/lib/systemd/system + mkdir -p ${INSTALL}/usr/share/services + cp -P ${PKG_DIR}/default.d/*.conf ${INSTALL}/usr/share/services + cp ${PKG_DIR}/system.d.opt/cron-defaults.service ${INSTALL}/usr/lib/systemd/system enable_service cron-defaults.service fi } makeinstall_init() { - mkdir -p $INSTALL/bin - ln -sf busybox $INSTALL/usr/bin/sh - chmod 4755 $INSTALL/usr/bin/busybox + mkdir -p ${INSTALL}/bin + ln -sf busybox ${INSTALL}/usr/bin/sh + chmod 4755 ${INSTALL}/usr/bin/busybox - mkdir -p $INSTALL/etc - touch $INSTALL/etc/fstab - ln -sf /proc/self/mounts $INSTALL/etc/mtab + mkdir -p ${INSTALL}/etc + touch ${INSTALL}/etc/fstab + ln -sf /proc/self/mounts ${INSTALL}/etc/mtab if find_file_path initramfs/platform_init; then - cp ${FOUND_PATH} $INSTALL - sed -e "s/@BOOT_LABEL@/$DISTRO_BOOTLABEL/g" \ - -e "s/@DISK_LABEL@/$DISTRO_DISKLABEL/g" \ - -i $INSTALL/platform_init - chmod 755 $INSTALL/platform_init + cp ${FOUND_PATH} ${INSTALL} + sed -e "s/@BOOT_LABEL@/${DISTRO_BOOTLABEL}/g" \ + -e "s/@DISK_LABEL@/${DISTRO_DISKLABEL}/g" \ + -i ${INSTALL}/platform_init + chmod 755 ${INSTALL}/platform_init fi - cp $PKG_DIR/scripts/functions $INSTALL - cp $PKG_DIR/scripts/init $INSTALL - sed -e "s/@DISTRONAME@/$DISTRONAME/g" \ - -e "s/@KERNEL_NAME@/$KERNEL_NAME/g" \ - -i $INSTALL/init - chmod 755 $INSTALL/init + cp ${PKG_DIR}/scripts/functions ${INSTALL} + cp ${PKG_DIR}/scripts/init ${INSTALL} + sed -e "s/@DISTRONAME@/${DISTRONAME}/g" \ + -e "s/@KERNEL_NAME@/${KERNEL_NAME}/g" \ + -i ${INSTALL}/init + chmod 755 ${INSTALL}/init } diff --git a/packages/sysutils/dbus/package.mk b/packages/sysutils/dbus/package.mk index a26f65f3bd..edffba8b4b 100644 --- a/packages/sysutils/dbus/package.mk +++ b/packages/sysutils/dbus/package.mk @@ -7,13 +7,13 @@ PKG_VERSION="1.13.18" PKG_SHA256="8078f5c25e34ab907ce06905d969dc8ef0ccbec367e1e1707c7ecf8460f4254e" PKG_LICENSE="GPL" PKG_SITE="https://dbus.freedesktop.org" -PKG_URL="https://dbus.freedesktop.org/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://dbus.freedesktop.org/releases/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain expat systemd" PKG_LONGDESC="D-Bus is a message bus, used for sending messages between applications." PKG_TOOLCHAIN="configure" PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \ - --with-sysroot=$SYSROOT_PREFIX \ + --with-sysroot=${SYSROOT_PREFIX} \ --libexecdir=/usr/lib/dbus \ --disable-verbose-mode \ --disable-asserts \ @@ -34,8 +34,8 @@ PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \ --with-system-socket=/run/dbus/system_bus_socket" post_makeinstall_target() { - rm -rf $INSTALL/etc/rc.d - rm -rf $INSTALL/usr/lib/dbus-1.0/include + rm -rf ${INSTALL}/etc/rc.d + rm -rf ${INSTALL}/usr/lib/dbus-1.0/include } post_install() { @@ -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/diskdev_cmds/package.mk b/packages/sysutils/diskdev_cmds/package.mk index d02f6cf026..b5c1f61f2e 100644 --- a/packages/sysutils/diskdev_cmds/package.mk +++ b/packages/sysutils/diskdev_cmds/package.mk @@ -7,21 +7,21 @@ PKG_VERSION="332.14" PKG_SHA256="a46bec392661a02d9683355baf4442d494e2bcde0ffb094aacc1e57ddc03b3d4" PKG_LICENSE="APSL" PKG_SITE="http://src.gnu-darwin.org/DarwinSourceArchive/expanded/diskdev_cmds/" -PKG_URL="http://www.opensource.apple.com/tarballs/diskdev_cmds/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://www.opensource.apple.com/tarballs/diskdev_cmds/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain openssl" PKG_LONGDESC="The fsck and mkfs utliities for hfs and hfsplus filesystems." pre_make_target() { - PKG_MAKE_OPTS_TARGET="-f Makefile.lnx CC=$CC" + PKG_MAKE_OPTS_TARGET="-f Makefile.lnx CC=${CC}" - export CFLAGS="$TARGET_CFLAGS -g3 -Wall -I$PKG_BUILD/include -DDEBUG_BUILD=0 -D_FILE_OFFSET_BITS=64 -D LINUX=1 -D BSD=1" + export CFLAGS="${TARGET_CFLAGS} -g3 -Wall -I${PKG_BUILD}/include -DDEBUG_BUILD=0 -D_FILE_OFFSET_BITS=64 -D LINUX=1 -D BSD=1" } makeinstall_target() { - mkdir -p $INSTALL/usr/sbin - cp fsck_hfs.tproj/fsck_hfs $INSTALL/usr/sbin - ln -sf fsck_hfs $INSTALL/usr/sbin/fsck.hfs - ln -sf fsck_hfs $INSTALL/usr/sbin/fsck.hfsplus + mkdir -p ${INSTALL}/usr/sbin + cp fsck_hfs.tproj/fsck_hfs ${INSTALL}/usr/sbin + ln -sf fsck_hfs ${INSTALL}/usr/sbin/fsck.hfs + ln -sf fsck_hfs ${INSTALL}/usr/sbin/fsck.hfsplus } make_init() { diff --git a/packages/sysutils/dosfstools/package.mk b/packages/sysutils/dosfstools/package.mk index 4a4cb79b35..bc4f653d76 100644 --- a/packages/sysutils/dosfstools/package.mk +++ b/packages/sysutils/dosfstools/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="4.1" PKG_SHA256="e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173" PKG_LICENSE="GPLv3" PKG_SITE="https://github.com/dosfstools/dosfstools" -PKG_URL="https://github.com/dosfstools/dosfstools/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://github.com/dosfstools/dosfstools/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_INIT="toolchain dosfstools" @@ -26,17 +26,17 @@ make_init() { } makeinstall_init() { - mkdir -p $INSTALL/usr/sbin - cp $(get_install_dir dosfstools:target)/usr/sbin/fsck.fat $INSTALL/usr/sbin - ln -sf fsck.fat $INSTALL/usr/sbin/fsck.msdos - ln -sf fsck.fat $INSTALL/usr/sbin/fsck.vfat + mkdir -p ${INSTALL}/usr/sbin + cp $(get_install_dir dosfstools:target)/usr/sbin/fsck.fat ${INSTALL}/usr/sbin + ln -sf fsck.fat ${INSTALL}/usr/sbin/fsck.msdos + ln -sf fsck.fat ${INSTALL}/usr/sbin/fsck.vfat } makeinstall_host() { - mkdir -p $TOOLCHAIN/sbin - cp src/mkfs.fat $TOOLCHAIN/sbin - ln -sf mkfs.fat $TOOLCHAIN/sbin/mkfs.vfat - cp src/fsck.fat $TOOLCHAIN/sbin - ln -sf fsck.fat $TOOLCHAIN/sbin/fsck.vfat - cp src/fatlabel $TOOLCHAIN/sbin + mkdir -p ${TOOLCHAIN}/sbin + cp src/mkfs.fat ${TOOLCHAIN}/sbin + ln -sf mkfs.fat ${TOOLCHAIN}/sbin/mkfs.vfat + cp src/fsck.fat ${TOOLCHAIN}/sbin + ln -sf fsck.fat ${TOOLCHAIN}/sbin/fsck.vfat + cp src/fatlabel ${TOOLCHAIN}/sbin } diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk index d21284b465..958a1eff0b 100644 --- a/packages/sysutils/e2fsprogs/package.mk +++ b/packages/sysutils/e2fsprogs/package.mk @@ -7,23 +7,23 @@ PKG_VERSION="1.45.6" PKG_SHA256="ffa7ae6954395abdc50d0f8605d8be84736465afc53b8938ef473fcf7ff44256" PKG_LICENSE="GPL" PKG_SITE="http://e2fsprogs.sourceforge.net/" -PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/$PKG_NAME/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/${PKG_NAME}/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_INIT="toolchain" PKG_LONGDESC="The filesystem utilities for the EXT2 filesystem, including e2fsck, mke2fs, dumpe2fs, fsck, and others." PKG_BUILD_FLAGS="-parallel" -if [ "$HFSTOOLS" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET diskdev_cmds" +if [ "${HFSTOOLS}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" diskdev_cmds" fi -PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN/ \ - --bindir=$TOOLCHAIN/bin \ +PKG_CONFIGURE_OPTS_HOST="--prefix=${TOOLCHAIN}/ \ + --bindir=${TOOLCHAIN}/bin \ --with-udev-rules-dir=no \ --with-crond-dir=no \ --with-systemd-unit-dir=no \ - --sbindir=$TOOLCHAIN/sbin \ + --sbindir=${TOOLCHAIN}/sbin \ --enable-verbose-makecmds \ --disable-symlink-install \ --disable-symlink-build \ @@ -42,7 +42,7 @@ PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN/ \ --with-gnu-ld" pre_configure() { - PKG_CONFIGURE_OPTS_INIT="BUILD_CC=$HOST_CC \ + PKG_CONFIGURE_OPTS_INIT="BUILD_CC=${HOST_CC} \ --with-udev-rules-dir=no \ --with-crond-dir=no \ --with-systemd-unit-dir=no \ @@ -70,44 +70,44 @@ pre_configure() { --disable-fuse2fs \ --with-gnu-ld" - PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_INIT" + PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_INIT}" } post_makeinstall_target() { - make -C lib/et LIBMODE=644 DESTDIR=$SYSROOT_PREFIX install + make -C lib/et LIBMODE=644 DESTDIR=${SYSROOT_PREFIX} install - rm -rf $INSTALL/usr/sbin/badblocks - rm -rf $INSTALL/usr/sbin/blkid - rm -rf $INSTALL/usr/sbin/dumpe2fs - rm -rf $INSTALL/usr/sbin/e2freefrag - rm -rf $INSTALL/usr/sbin/e2undo - rm -rf $INSTALL/usr/sbin/e4defrag - rm -rf $INSTALL/usr/sbin/filefrag - rm -rf $INSTALL/usr/sbin/fsck - rm -rf $INSTALL/usr/sbin/logsave - rm -rf $INSTALL/usr/sbin/mklost+found + rm -rf ${INSTALL}/usr/sbin/badblocks + rm -rf ${INSTALL}/usr/sbin/blkid + rm -rf ${INSTALL}/usr/sbin/dumpe2fs + rm -rf ${INSTALL}/usr/sbin/e2freefrag + rm -rf ${INSTALL}/usr/sbin/e2undo + rm -rf ${INSTALL}/usr/sbin/e4defrag + rm -rf ${INSTALL}/usr/sbin/filefrag + rm -rf ${INSTALL}/usr/sbin/fsck + rm -rf ${INSTALL}/usr/sbin/logsave + rm -rf ${INSTALL}/usr/sbin/mklost+found } makeinstall_init() { - mkdir -p $INSTALL/usr/sbin - cp e2fsck/e2fsck $INSTALL/usr/sbin - ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext2 - ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext3 - ln -sf e2fsck $INSTALL/usr/sbin/fsck.ext4 + mkdir -p ${INSTALL}/usr/sbin + cp e2fsck/e2fsck ${INSTALL}/usr/sbin + ln -sf e2fsck ${INSTALL}/usr/sbin/fsck.ext2 + ln -sf e2fsck ${INSTALL}/usr/sbin/fsck.ext3 + ln -sf e2fsck ${INSTALL}/usr/sbin/fsck.ext4 - if [ $INITRAMFS_PARTED_SUPPORT = "yes" ]; then - cp misc/mke2fs $INSTALL/usr/sbin - ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext2 - ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext3 - ln -sf mke2fs $INSTALL/usr/sbin/mkfs.ext4 + if [ ${INITRAMFS_PARTED_SUPPORT} = "yes" ]; then + cp misc/mke2fs ${INSTALL}/usr/sbin + ln -sf mke2fs ${INSTALL}/usr/sbin/mkfs.ext2 + ln -sf mke2fs ${INSTALL}/usr/sbin/mkfs.ext3 + ln -sf mke2fs ${INSTALL}/usr/sbin/mkfs.ext4 fi } makeinstall_host() { make -C lib/et LIBMODE=644 install make -C lib/ext2fs LIBMODE=644 install - mkdir -p $TOOLCHAIN/sbin - cp e2fsck/e2fsck $TOOLCHAIN/sbin - cp misc/mke2fs $TOOLCHAIN/sbin - cp misc/tune2fs $TOOLCHAIN/sbin + mkdir -p ${TOOLCHAIN}/sbin + cp e2fsck/e2fsck ${TOOLCHAIN}/sbin + cp misc/mke2fs ${TOOLCHAIN}/sbin + cp misc/tune2fs ${TOOLCHAIN}/sbin } diff --git a/packages/sysutils/entropy/package.mk b/packages/sysutils/entropy/package.mk index 53eb0a735c..758ebffaad 100644 --- a/packages/sysutils/entropy/package.mk +++ b/packages/sysutils/entropy/package.mk @@ -11,11 +11,11 @@ PKG_LONGDESC="A simple way to add entropy at boot" PKG_TOOLCHAIN="manual" makeinstall_target() { - mkdir -p $INSTALL/usr/lib/entropy - cp add-entropy $INSTALL/usr/lib/entropy - cp add-random-at-shutdown $INSTALL/usr/lib/entropy + mkdir -p ${INSTALL}/usr/lib/entropy + cp add-entropy ${INSTALL}/usr/lib/entropy + cp add-random-at-shutdown ${INSTALL}/usr/lib/entropy - chmod +x $INSTALL/usr/lib/entropy/* + chmod +x ${INSTALL}/usr/lib/entropy/* } post_install() { diff --git a/packages/sysutils/ethmactool/package.mk b/packages/sysutils/ethmactool/package.mk index 9edc7d01b7..9bfa0d71a4 100644 --- a/packages/sysutils/ethmactool/package.mk +++ b/packages/sysutils/ethmactool/package.mk @@ -8,8 +8,8 @@ PKG_LONGDESC="ethmactool: udev rule for obtaining real MAC address or creating a PKG_TOOLCHAIN="manual" makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp $PKG_DIR/scripts/ethmactool-config $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp ${PKG_DIR}/scripts/ethmactool-config ${INSTALL}/usr/bin } post_install() { diff --git a/packages/sysutils/eventlircd/package.mk b/packages/sysutils/eventlircd/package.mk index 4399a61f1b..136320a220 100644 --- a/packages/sysutils/eventlircd/package.mk +++ b/packages/sysutils/eventlircd/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="3b753e91ae8c28dc34dd017a354d72b3c0715309" PKG_SHA256="4eca52d0570fa568b3296a2c9bc2af252423e25c1a67654bd79680fc5a93092a" PKG_LICENSE="GPL" PKG_SITE="https://github.com/LibreELEC/eventlircd" -PKG_URL="https://github.com/LibreELEC/eventlircd/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/LibreELEC/eventlircd/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain systemd lirc" PKG_LONGDESC="The eventlircd daemon provides four functions for LIRC devices" PKG_TOOLCHAIN="autotools" @@ -16,12 +16,12 @@ PKG_CONFIGURE_OPTS_TARGET="--with-udev-dir=/usr/lib/udev \ post_makeinstall_target() { # 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 + rm -rf ${INSTALL}/etc/eventlircd.d + rm -rf ${INSTALL}/usr/lib/udev/rules.d + rm -rf ${INSTALL}/usr/lib/udev/lircd_helper - mkdir -p $INSTALL/etc/eventlircd.d - cp $PKG_DIR/evmap/*.evmap $INSTALL/etc/eventlircd.d + mkdir -p ${INSTALL}/etc/eventlircd.d + cp ${PKG_DIR}/evmap/*.evmap ${INSTALL}/etc/eventlircd.d } post_install() { diff --git a/packages/sysutils/evrepeat/package.mk b/packages/sysutils/evrepeat/package.mk index a92de04eef..0952e512a1 100644 --- a/packages/sysutils/evrepeat/package.mk +++ b/packages/sysutils/evrepeat/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.0.1" PKG_SHA256="f1d14a12d700b9650562f8ec8ca593e6033f2e18b3d1fd1f44af29875152547e" PKG_LICENSE="GPL" PKG_SITE="https://github.com/HiassofT/evrepeat" -PKG_URL="https://github.com/HiassofT/evrepeat/archive/$PKG_VERSION.tar.gz" +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/fuse/package.mk b/packages/sysutils/fuse/package.mk index c5d417aff9..6fd0fd6541 100644 --- a/packages/sysutils/fuse/package.mk +++ b/packages/sysutils/fuse/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.9.9" PKG_SHA256="d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5" PKG_LICENSE="GPL" PKG_SITE="https://github.com/libfuse/libfuse/" -PKG_URL="https://github.com/libfuse/libfuse/releases/download/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/libfuse/libfuse/releases/download/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="FUSE provides a simple interface for userspace programs to export a virtual filesystem to the Linux kernel." # fuse fails to build with GOLD linker on gcc-4.9 @@ -22,6 +22,6 @@ PKG_CONFIGURE_OPTS_TARGET="MOUNT_FUSE_PATH=/usr/sbin \ --with-gnu-ld" post_makeinstall_target() { - rm -rf $INSTALL/etc/init.d - rm -rf $INSTALL/etc/udev + rm -rf ${INSTALL}/etc/init.d + rm -rf ${INSTALL}/etc/udev } diff --git a/packages/sysutils/gptfdisk/package.mk b/packages/sysutils/gptfdisk/package.mk index 1fb4836a93..0a7aadb097 100644 --- a/packages/sysutils/gptfdisk/package.mk +++ b/packages/sysutils/gptfdisk/package.mk @@ -6,15 +6,15 @@ PKG_VERSION="1.0.6" PKG_SHA256="ddc551d643a53f0bd4440345d3ae32c49b04a797e9c01036ea460b6bb4168ca8" PKG_LICENSE="GPL" PKG_SITE="http://www.rodsbooks.com/gdisk/" -PKG_URL="https://downloads.sourceforge.net/project/$PKG_NAME/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://downloads.sourceforge.net/project/${PKG_NAME}/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain popt crossguid" PKG_LONGDESC="GPT text-mode partitioning tools" make_target() { - make sgdisk "CC=$CC" "CXX=$CXX" + make sgdisk "CC=${CC}" "CXX=${CXX}" } makeinstall_target() { - mkdir -p $INSTALL/usr/sbin/ - cp -p sgdisk $INSTALL/usr/sbin/ + mkdir -p ${INSTALL}/usr/sbin/ + cp -p sgdisk ${INSTALL}/usr/sbin/ } diff --git a/packages/sysutils/ir-bpf-decoders/package.mk b/packages/sysutils/ir-bpf-decoders/package.mk index 8a8dac8279..4e2a8f2101 100644 --- a/packages/sysutils/ir-bpf-decoders/package.mk +++ b/packages/sysutils/ir-bpf-decoders/package.mk @@ -6,11 +6,11 @@ PKG_VERSION="1.20.0" PKG_SHA256="aaf2b3d0cf3086317a4ee9c2a80af2520b59b303a71238742ee8bc20c4f2bbb6" PKG_LICENSE="GPLv2+" PKG_SITE="https://linuxtv.org/" -PKG_URL="https://github.com/LibreELEC/ir-bpf-decoders/archive/v4l-utils-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/LibreELEC/ir-bpf-decoders/archive/v4l-utils-${PKG_VERSION}.tar.gz" PKG_LONGDESC="ir-bpf-decoders: precompiled binaries of IR BPF decoders from v4l-utils utils/keytable/bpf_protocols" PKG_TOOLCHAIN="manual" makeinstall_target() { - mkdir -p $INSTALL/usr/lib/udev/rc_keymaps/protocols - cp $PKG_BUILD/*.o $INSTALL/usr/lib/udev/rc_keymaps/protocols + mkdir -p ${INSTALL}/usr/lib/udev/rc_keymaps/protocols + cp ${PKG_BUILD}/*.o ${INSTALL}/usr/lib/udev/rc_keymaps/protocols } diff --git a/packages/sysutils/keyutils/package.mk b/packages/sysutils/keyutils/package.mk index b8b5c34ca6..a1d9ddd198 100644 --- a/packages/sysutils/keyutils/package.mk +++ b/packages/sysutils/keyutils/package.mk @@ -7,16 +7,16 @@ PKG_VERSION="1.6.3" PKG_SHA256="a61d5706136ae4c05bd48f86186bcfdbd88dd8bd5107e3e195c924cfc1b39bb4" PKG_LICENSE="GPL" PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/" -PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Keyutils is a set of utilities for managing the key retention facility in the kernel." PKG_BUILD_FLAGS="+pic" PKG_MAKE_OPTS_TARGET="NO_ARLIB=0 NO_SOLIB=1 BINDIR=/usr/bin SBINDIR=/usr/sbin LIBDIR=/usr/lib USRLIBDIR=/usr/lib" -PKG_MAKEINSTALL_OPTS_TARGET="$PKG_MAKE_OPTS_TARGET" +PKG_MAKEINSTALL_OPTS_TARGET="${PKG_MAKE_OPTS_TARGET}" post_makeinstall_target() { - rm -rf $INSTALL/usr/share - rmdir $INSTALL/etc/request-key.d - ln -sf /storage/.config/request-key.d $INSTALL/etc/request-key.d + rm -rf ${INSTALL}/usr/share + rmdir ${INSTALL}/etc/request-key.d + ln -sf /storage/.config/request-key.d ${INSTALL}/etc/request-key.d } diff --git a/packages/sysutils/kmod/package.mk b/packages/sysutils/kmod/package.mk index c75798df48..d579de9ad9 100644 --- a/packages/sysutils/kmod/package.mk +++ b/packages/sysutils/kmod/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="28" PKG_SHA256="3969fc0f13daa98084256337081c442f8749310089e48aa695c9b4dfe1b3a26c" PKG_LICENSE="GPL" PKG_SITE="https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git" -PKG_URL="https://www.kernel.org/pub/linux/utils/kernel/kmod/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://www.kernel.org/pub/linux/utils/kernel/kmod/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="kmod offers the needed flexibility and fine grained control over insertion, removal, configuration and listing of kernel modules." @@ -30,22 +30,22 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-tools \ --without-zstd" post_makeinstall_host() { - ln -sf kmod $TOOLCHAIN/bin/depmod + ln -sf kmod ${TOOLCHAIN}/bin/depmod } post_makeinstall_target() { # 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 - ln -sf /usr/bin/kmod $INSTALL/usr/sbin/rmmod - ln -sf /usr/bin/kmod $INSTALL/usr/sbin/modinfo - ln -sf /usr/bin/kmod $INSTALL/usr/sbin/modprobe - ln -sf /usr/bin/kmod $INSTALL/usr/sbin/depmod + mkdir -p ${INSTALL}/usr/sbin + ln -sf /usr/bin/kmod ${INSTALL}/usr/sbin/lsmod + ln -sf /usr/bin/kmod ${INSTALL}/usr/sbin/insmod + ln -sf /usr/bin/kmod ${INSTALL}/usr/sbin/rmmod + ln -sf /usr/bin/kmod ${INSTALL}/usr/sbin/modinfo + ln -sf /usr/bin/kmod ${INSTALL}/usr/sbin/modprobe + ln -sf /usr/bin/kmod ${INSTALL}/usr/sbin/depmod - mkdir -p $INSTALL/etc - ln -sf /storage/.config/modprobe.d $INSTALL/etc/modprobe.d + mkdir -p ${INSTALL}/etc + ln -sf /storage/.config/modprobe.d ${INSTALL}/etc/modprobe.d # add user modprobe.d dir - mkdir -p $INSTALL/usr/config/modprobe.d + mkdir -p ${INSTALL}/usr/config/modprobe.d } diff --git a/packages/sysutils/libevdev/package.mk b/packages/sysutils/libevdev/package.mk index ac8e2d7917..8c84ea59fa 100644 --- a/packages/sysutils/libevdev/package.mk +++ b/packages/sysutils/libevdev/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.10.1" PKG_SHA256="0330fe8357ece915db9366c1b9a6648941aea6f724b73ad6e71401127aa08932" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/libevdev/" -PKG_URL="http://www.freedesktop.org/software/libevdev/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://www.freedesktop.org/software/libevdev/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="libevdev is a wrapper library for evdev devices." PKG_BUILD_FLAGS="+pic" @@ -19,5 +19,5 @@ PKG_MESON_OPTS_TARGET=" \ -Dtests=disabled" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/sysutils/libhid/package.mk b/packages/sysutils/libhid/package.mk index 5436e8a313..c368661517 100644 --- a/packages/sysutils/libhid/package.mk +++ b/packages/sysutils/libhid/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="9bbcb6484c91e2594614412e12ae85a144839634" # 0.2.17 + fixes PKG_SHA256="983c6fa0b46b67805a81eb600a6c4728b645ac7b014b4897d5aa212576105567" PKG_LICENSE="GPL" PKG_SITE="http://libhid.alioth.debian.org/" -PKG_URL="https://github.com/chad3814/libhid/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/chad3814/libhid/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libusb-compat libusb" PKG_LONGDESC="libhid provides a generic and flexible way to access and interact with USB HID devices." PKG_TOOLCHAIN="autotools" @@ -18,5 +18,5 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared \ --disable-swig" post_makeinstall_target() { - rm -rf $INSTALL/usr + rm -rf ${INSTALL}/usr } diff --git a/packages/sysutils/libusb-compat/package.mk b/packages/sysutils/libusb-compat/package.mk index af04509073..eb6ba0f309 100644 --- a/packages/sysutils/libusb-compat/package.mk +++ b/packages/sysutils/libusb-compat/package.mk @@ -13,6 +13,6 @@ PKG_LONGDESC="The libusb project's aim is to create a Library for use by user le PKG_CONFIGURE_OPTS_TARGET="--disable-log --disable-debug-log --disable-examples-build" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin - sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/libusb-config + rm -rf ${INSTALL}/usr/bin + sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/libusb-config } diff --git a/packages/sysutils/lirc/package.mk b/packages/sysutils/lirc/package.mk index 0d164c7ea2..79cf1d970d 100644 --- a/packages/sysutils/lirc/package.mk +++ b/packages/sysutils/lirc/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.10.1" PKG_SHA256="8b753c60df2a7f5dcda2db72c38e448ca300c3b4f6000c1501fcb0bd5df414f2" PKG_LICENSE="GPL" PKG_SITE="http://www.lirc.org" -PKG_URL="https://sourceforge.net/projects/lirc/files/LIRC/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="https://sourceforge.net/projects/lirc/files/LIRC/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libftdi1 libusb-compat libxslt alsa-lib" PKG_LONGDESC="LIRC is a package that allows you to decode and send infra-red signals." PKG_TOOLCHAIN="autotools" @@ -23,7 +23,7 @@ pre_configure_target() { export HAVE_UINPUT=yes export PYTHON=: export PYTHON_VERSION=${PKG_PYTHON_VERSION#python} - if [ -e ${SYSROOT_PREFIX}/usr/include/linux/input-event-codes.h ] ; then + if [ -e ${SYSROOT_PREFIX}/usr/include/linux/input-event-codes.h ]; then export DEVINPUT_HEADER=${SYSROOT_PREFIX}/usr/include/linux/input-event-codes.h else export DEVINPUT_HEADER=${SYSROOT_PREFIX}/usr/include/linux/input.h @@ -31,21 +31,21 @@ pre_configure_target() { } post_makeinstall_target() { - rm -rf $INSTALL/usr/lib/systemd - rm -rf $INSTALL/lib - rm -rf $INSTALL/usr/share - rm -rf $INSTALL/etc + rm -rf ${INSTALL}/usr/lib/systemd + rm -rf ${INSTALL}/lib + rm -rf ${INSTALL}/usr/share + rm -rf ${INSTALL}/etc - mkdir -p $INSTALL/etc/lirc - cp -r $PKG_DIR/config/lirc_options.conf $INSTALL/etc/lirc - ln -s /storage/.config/lircd.conf $INSTALL/etc/lirc/lircd.conf + mkdir -p ${INSTALL}/etc/lirc + cp -r ${PKG_DIR}/config/lirc_options.conf ${INSTALL}/etc/lirc + ln -s /storage/.config/lircd.conf ${INSTALL}/etc/lirc/lircd.conf - mkdir -p $INSTALL/usr/lib/libreelec - cp $PKG_DIR/scripts/lircd_helper $INSTALL/usr/lib/libreelec - cp $PKG_DIR/scripts/lircd_uinput_helper $INSTALL/usr/lib/libreelec + mkdir -p ${INSTALL}/usr/lib/libreelec + cp ${PKG_DIR}/scripts/lircd_helper ${INSTALL}/usr/lib/libreelec + cp ${PKG_DIR}/scripts/lircd_uinput_helper ${INSTALL}/usr/lib/libreelec - mkdir -p $INSTALL/usr/share/services - cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services + mkdir -p ${INSTALL}/usr/share/services + cp -P ${PKG_DIR}/default.d/*.conf ${INSTALL}/usr/share/services } post_install() { diff --git a/packages/sysutils/ntfs-3g_ntfsprogs/package.mk b/packages/sysutils/ntfs-3g_ntfsprogs/package.mk index 907c1958d6..045e557932 100644 --- a/packages/sysutils/ntfs-3g_ntfsprogs/package.mk +++ b/packages/sysutils/ntfs-3g_ntfsprogs/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2017.3.23AR.5" PKG_SHA256="04ccf583b495806cefb71850e5899e50aed5e7bf23365259f2badaa9af21e5ed" PKG_LICENSE="GPL" PKG_SITE="https://jp-andre.pagesperso-orange.fr/" -PKG_URL="https://jp-andre.pagesperso-orange.fr/$PKG_NAME-$PKG_VERSION.tgz" +PKG_URL="https://jp-andre.pagesperso-orange.fr/${PKG_NAME}-${PKG_VERSION}.tgz" PKG_DEPENDS_TARGET="toolchain fuse libgcrypt" PKG_LONGDESC="A NTFS driver with read and write support." PKG_TOOLCHAIN="autotools" @@ -25,18 +25,18 @@ PKG_CONFIGURE_OPTS_TARGET="--exec-prefix=/usr/ \ post_makeinstall_target() { # dont include ntfsprogs. - for i in $INSTALL/usr/bin/*; do - if [ "$(basename $i)" != "ntfs-3g" ]; then - rm $i + for i in ${INSTALL}/usr/bin/*; do + if [ "$(basename ${i})" != "ntfs-3g" ]; then + rm ${i} fi done - rm -rf $INSTALL/sbin - rm -rf $INSTALL/usr/sbin/ntfsclone - rm -rf $INSTALL/usr/sbin/ntfscp - rm -rf $INSTALL/usr/sbin/ntfsundelete + rm -rf ${INSTALL}/sbin + rm -rf ${INSTALL}/usr/sbin/ntfsclone + rm -rf ${INSTALL}/usr/sbin/ntfscp + rm -rf ${INSTALL}/usr/sbin/ntfsundelete - mkdir -p $INSTALL/usr/sbin - ln -sf /usr/bin/ntfs-3g $INSTALL/usr/sbin/mount.ntfs - ln -sf /usr/sbin/mkntfs $INSTALL/usr/sbin/mkfs.ntfs + mkdir -p ${INSTALL}/usr/sbin + ln -sf /usr/bin/ntfs-3g ${INSTALL}/usr/sbin/mount.ntfs + ln -sf /usr/sbin/mkntfs ${INSTALL}/usr/sbin/mkfs.ntfs } diff --git a/packages/sysutils/open-iscsi/package.mk b/packages/sysutils/open-iscsi/package.mk index fc3d05bba5..4a744ac659 100644 --- a/packages/sysutils/open-iscsi/package.mk +++ b/packages/sysutils/open-iscsi/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="bf399411ed8a2f4047f928653ac8dd02ffd0f662" PKG_SHA256="92b9f0a27a9a373b14eab7b12f1bfff5d4857695a688dc4434df8e7623354588" PKG_LICENSE="GPL" PKG_SITE="https://github.com/mikechristie/open-iscsi" -PKG_URL="https://github.com/mikechristie/open-iscsi/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/mikechristie/open-iscsi/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_INIT="toolchain util-linux" PKG_LONGDESC="The open-iscsi package allows you to mount iSCSI targets." PKG_TOOLCHAIN="configure" @@ -15,18 +15,18 @@ PKG_TOOLCHAIN="configure" PKG_MAKE_OPTS_INIT="user" pre_configure_init() { - export OPTFLAGS="$CFLAGS $LDFLAGS" + export OPTFLAGS="${CFLAGS} ${LDFLAGS}" } configure_init() { cd utils/open-isns - ./configure --host=$TARGET_NAME \ - --build=$HOST_NAME \ + ./configure --host=${TARGET_NAME} \ + --build=${HOST_NAME} \ --with-security=no cd ../.. } makeinstall_init() { - mkdir -p $INSTALL/usr/sbin - cp -P $PKG_BUILD/usr/iscsistart $INSTALL/usr/sbin + mkdir -p ${INSTALL}/usr/sbin + cp -P ${PKG_BUILD}/usr/iscsistart ${INSTALL}/usr/sbin } diff --git a/packages/sysutils/open-vm-tools/package.mk b/packages/sysutils/open-vm-tools/package.mk index 771cc31752..e7408aa6f3 100644 --- a/packages/sysutils/open-vm-tools/package.mk +++ b/packages/sysutils/open-vm-tools/package.mk @@ -26,14 +26,14 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-docs \ --without-icu \ --without-kernel-modules \ --with-udev-rules-dir=/usr/lib/udev/rules.d/ \ - --with-sysroot=$SYSROOT_PREFIX" + --with-sysroot=${SYSROOT_PREFIX}" post_unpack() { - mv $PKG_BUILD/$PKG_NAME/* $PKG_BUILD/ + mv ${PKG_BUILD}/${PKG_NAME}/* ${PKG_BUILD}/ - sed -e 's|.*common-agent/etc/config/Makefile.*||' -i $PKG_BUILD/configure.ac + sed -e 's|.*common-agent/etc/config/Makefile.*||' -i ${PKG_BUILD}/configure.ac - mkdir -p $PKG_BUILD/common-agent/etc/config + mkdir -p ${PKG_BUILD}/common-agent/etc/config # Hack to allow package to be bumped without linking against old libraries rm -f ${SYSROOT_PREFIX}/usr/lib/libvmtools* @@ -44,13 +44,13 @@ pre_configure_target() { } post_makeinstall_target() { - rm -rf $INSTALL/sbin - rm -rf $INSTALL/usr/share - rm -rf $INSTALL/etc/vmware-tools/scripts/vmware/network + rm -rf ${INSTALL}/sbin + rm -rf ${INSTALL}/usr/share + rm -rf ${INSTALL}/etc/vmware-tools/scripts/vmware/network - chmod -x $INSTALL/usr/lib/udev/rules.d/*.rules + chmod -x ${INSTALL}/usr/lib/udev/rules.d/*.rules - find $INSTALL/etc/vmware-tools/ -type f | xargs sed -i '/.*expr.*/d' + find ${INSTALL}/etc/vmware-tools/ -type f | xargs sed -i '/.*expr.*/d' } post_install() { diff --git a/packages/sysutils/parted/package.mk b/packages/sysutils/parted/package.mk index 6b7193d956..3a7e0e4b2f 100644 --- a/packages/sysutils/parted/package.mk +++ b/packages/sysutils/parted/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="3.3" PKG_SHA256="57e2b4bd87018625c515421d4524f6e3b55175b472302056391c5f7eccb83d44" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/parted/" -PKG_URL="http://ftpmirror.gnu.org/parted/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftpmirror.gnu.org/parted/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="toolchain:host util-linux:host" PKG_DEPENDS_TARGET="toolchain util-linux parted:host" PKG_DEPENDS_INIT="toolchain util-linux:init parted" @@ -19,7 +19,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-device-mapper \ --disable-rpath \ --with-gnu-ld" -PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_TARGET" +PKG_CONFIGURE_OPTS_HOST="${PKG_CONFIGURE_OPTS_TARGET}" pre_configure_init() { : # reuse pre_configure_target() @@ -34,11 +34,11 @@ make_init() { } makeinstall_init() { - mkdir -p $INSTALL/sbin - cp ../.$TARGET_NAME/parted/parted $INSTALL/sbin - cp ../.$TARGET_NAME/partprobe/partprobe $INSTALL/sbin + mkdir -p ${INSTALL}/sbin + cp ../.${TARGET_NAME}/parted/parted ${INSTALL}/sbin + cp ../.${TARGET_NAME}/partprobe/partprobe ${INSTALL}/sbin } pre_configure_target() { - export CFLAGS+=" -I$PKG_BUILD/lib" + export CFLAGS+=" -I${PKG_BUILD}/lib" } diff --git a/packages/sysutils/pciutils/package.mk b/packages/sysutils/pciutils/package.mk index 2174a78791..256003008b 100644 --- a/packages/sysutils/pciutils/package.mk +++ b/packages/sysutils/pciutils/package.mk @@ -8,31 +8,31 @@ PKG_SHA256="9d40b97be8b6a2cdf96aead5a61881d1f7e4e0da9544a9bac4fba1ae9dcd40eb" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="http://mj.ucw.cz/pciutils.shtml" -PKG_URL="http://www.kernel.org/pub/software/utils/pciutils/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://www.kernel.org/pub/software/utils/pciutils/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain kmod systemd" PKG_LONGDESC="Utilities for inspecting devices connected to the PCI bus and the PCI vendor/product ID database." PKG_MAKE_OPTS="PREFIX=/usr SHARED=no STRIP= IDSDIR=/usr/share" make_target() { - make OPT="$CFLAGS" \ + make OPT="${CFLAGS}" \ CROSS_COMPILE=${TARGET_PREFIX} \ - HOST=$TARGET_ARCH-linux \ - $PKG_MAKE_OPTS \ + HOST=${TARGET_ARCH}-linux \ + ${PKG_MAKE_OPTS} \ ZLIB=no DNS=no LIBKMOD=yes HWDB=yes } makeinstall_target() { - make $PKG_MAKE_OPTS DESTDIR=$SYSROOT_PREFIX install - make $PKG_MAKE_OPTS DESTDIR=$SYSROOT_PREFIX install-lib - make $PKG_MAKE_OPTS DESTDIR=$INSTALL install-lib - if [ "$TARGET_ARCH" = x86_64 ]; then - make $PKG_MAKE_OPTS DESTDIR=$INSTALL install + make ${PKG_MAKE_OPTS} DESTDIR=${SYSROOT_PREFIX} install + make ${PKG_MAKE_OPTS} DESTDIR=${SYSROOT_PREFIX} install-lib + make ${PKG_MAKE_OPTS} DESTDIR=${INSTALL} install-lib + if [ "${TARGET_ARCH}" = x86_64 ]; then + make ${PKG_MAKE_OPTS} DESTDIR=${INSTALL} install fi } post_makeinstall_target() { - rm -rf $INSTALL/usr/sbin/setpci - rm -rf $INSTALL/usr/sbin/update-pciids - rm -rf $INSTALL/usr/share + rm -rf ${INSTALL}/usr/sbin/setpci + rm -rf ${INSTALL}/usr/sbin/update-pciids + rm -rf ${INSTALL}/usr/share } diff --git a/packages/sysutils/sed/package.mk b/packages/sysutils/sed/package.mk index 16508b249e..74c970167d 100644 --- a/packages/sysutils/sed/package.mk +++ b/packages/sysutils/sed/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="4.8" PKG_SHA256="f79b0cfea71b37a8eeec8490db6c5f7ae7719c35587f21edb0617f370eeff633" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/sed/" -PKG_URL="http://ftpmirror.gnu.org/sed/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://ftpmirror.gnu.org/sed/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host" PKG_LONGDESC="The sed (Stream EDitor) editor is a stream or batch (non-interactive) editor." diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index 70a8a1d6a5..03e3295b30 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="247" PKG_SHA256="77146f7b27334aa69ef6692bed92c3c893685150f481e7254b81d4ea0f66c640" PKG_LICENSE="LGPL2.1+" PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd" -PKG_URL="https://github.com/systemd/systemd/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/systemd/systemd/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain libcap kmod util-linux entropy libidn2 wait-time-sync" PKG_LONGDESC="A system and session manager for Linux, compatible with SysV and LSB init scripts." @@ -99,158 +99,158 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \ -Dkmod-path=/usr/bin/kmod \ -Dmount-path=/usr/bin/mount \ -Dumount-path=/usr/bin/umount \ - -Ddebug-tty=$DEBUG_TTY \ + -Ddebug-tty=${DEBUG_TTY} \ -Dversion-tag=${PKG_VERSION}" pre_configure_target() { - export TARGET_CFLAGS="$TARGET_CFLAGS -fno-schedule-insns -fno-schedule-insns2 -Wno-format-truncation" + export TARGET_CFLAGS="${TARGET_CFLAGS} -fno-schedule-insns -fno-schedule-insns2 -Wno-format-truncation" export LC_ALL=en_US.UTF-8 } post_makeinstall_target() { # remove unneeded stuff - safe_remove $INSTALL/etc/init.d - safe_remove $INSTALL/etc/systemd/system - safe_remove $INSTALL/etc/xdg - safe_remove $INSTALL/etc/X11 - safe_remove $INSTALL/usr/bin/kernel-install - safe_remove $INSTALL/usr/lib/kernel/install.d - safe_remove $INSTALL/usr/lib/rpm - safe_remove $INSTALL/usr/lib/systemd/user - safe_remove $INSTALL/usr/lib/tmpfiles.d/etc.conf - safe_remove $INSTALL/usr/lib/tmpfiles.d/home.conf - safe_remove $INSTALL/usr/share/factory + safe_remove ${INSTALL}/etc/init.d + safe_remove ${INSTALL}/etc/systemd/system + safe_remove ${INSTALL}/etc/xdg + safe_remove ${INSTALL}/etc/X11 + safe_remove ${INSTALL}/usr/bin/kernel-install + safe_remove ${INSTALL}/usr/lib/kernel/install.d + safe_remove ${INSTALL}/usr/lib/rpm + safe_remove ${INSTALL}/usr/lib/systemd/user + safe_remove ${INSTALL}/usr/lib/tmpfiles.d/etc.conf + safe_remove ${INSTALL}/usr/lib/tmpfiles.d/home.conf + safe_remove ${INSTALL}/usr/share/factory # clean up hwdb - safe_remove $INSTALL/usr/lib/udev/hwdb.d/20-OUI.hwdb - safe_remove $INSTALL/usr/lib/udev/hwdb.d/20-acpi-vendor.hwdb - safe_remove $INSTALL/usr/lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb - safe_remove $INSTALL/usr/lib/udev/hwdb.d/20-net-ifname.hwdb - safe_remove $INSTALL/usr/lib/udev/hwdb.d/20-sdio-classes.hwdb - safe_remove $INSTALL/usr/lib/udev/hwdb.d/20-sdio-vendor-model.hwdb + safe_remove ${INSTALL}/usr/lib/udev/hwdb.d/20-OUI.hwdb + safe_remove ${INSTALL}/usr/lib/udev/hwdb.d/20-acpi-vendor.hwdb + safe_remove ${INSTALL}/usr/lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb + safe_remove ${INSTALL}/usr/lib/udev/hwdb.d/20-net-ifname.hwdb + safe_remove ${INSTALL}/usr/lib/udev/hwdb.d/20-sdio-classes.hwdb + safe_remove ${INSTALL}/usr/lib/udev/hwdb.d/20-sdio-vendor-model.hwdb # remove Network adaper renaming rule, this is confusing - safe_remove $INSTALL/usr/lib/udev/rules.d/80-net-setup-link.rules + safe_remove ${INSTALL}/usr/lib/udev/rules.d/80-net-setup-link.rules - safe_remove $INSTALL/usr/lib/udev/rules.d/71-seat.rules - safe_remove $INSTALL/usr/lib/udev/rules.d/73-seat-late.rules + safe_remove ${INSTALL}/usr/lib/udev/rules.d/71-seat.rules + safe_remove ${INSTALL}/usr/lib/udev/rules.d/73-seat-late.rules # remove getty units, we dont want a console - safe_remove $INSTALL/usr/lib/systemd/system/autovt@.service - safe_remove $INSTALL/usr/lib/systemd/system/console-getty.service - safe_remove $INSTALL/usr/lib/systemd/system/container-getty@.service - safe_remove $INSTALL/usr/lib/systemd/system/getty.target - safe_remove $INSTALL/usr/lib/systemd/system/getty@.service - safe_remove $INSTALL/usr/lib/systemd/system/serial-getty@.service - safe_remove $INSTALL/usr/lib/systemd/system/*.target.wants/getty.target + safe_remove ${INSTALL}/usr/lib/systemd/system/autovt@.service + safe_remove ${INSTALL}/usr/lib/systemd/system/console-getty.service + safe_remove ${INSTALL}/usr/lib/systemd/system/container-getty@.service + safe_remove ${INSTALL}/usr/lib/systemd/system/getty.target + safe_remove ${INSTALL}/usr/lib/systemd/system/getty@.service + safe_remove ${INSTALL}/usr/lib/systemd/system/serial-getty@.service + safe_remove ${INSTALL}/usr/lib/systemd/system/*.target.wants/getty.target # remove other notused or nonsense stuff (our /etc is ro) - safe_remove $INSTALL/usr/lib/systemd/systemd-update-done - safe_remove $INSTALL/usr/lib/systemd/system/systemd-update-done.service - safe_remove $INSTALL/usr/lib/systemd/system/*.target.wants/systemd-update-done.service + safe_remove ${INSTALL}/usr/lib/systemd/systemd-update-done + safe_remove ${INSTALL}/usr/lib/systemd/system/systemd-update-done.service + safe_remove ${INSTALL}/usr/lib/systemd/system/*.target.wants/systemd-update-done.service # remove systemd-hwdb-update. we have own hwdb.service - safe_remove $INSTALL/usr/lib/systemd/system/systemd-hwdb-update.service + safe_remove ${INSTALL}/usr/lib/systemd/system/systemd-hwdb-update.service # remove nspawn - safe_remove $INSTALL/usr/bin/systemd-nspawn - safe_remove $INSTALL/usr/lib/systemd/system/systemd-nspawn@.service + safe_remove ${INSTALL}/usr/bin/systemd-nspawn + safe_remove ${INSTALL}/usr/lib/systemd/system/systemd-nspawn@.service # remove unneeded generators - for gen in $INSTALL/usr/lib/systemd/system-generators/*; do - case "$gen" in + for gen in ${INSTALL}/usr/lib/systemd/system-generators/*; do + case "${gen}" in */systemd-debug-generator) # keep it ;; *) - safe_remove "$gen" + safe_remove "${gen}" ;; esac done # remove catalog - safe_remove $INSTALL/usr/lib/systemd/catalog + safe_remove ${INSTALL}/usr/lib/systemd/catalog # remove partition - safe_remove $INSTALL/usr/lib/systemd/systemd-growfs - safe_remove $INSTALL/usr/lib/systemd/systemd-makefs + safe_remove ${INSTALL}/usr/lib/systemd/systemd-growfs + safe_remove ${INSTALL}/usr/lib/systemd/systemd-makefs # distro preset policy - safe_remove $INSTALL/usr/lib/systemd/system-preset/* - echo "disable *" > $INSTALL/usr/lib/systemd/system-preset/99-default.preset + safe_remove ${INSTALL}/usr/lib/systemd/system-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 + safe_remove ${INSTALL}/usr/lib/systemd/user-preset/* + echo "disable *" > ${INSTALL}/usr/lib/systemd/user-preset/90-systemd.preset # remove networkd - safe_remove $INSTALL/usr/lib/systemd/network + safe_remove ${INSTALL}/usr/lib/systemd/network # remove systemd-time-wait-sync (not detecting slew time updates, using package wait-time-sync) - safe_remove $INSTALL/usr/lib/systemd/system/systemd-time-wait-sync.service - safe_remove $INSTALL/usr/lib/systemd/systemd-time-wait-sync + safe_remove ${INSTALL}/usr/lib/systemd/system/systemd-time-wait-sync.service + safe_remove ${INSTALL}/usr/lib/systemd/systemd-time-wait-sync # tune journald.conf - sed -e "s,^.*Compress=.*$,Compress=no,g" -i $INSTALL/etc/systemd/journald.conf - sed -e "s,^.*SplitMode=.*$,SplitMode=none,g" -i $INSTALL/etc/systemd/journald.conf - sed -e "s,^.*RuntimeMaxUse=.*$,RuntimeMaxUse=2M,g" -i $INSTALL/etc/systemd/journald.conf - sed -e "s,^.*RuntimeMaxFileSize=.*$,RuntimeMaxFileSize=128K,g" -i $INSTALL/etc/systemd/journald.conf - sed -e "s,^.*SystemMaxUse=.*$,SystemMaxUse=10M,g" -i $INSTALL/etc/systemd/journald.conf + sed -e "s,^.*Compress=.*$,Compress=no,g" -i ${INSTALL}/etc/systemd/journald.conf + sed -e "s,^.*SplitMode=.*$,SplitMode=none,g" -i ${INSTALL}/etc/systemd/journald.conf + sed -e "s,^.*RuntimeMaxUse=.*$,RuntimeMaxUse=2M,g" -i ${INSTALL}/etc/systemd/journald.conf + sed -e "s,^.*RuntimeMaxFileSize=.*$,RuntimeMaxFileSize=128K,g" -i ${INSTALL}/etc/systemd/journald.conf + sed -e "s,^.*SystemMaxUse=.*$,SystemMaxUse=10M,g" -i ${INSTALL}/etc/systemd/journald.conf # tune logind.conf - sed -e "s,^.*HandleLidSwitch=.*$,HandleLidSwitch=ignore,g" -i $INSTALL/etc/systemd/logind.conf - sed -e "s,^.*HandlePowerKey=.*$,HandlePowerKey=ignore,g" -i $INSTALL/etc/systemd/logind.conf + sed -e "s,^.*HandleLidSwitch=.*$,HandleLidSwitch=ignore,g" -i ${INSTALL}/etc/systemd/logind.conf + sed -e "s,^.*HandlePowerKey=.*$,HandlePowerKey=ignore,g" -i ${INSTALL}/etc/systemd/logind.conf # replace systemd-machine-id-setup with ours - safe_remove $INSTALL/usr/lib/systemd/system/systemd-machine-id-commit.service - safe_remove $INSTALL/usr/lib/systemd/system/*.target.wants/systemd-machine-id-commit.service - safe_remove $INSTALL/usr/bin/systemd-machine-id-setup - mkdir -p $INSTALL/usr/bin - cp $PKG_DIR/scripts/systemd-machine-id-setup $INSTALL/usr/bin - cp $PKG_DIR/scripts/userconfig-setup $INSTALL/usr/bin - cp $PKG_DIR/scripts/usercache-setup $INSTALL/usr/bin - cp $PKG_DIR/scripts/environment-setup $INSTALL/usr/bin + safe_remove ${INSTALL}/usr/lib/systemd/system/systemd-machine-id-commit.service + safe_remove ${INSTALL}/usr/lib/systemd/system/*.target.wants/systemd-machine-id-commit.service + safe_remove ${INSTALL}/usr/bin/systemd-machine-id-setup + mkdir -p ${INSTALL}/usr/bin + cp ${PKG_DIR}/scripts/systemd-machine-id-setup ${INSTALL}/usr/bin + cp ${PKG_DIR}/scripts/userconfig-setup ${INSTALL}/usr/bin + cp ${PKG_DIR}/scripts/usercache-setup ${INSTALL}/usr/bin + cp ${PKG_DIR}/scripts/environment-setup ${INSTALL}/usr/bin # use systemd to set cpufreq governor and tunables - find_file_path scripts/cpufreq && cp -PRv $FOUND_PATH $INSTALL/usr/bin + find_file_path scripts/cpufreq && cp -PRv ${FOUND_PATH} ${INSTALL}/usr/bin - mkdir -p $INSTALL/usr/sbin - cp $PKG_DIR/scripts/kernel-overlays-setup $INSTALL/usr/sbin - cp $PKG_DIR/scripts/network-base-setup $INSTALL/usr/sbin - cp $PKG_DIR/scripts/systemd-timesyncd-setup $INSTALL/usr/sbin + mkdir -p ${INSTALL}/usr/sbin + cp ${PKG_DIR}/scripts/kernel-overlays-setup ${INSTALL}/usr/sbin + cp ${PKG_DIR}/scripts/network-base-setup ${INSTALL}/usr/sbin + cp ${PKG_DIR}/scripts/systemd-timesyncd-setup ${INSTALL}/usr/sbin # /etc/resolv.conf and /etc/hosts must be writable - ln -sf /run/libreelec/resolv.conf $INSTALL/etc/resolv.conf - ln -sf /run/libreelec/hosts $INSTALL/etc/hosts - ln -sf /run/libreelec/environment $INSTALL/etc/environment + ln -sf /run/libreelec/resolv.conf ${INSTALL}/etc/resolv.conf + ln -sf /run/libreelec/hosts ${INSTALL}/etc/hosts + ln -sf /run/libreelec/environment ${INSTALL}/etc/environment # provide 'halt', 'shutdown', 'reboot' & co. - ln -sf /usr/bin/systemctl $INSTALL/usr/sbin/halt - ln -sf /usr/bin/systemctl $INSTALL/usr/sbin/poweroff - ln -sf /usr/bin/systemctl $INSTALL/usr/sbin/reboot - ln -sf /usr/bin/systemctl $INSTALL/usr/sbin/runlevel - ln -sf /usr/bin/systemctl $INSTALL/usr/sbin/shutdown - ln -sf /usr/bin/systemctl $INSTALL/usr/sbin/telinit + ln -sf /usr/bin/systemctl ${INSTALL}/usr/sbin/halt + ln -sf /usr/bin/systemctl ${INSTALL}/usr/sbin/poweroff + ln -sf /usr/bin/systemctl ${INSTALL}/usr/sbin/reboot + ln -sf /usr/bin/systemctl ${INSTALL}/usr/sbin/runlevel + ln -sf /usr/bin/systemctl ${INSTALL}/usr/sbin/shutdown + ln -sf /usr/bin/systemctl ${INSTALL}/usr/sbin/telinit # strip - debug_strip $INSTALL/usr + debug_strip ${INSTALL}/usr # defaults - mkdir -p $INSTALL/usr/config - cp -PR $PKG_DIR/config/* $INSTALL/usr/config + mkdir -p ${INSTALL}/usr/config + cp -PR ${PKG_DIR}/config/* ${INSTALL}/usr/config - safe_remove $INSTALL/etc/modules-load.d - ln -sf /storage/.config/modules-load.d $INSTALL/etc/modules-load.d - ln -sf /storage/.config/logind.conf.d $INSTALL/etc/systemd/logind.conf.d - ln -sf /storage/.config/sleep.conf.d $INSTALL/etc/systemd/sleep.conf.d - ln -sf /storage/.config/timesyncd.conf.d $INSTALL/etc/systemd/timesyncd.conf.d - safe_remove $INSTALL/etc/sysctl.d - ln -sf /storage/.config/sysctl.d $INSTALL/etc/sysctl.d - safe_remove $INSTALL/etc/tmpfiles.d - ln -sf /storage/.config/tmpfiles.d $INSTALL/etc/tmpfiles.d - safe_remove $INSTALL/etc/udev/hwdb.d - ln -sf /storage/.config/hwdb.d $INSTALL/etc/udev/hwdb.d - safe_remove $INSTALL/etc/udev/rules.d - ln -sf /storage/.config/udev.rules.d $INSTALL/etc/udev/rules.d + safe_remove ${INSTALL}/etc/modules-load.d + ln -sf /storage/.config/modules-load.d ${INSTALL}/etc/modules-load.d + ln -sf /storage/.config/logind.conf.d ${INSTALL}/etc/systemd/logind.conf.d + ln -sf /storage/.config/sleep.conf.d ${INSTALL}/etc/systemd/sleep.conf.d + ln -sf /storage/.config/timesyncd.conf.d ${INSTALL}/etc/systemd/timesyncd.conf.d + safe_remove ${INSTALL}/etc/sysctl.d + ln -sf /storage/.config/sysctl.d ${INSTALL}/etc/sysctl.d + safe_remove ${INSTALL}/etc/tmpfiles.d + ln -sf /storage/.config/tmpfiles.d ${INSTALL}/etc/tmpfiles.d + safe_remove ${INSTALL}/etc/udev/hwdb.d + ln -sf /storage/.config/hwdb.d ${INSTALL}/etc/udev/hwdb.d + safe_remove ${INSTALL}/etc/udev/rules.d + ln -sf /storage/.config/udev.rules.d ${INSTALL}/etc/udev/rules.d } post_install() { diff --git a/packages/sysutils/terminus-font/package.mk b/packages/sysutils/terminus-font/package.mk index d3e4bb8d4a..2c593df0e8 100644 --- a/packages/sysutils/terminus-font/package.mk +++ b/packages/sysutils/terminus-font/package.mk @@ -12,7 +12,7 @@ PKG_LONGDESC="This package contains the Terminus Font" PKG_TOOLCHAIN="manual" pre_configure_init() { - cd $PKG_BUILD + cd ${PKG_BUILD} rm -rf .${TARGET_NAME}-${TARGET} } diff --git a/packages/sysutils/tz/package.mk b/packages/sysutils/tz/package.mk index 6cf435b61c..88a590b0f4 100644 --- a/packages/sysutils/tz/package.mk +++ b/packages/sysutils/tz/package.mk @@ -7,24 +7,24 @@ PKG_VERSION="2020f" PKG_SHA256="e53b70c3ed8597a081e2c12ec049802433b5e022d3d20db4e8bda80d760d7cee" PKG_LICENSE="Public Domain" PKG_SITE="http://www.iana.org/time-zones" -PKG_URL="https://github.com/eggert/tz/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/eggert/tz/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Time zone and daylight-saving time data." pre_configure_target() { - PKG_MAKE_OPTS_TARGET="CC=$HOST_CC LDFLAGS=" + PKG_MAKE_OPTS_TARGET="CC=${HOST_CC} LDFLAGS=" } makeinstall_target() { - make TZDIR="$INSTALL/usr/share/zoneinfo" REDO=posix_only TOPDIR="$INSTALL" install + make TZDIR="${INSTALL}/usr/share/zoneinfo" REDO=posix_only TOPDIR="${INSTALL}" install } post_makeinstall_target() { - rm -rf $INSTALL/usr/bin $INSTALL/usr/sbin + rm -rf ${INSTALL}/usr/bin ${INSTALL}/usr/sbin - rm -rf $INSTALL/etc - mkdir -p $INSTALL/etc - ln -sf /var/run/localtime $INSTALL/etc/localtime + rm -rf ${INSTALL}/etc + mkdir -p ${INSTALL}/etc + ln -sf /var/run/localtime ${INSTALL}/etc/localtime } post_install() { diff --git a/packages/sysutils/udevil/package.mk b/packages/sysutils/udevil/package.mk index 55b2873bbb..6e70b8751b 100644 --- a/packages/sysutils/udevil/package.mk +++ b/packages/sysutils/udevil/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.4.4" PKG_SHA256="ce8c51fd4d589cda7be56e75b42188deeb258c66fc911a9b3a70a3945c157739" PKG_LICENSE="GPL" PKG_SITE="https://github.com/IgnorantGuru/udevil" -PKG_URL="https://github.com/IgnorantGuru/udevil/raw/pkg/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="https://github.com/IgnorantGuru/udevil/raw/pkg/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain systemd glib" PKG_LONGDESC="Mounts and unmounts removable devices and networks without a password." @@ -21,11 +21,11 @@ makeinstall_target() { } post_makeinstall_target() { - mkdir -p $INSTALL/etc/udevil - cp $PKG_DIR/config/udevil.conf $INSTALL/etc/udevil + mkdir -p ${INSTALL}/etc/udevil + cp ${PKG_DIR}/config/udevil.conf ${INSTALL}/etc/udevil - mkdir -p $INSTALL/usr/bin - cp -PR src/udevil $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -PR src/udevil ${INSTALL}/usr/bin } post_install() { diff --git a/packages/sysutils/usbutils/package.mk b/packages/sysutils/usbutils/package.mk index a33bc10392..d9bc056ffc 100644 --- a/packages/sysutils/usbutils/package.mk +++ b/packages/sysutils/usbutils/package.mk @@ -7,12 +7,12 @@ PKG_VERSION="013" PKG_SHA256="9e23494fcc78b7a80ee29a07dd179c95ae2f71509c35728dbbabc2d1cca41338" PKG_LICENSE="GPL" PKG_SITE="http://www.linux-usb.org/" -PKG_URL="http://kernel.org/pub/linux/utils/usb/usbutils/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://kernel.org/pub/linux/utils/usb/usbutils/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libusb systemd" PKG_LONGDESC="This package contains various utilities for inspecting and setting of devices connected to the USB bus." PKG_TOOLCHAIN="autotools" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin/lsusb.py - rm -rf $INSTALL/usr/bin/usbhid-dump + rm -rf ${INSTALL}/usr/bin/lsusb.py + rm -rf ${INSTALL}/usr/bin/usbhid-dump } diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk index 1fca34173a..9731c9cee7 100644 --- a/packages/sysutils/util-linux/package.mk +++ b/packages/sysutils/util-linux/package.mk @@ -6,7 +6,7 @@ PKG_NAME="util-linux" PKG_VERSION="2.36.1" PKG_SHA256="09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed" PKG_LICENSE="GPL" -PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v$(get_pkg_version_maj_min)/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v$(get_pkg_version_maj_min)/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="ccache:host autoconf:host automake:host intltool:host libtool:host pkg-config:host" PKG_DEPENDS_TARGET="toolchain" PKG_DEPENDS_INIT="toolchain" @@ -45,7 +45,7 @@ UTILLINUX_CONFIG_DEFAULT="--disable-gtk-doc \ --without-python \ --without-systemdsystemunitdir" -PKG_CONFIGURE_OPTS_TARGET="$UTILLINUX_CONFIG_DEFAULT \ +PKG_CONFIGURE_OPTS_TARGET="${UTILLINUX_CONFIG_DEFAULT} \ --enable-libuuid \ --enable-libblkid \ --enable-libmount \ @@ -56,40 +56,40 @@ PKG_CONFIGURE_OPTS_TARGET="$UTILLINUX_CONFIG_DEFAULT \ --enable-blkid \ --enable-lscpu" -if [ "$SWAP_SUPPORT" = "yes" ]; then - PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --enable-swapon" +if [ "${SWAP_SUPPORT}" = "yes" ]; then + PKG_CONFIGURE_OPTS_TARGET+=" --enable-swapon" fi PKG_CONFIGURE_OPTS_HOST="--enable-static \ --disable-shared \ - $UTILLINUX_CONFIG_DEFAULT \ + ${UTILLINUX_CONFIG_DEFAULT} \ --enable-uuidgen \ --enable-libuuid" -PKG_CONFIGURE_OPTS_INIT="$UTILLINUX_CONFIG_DEFAULT \ +PKG_CONFIGURE_OPTS_INIT="${UTILLINUX_CONFIG_DEFAULT} \ --enable-libblkid \ --enable-libmount \ --enable-fsck" -if [ "$INITRAMFS_PARTED_SUPPORT" = "yes" ]; then - PKG_CONFIGURE_OPTS_INIT="$PKG_CONFIGURE_OPTS_INIT --enable-mkfs --enable-libuuid" +if [ "${INITRAMFS_PARTED_SUPPORT}" = "yes" ]; then + PKG_CONFIGURE_OPTS_INIT+=" --enable-mkfs --enable-libuuid" fi post_makeinstall_target() { - if [ "$SWAP_SUPPORT" = "yes" ]; then - mkdir -p $INSTALL/usr/lib/libreelec - cp -PR $PKG_DIR/scripts/mount-swap $INSTALL/usr/lib/libreelec + if [ "${SWAP_SUPPORT}" = "yes" ]; then + mkdir -p ${INSTALL}/usr/lib/libreelec + cp -PR ${PKG_DIR}/scripts/mount-swap ${INSTALL}/usr/lib/libreelec - mkdir -p $INSTALL/etc - 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 + mkdir -p ${INSTALL}/etc + 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 fi } post_install () { - if [ "$SWAP_SUPPORT" = "yes" ]; then + 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 14e8608107..e7fe08075f 100644 --- a/packages/sysutils/v4l-utils/package.mk +++ b/packages/sysutils/v4l-utils/package.mk @@ -9,7 +9,7 @@ PKG_VERSION="1.20.0" PKG_SHA256="956118713f7ccb405c55c7088a6a2490c32d54300dd9a30d8d5008c28d3726f7" PKG_LICENSE="GPL" PKG_SITE="http://linuxtv.org/" -PKG_URL="http://linuxtv.org/downloads/v4l-utils/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://linuxtv.org/downloads/v4l-utils/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain alsa-lib systemd elfutils ir-bpf-decoders" PKG_LONGDESC="Linux V4L2 and DVB API utilities and v4l libraries (libv4l)." PKG_TOOLCHAIN="autotools" @@ -22,39 +22,39 @@ PKG_CONFIGURE_OPTS_TARGET="--without-jpeg \ pre_configure_target() { # cec-ctl fails to build in subdirs - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} } make_target() { - make -C utils/keytable CFLAGS="$TARGET_CFLAGS" - make -C utils/ir-ctl CFLAGS="$TARGET_CFLAGS" - if [ "$CEC_FRAMEWORK_SUPPORT" = "yes" ]; then - make -C utils/libcecutil CFLAGS="$TARGET_CFLAGS" - make -C utils/cec-ctl CFLAGS="$TARGET_CFLAGS" + make -C utils/keytable CFLAGS="${TARGET_CFLAGS}" + make -C utils/ir-ctl CFLAGS="${TARGET_CFLAGS}" + if [ "${CEC_FRAMEWORK_SUPPORT}" = "yes" ]; then + make -C utils/libcecutil CFLAGS="${TARGET_CFLAGS}" + make -C utils/cec-ctl CFLAGS="${TARGET_CFLAGS}" fi - make -C lib CFLAGS="$TARGET_CFLAGS" - make -C utils/dvb CFLAGS="$TARGET_CFLAGS" - make -C utils/v4l2-ctl CFLAGS="$TARGET_CFLAGS" + make -C lib CFLAGS="${TARGET_CFLAGS}" + make -C utils/dvb CFLAGS="${TARGET_CFLAGS}" + make -C utils/v4l2-ctl CFLAGS="${TARGET_CFLAGS}" } makeinstall_target() { - make install DESTDIR=$INSTALL PREFIX=/usr -C utils/keytable - make install DESTDIR=$INSTALL PREFIX=/usr -C utils/ir-ctl - if [ "$CEC_FRAMEWORK_SUPPORT" = "yes" ]; then - make install DESTDIR=$INSTALL PREFIX=/usr -C utils/cec-ctl + make install DESTDIR=${INSTALL} PREFIX=/usr -C utils/keytable + make install DESTDIR=${INSTALL} PREFIX=/usr -C utils/ir-ctl + if [ "${CEC_FRAMEWORK_SUPPORT}" = "yes" ]; then + make install DESTDIR=${INSTALL} PREFIX=/usr -C utils/cec-ctl fi - make install DESTDIR=$INSTALL PREFIX=/usr -C utils/dvb - make install DESTDIR=$INSTALL PREFIX=/usr -C utils/v4l2-ctl + make install DESTDIR=${INSTALL} PREFIX=/usr -C utils/dvb + make install DESTDIR=${INSTALL} PREFIX=/usr -C utils/v4l2-ctl cp ${PKG_BUILD}/contrib/lircd2toml.py ${INSTALL}/usr/bin/ } create_multi_keymap() { local f name map - name="$1" + name="${1}" shift 1 ( - for f in "$@" ; do + for f in "$@"; do map="${INSTALL}/usr/lib/udev/rc_keymaps/${f}.toml" [ -e "${map}" ] && cat "${map}" done @@ -64,35 +64,35 @@ create_multi_keymap() { post_makeinstall_target() { local f keymap - rm -rf $INSTALL/etc/rc_keymaps - ln -sf /storage/.config/rc_keymaps $INSTALL/etc/rc_keymaps + rm -rf ${INSTALL}/etc/rc_keymaps + ln -sf /storage/.config/rc_keymaps ${INSTALL}/etc/rc_keymaps - mkdir -p $INSTALL/usr/config - cp -PR $PKG_DIR/config/* $INSTALL/usr/config + mkdir -p ${INSTALL}/usr/config + cp -PR ${PKG_DIR}/config/* ${INSTALL}/usr/config - rm -rf $INSTALL/usr/lib/udev/rules.d - mkdir -p $INSTALL/usr/lib/udev/rules.d - cp -PR $PKG_DIR/udev.d/*.rules $INSTALL/usr/lib/udev/rules.d + rm -rf ${INSTALL}/usr/lib/udev/rules.d + mkdir -p ${INSTALL}/usr/lib/udev/rules.d + cp -PR ${PKG_DIR}/udev.d/*.rules ${INSTALL}/usr/lib/udev/rules.d # install additional keymaps without overwriting upstream maps ( set -C - for f in $PKG_DIR/keymaps/* ; do - if [ -e $f ] ; then - keymap=$(basename $f) - cat $f > $INSTALL/usr/lib/udev/rc_keymaps/$keymap + for f in ${PKG_DIR}/keymaps/*; do + if [ -e ${f} ]; then + keymap=$(basename ${f}) + cat ${f} > ${INSTALL}/usr/lib/udev/rc_keymaps/${keymap} fi done ) # create multi keymap to support several remotes OOTB - if [ -n "$IR_REMOTE_KEYMAPS" ]; then - create_multi_keymap libreelec_multi $IR_REMOTE_KEYMAPS + if [ -n "${IR_REMOTE_KEYMAPS}" ]; then + create_multi_keymap libreelec_multi ${IR_REMOTE_KEYMAPS} # use multi-keymap instead of default one - sed -i '/^\*\s*rc-rc6-mce\s*rc6_mce/d' $INSTALL/etc/rc_maps.cfg + 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 # From b9821a561d65dc1bcaab3e8c20db4e808868cd31 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:17 +0000 Subject: [PATCH 22/27] textproc: automated code cleanup Signed-off-by: Ian Leonard --- packages/textproc/jsoncpp/package.mk | 2 +- packages/textproc/libidn2/package.mk | 2 +- packages/textproc/libxml2/package.mk | 14 +++++----- packages/textproc/libxslt/package.mk | 12 ++++----- packages/textproc/nlohmann-json/package.mk | 2 +- packages/textproc/tinyxml/package.mk | 4 +-- packages/textproc/tinyxml2/package.mk | 2 +- packages/textproc/xmlstarlet/package.mk | 30 +++++++++++----------- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/packages/textproc/jsoncpp/package.mk b/packages/textproc/jsoncpp/package.mk index e520d42997..f6310bdae1 100644 --- a/packages/textproc/jsoncpp/package.mk +++ b/packages/textproc/jsoncpp/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.9.4" PKG_SHA256="e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999" PKG_LICENSE="GPL" PKG_SITE="https://github.com/open-source-parsers/jsoncpp/" -PKG_URL="https://github.com/open-source-parsers/jsoncpp/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/open-source-parsers/jsoncpp/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A C++ library for interacting with JSON." PKG_TOOLCHAIN="cmake" diff --git a/packages/textproc/libidn2/package.mk b/packages/textproc/libidn2/package.mk index f3024e164c..fa33d7a596 100644 --- a/packages/textproc/libidn2/package.mk +++ b/packages/textproc/libidn2/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="2.3.0" PKG_SHA256="e1cb1db3d2e249a6a3eb6f0946777c2e892d5c5dc7bd91c74394fc3a01cab8b5" PKG_LICENSE="LGPL3" PKG_SITE="https://www.gnu.org/software/libidn/" -PKG_URL="http://ftpmirror.gnu.org/gnu/libidn/libidn2-$PKG_VERSION.tar.gz" +PKG_URL="http://ftpmirror.gnu.org/gnu/libidn/libidn2-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Free software implementation of IDNA2008, Punycode and TR46." diff --git a/packages/textproc/libxml2/package.mk b/packages/textproc/libxml2/package.mk index e1708f5f2e..a5175d8887 100644 --- a/packages/textproc/libxml2/package.mk +++ b/packages/textproc/libxml2/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.9.10" PKG_SHA256="aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f" PKG_LICENSE="MIT" PKG_SITE="http://xmlsoft.org" -PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="ftp://xmlsoft.org/libxml2/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="zlib:host Python3:host" PKG_DEPENDS_TARGET="toolchain zlib" PKG_LONGDESC="The libxml package contains an XML library, which allows you to manipulate XML files." @@ -18,16 +18,16 @@ PKG_CONFIGURE_OPTS_ALL="ac_cv_header_ansidecl_h=no \ --disable-silent-rules \ --enable-ipv6 \ --without-python \ - --with-zlib=$TOOLCHAIN \ + --with-zlib=${TOOLCHAIN} \ --without-lzma" -PKG_CONFIGURE_OPTS_HOST="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$TOOLCHAIN --with-python" +PKG_CONFIGURE_OPTS_HOST="${PKG_CONFIGURE_OPTS_ALL} --with-zlib=${TOOLCHAIN} --with-python" -PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_ALL --with-zlib=$SYSROOT_PREFIX/usr --with-sysroot=$SYSROOT_PREFIX" +PKG_CONFIGURE_OPTS_TARGET="${PKG_CONFIGURE_OPTS_ALL} --with-zlib=${SYSROOT_PREFIX}/usr --with-sysroot=${SYSROOT_PREFIX}" post_makeinstall_target() { - sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/xml2-config + sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/xml2-config - rm -rf $INSTALL/usr/bin - rm -rf $INSTALL/usr/lib/xml2Conf.sh + rm -rf ${INSTALL}/usr/bin + rm -rf ${INSTALL}/usr/lib/xml2Conf.sh } diff --git a/packages/textproc/libxslt/package.mk b/packages/textproc/libxslt/package.mk index fb2e89ef88..3408e94c64 100644 --- a/packages/textproc/libxslt/package.mk +++ b/packages/textproc/libxslt/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.34" PKG_SHA256="98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f" PKG_LICENSE="MIT" PKG_SITE="http://xmlsoft.org/xslt/" -PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="ftp://xmlsoft.org/libxml2/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="libxml2:host" PKG_DEPENDS_TARGET="toolchain libxml2" PKG_LONGDESC="A XSLT C library." @@ -18,7 +18,7 @@ PKG_CONFIGURE_OPTS_HOST=" ac_cv_header_ansidecl_h=no \ --enable-static \ --disable-shared \ --without-python \ - --with-libxml-prefix=$TOOLCHAIN \ + --with-libxml-prefix=${TOOLCHAIN} \ --without-crypto" PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_ansidecl_h=no \ @@ -26,12 +26,12 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_ansidecl_h=no \ --enable-static \ --disable-shared \ --without-python \ - --with-libxml-prefix=$SYSROOT_PREFIX/usr \ + --with-libxml-prefix=${SYSROOT_PREFIX}/usr \ --without-crypto" post_makeinstall_target() { - sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/xslt-config + sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/xslt-config - rm -rf $INSTALL/usr/bin/xsltproc - rm -rf $INSTALL/usr/lib/xsltConf.sh + rm -rf ${INSTALL}/usr/bin/xsltproc + rm -rf ${INSTALL}/usr/lib/xsltConf.sh } diff --git a/packages/textproc/nlohmann-json/package.mk b/packages/textproc/nlohmann-json/package.mk index 8235d68db5..7e66803f6e 100644 --- a/packages/textproc/nlohmann-json/package.mk +++ b/packages/textproc/nlohmann-json/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="3.9.1" PKG_SHA256="4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b" PKG_LICENSE="MIT" PKG_SITE="https://nlohmann.github.io/json/" -PKG_URL="https://github.com/nlohmann/json/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/nlohmann/json/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="JSON for Modern C++" PKG_TOOLCHAIN="cmake" diff --git a/packages/textproc/tinyxml/package.mk b/packages/textproc/tinyxml/package.mk index 86d2dc37b1..36c3fe67d0 100644 --- a/packages/textproc/tinyxml/package.mk +++ b/packages/textproc/tinyxml/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="2.6.2" PKG_SHA256="8164c9ad48b9028667768a584d62f7760cfbfb90d0dd6214ad174403058da10c" PKG_LICENSE="OSS" PKG_SITE="http://www.grinninglizard.com/tinyxml/" -PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-${PKG_VERSION}_2.tar.gz" +PKG_URL="http://mirrors.xbmc.org/build-deps/sources/${PKG_NAME}-${PKG_VERSION}_2.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="TinyXML is a simple, small, C++ XML parser." PKG_TOOLCHAIN="autotools" @@ -15,5 +15,5 @@ PKG_BUILD_FLAGS="+pic" PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared --with-pic" post_makeinstall_target() { - rm -rf $INSTALL/usr + rm -rf ${INSTALL}/usr } diff --git a/packages/textproc/tinyxml2/package.mk b/packages/textproc/tinyxml2/package.mk index 4420b9fe54..eca4fd2cee 100644 --- a/packages/textproc/tinyxml2/package.mk +++ b/packages/textproc/tinyxml2/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="8.0.0" PKG_SHA256="6ce574fbb46751842d23089485ae73d3db12c1b6639cda7721bf3a7ee862012c" PKG_LICENSE="zlib" PKG_SITE="http://www.grinninglizard.com/tinyxml2/index.html" -PKG_URL="https://github.com/leethomason/tinyxml2/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/leethomason/tinyxml2/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="TinyXML2 is a simple, small, C++ XML parser." diff --git a/packages/textproc/xmlstarlet/package.mk b/packages/textproc/xmlstarlet/package.mk index 78967bb28e..09311c05ff 100644 --- a/packages/textproc/xmlstarlet/package.mk +++ b/packages/textproc/xmlstarlet/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.6.1" PKG_SHA256="15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" PKG_LICENSE="MIT" PKG_SITE="http://xmlstar.sourceforge.net" -PKG_URL="http://netcologne.dl.sourceforge.net/project/xmlstar/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://netcologne.dl.sourceforge.net/project/xmlstar/${PKG_NAME}/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="libxml2:host libxslt:host" PKG_DEPENDS_TARGET="toolchain libxml2 libxslt" PKG_LONGDESC="XMLStarlet is a command-line XML utility which allows the modification and validation of XML documents." @@ -14,27 +14,27 @@ PKG_LONGDESC="XMLStarlet is a command-line XML utility which allows the modifica PKG_CONFIGURE_OPTS_HOST=" ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes \ --enable-static-libs \ - LIBXML_CONFIG=$TOOLCHAIN/bin/xml2-config \ - LIBXSLT_CONFIG=$TOOLCHAIN/bin/xslt-config \ - --with-libxml-include-prefix=$TOOLCHAIN/include/libxml2 \ - --with-libxml-libs-prefix=$TOOLCHAIN/lib \ - --with-libxslt-include-prefix=$TOOLCHAIN/include \ - --with-libxslt-libs-prefix=$TOOLCHAIN/lib" + LIBXML_CONFIG=${TOOLCHAIN}/bin/xml2-config \ + LIBXSLT_CONFIG=${TOOLCHAIN}/bin/xslt-config \ + --with-libxml-include-prefix=${TOOLCHAIN}/include/libxml2 \ + --with-libxml-libs-prefix=${TOOLCHAIN}/lib \ + --with-libxslt-include-prefix=${TOOLCHAIN}/include \ + --with-libxslt-libs-prefix=${TOOLCHAIN}/lib" PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes \ --enable-static-libs \ - LIBXML_CONFIG=$SYSROOT_PREFIX/usr/bin/xml2-config \ - LIBXSLT_CONFIG=$SYSROOT_PREFIX/usr/bin/xslt-config \ - --with-libxml-include-prefix=$SYSROOT_PREFIX/usr/include/libxml2 \ - --with-libxml-libs-prefix=$SYSROOT_PREFIX/usr/lib \ - --with-libxslt-include-prefix=$SYSROOT_PREFIX/usr/include \ - --with-libxslt-libs-prefix=$SYSROOT_PREFIX/usr/lib" + LIBXML_CONFIG=${SYSROOT_PREFIX}/usr/bin/xml2-config \ + LIBXSLT_CONFIG=${SYSROOT_PREFIX}/usr/bin/xslt-config \ + --with-libxml-include-prefix=${SYSROOT_PREFIX}/usr/include/libxml2 \ + --with-libxml-libs-prefix=${SYSROOT_PREFIX}/usr/lib \ + --with-libxslt-include-prefix=${SYSROOT_PREFIX}/usr/include \ + --with-libxslt-libs-prefix=${SYSROOT_PREFIX}/usr/lib" post_makeinstall_host() { - ln -sf xml $TOOLCHAIN/bin/xmlstarlet + ln -sf xml ${TOOLCHAIN}/bin/xmlstarlet } post_makeinstall_target() { - ln -sf xml $INSTALL/usr/bin/xmlstarlet + ln -sf xml ${INSTALL}/usr/bin/xmlstarlet } From bd3b212848d97a1b54c517a5a12e192d445b3360 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:19 +0000 Subject: [PATCH 23/27] tools: automated code cleanup Signed-off-by: Ian Leonard --- packages/tools/amlogic-boot-fip/package.mk | 2 +- packages/tools/atf/package.mk | 10 ++-- packages/tools/bcm2835-bootloader/package.mk | 26 ++++----- packages/tools/bcmstat/package.mk | 8 +-- packages/tools/crust/package.mk | 24 ++++---- packages/tools/dtc/package.mk | 18 +++--- packages/tools/exynos-boot-fip/package.mk | 10 ++-- packages/tools/grub/package.mk | 26 ++++----- packages/tools/hdparm/package.mk | 6 +- packages/tools/installer/package.mk | 20 +++---- packages/tools/mkbootimg/package.mk | 6 +- packages/tools/mtools/package.mk | 2 +- packages/tools/newt/package.mk | 10 ++-- packages/tools/plymouth-lite/package.mk | 16 +++--- packages/tools/populatefs/package.mk | 8 +-- packages/tools/procps-ng/package.mk | 8 +-- packages/tools/qemu/package.mk | 18 +++--- packages/tools/rkbin/package.mk | 2 +- packages/tools/rpi-eeprom/package.mk | 2 +- packages/tools/syslinux/package.mk | 58 ++++++++++---------- packages/tools/texturecache.py/package.mk | 10 ++-- packages/tools/u-boot-script/package.mk | 14 ++--- packages/tools/u-boot-tools/package.mk | 6 +- packages/tools/u-boot/package.mk | 50 ++++++++--------- 24 files changed, 180 insertions(+), 180 deletions(-) diff --git a/packages/tools/amlogic-boot-fip/package.mk b/packages/tools/amlogic-boot-fip/package.mk index 9e3728d604..5cfc465bd2 100644 --- a/packages/tools/amlogic-boot-fip/package.mk +++ b/packages/tools/amlogic-boot-fip/package.mk @@ -9,4 +9,4 @@ PKG_SITE="https://github.com/LibreELEC/amlogic-boot-fip" PKG_URL="https://github.com/LibreELEC/amlogic-boot-fip/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Firmware Image Package (FIP) sources used to sign Amlogic u-boot binaries in LibreELEC images" PKG_TOOLCHAIN="manual" -PKG_STAMP="$UBOOT_SYSTEM" +PKG_STAMP="${UBOOT_SYSTEM}" diff --git a/packages/tools/atf/package.mk b/packages/tools/atf/package.mk index c0414c73b5..3774afde4a 100644 --- a/packages/tools/atf/package.mk +++ b/packages/tools/atf/package.mk @@ -7,18 +7,18 @@ PKG_SHA256="4bfda9fdbe5022f2e88ad3344165f7d38a8ae4a0e2d91d44d9a1603425cc642d" PKG_ARCH="arm aarch64" PKG_LICENSE="BSD-3c" PKG_SITE="https://github.com/ARM-software/arm-trusted-firmware" -PKG_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/v$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="ARM Trusted Firmware is a reference implementation of secure world software, including a Secure Monitor executing at Exception Level 3 and various Arm interface standards." PKG_TOOLCHAIN="manual" -[ -n "$KERNEL_TOOLCHAIN" ] && PKG_DEPENDS_TARGET+=" gcc-arm-$KERNEL_TOOLCHAIN:host" +[ -n "${KERNEL_TOOLCHAIN}" ] && PKG_DEPENDS_TARGET+=" gcc-arm-${KERNEL_TOOLCHAIN}:host" make_target() { - CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" CFLAGS="" make PLAT=$ATF_PLATFORM bl31 + CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" CFLAGS="" make PLAT=${ATF_PLATFORM} bl31 } makeinstall_target() { - mkdir -p $INSTALL/usr/share/bootloader - cp -a build/$ATF_PLATFORM/release/bl31.bin $INSTALL/usr/share/bootloader + mkdir -p ${INSTALL}/usr/share/bootloader + cp -a build/${ATF_PLATFORM}/release/bl31.bin ${INSTALL}/usr/share/bootloader } diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 2c1f0c751c..683b7c11fb 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -8,26 +8,26 @@ PKG_SHA256="29ac3bf2be7be35512f8fa99cce2a8d0a305de085a96b5facd81258d63020c0c" PKG_ARCH="arm" PKG_LICENSE="nonfree" PKG_SITE="http://www.broadcom.com" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain linux bcmstat" PKG_LONGDESC="bcm2835-bootloader: Tool to create a bootable kernel for RaspberryPi" PKG_TOOLCHAIN="manual" makeinstall_target() { - mkdir -p $INSTALL/usr/share/bootloader - cp -PRv LICENCE* $INSTALL/usr/share/bootloader - cp -PRv bootcode.bin $INSTALL/usr/share/bootloader - if [ "$DEVICE" = "RPi4" ]; then - cp -PRv fixup4x.dat $INSTALL/usr/share/bootloader/fixup.dat - cp -PRv start4x.elf $INSTALL/usr/share/bootloader/start.elf + mkdir -p ${INSTALL}/usr/share/bootloader + cp -PRv LICENCE* ${INSTALL}/usr/share/bootloader + cp -PRv bootcode.bin ${INSTALL}/usr/share/bootloader + if [ "${DEVICE}" = "RPi4" ]; then + cp -PRv fixup4x.dat ${INSTALL}/usr/share/bootloader/fixup.dat + cp -PRv start4x.elf ${INSTALL}/usr/share/bootloader/start.elf else - cp -PRv fixup_x.dat $INSTALL/usr/share/bootloader/fixup.dat - cp -PRv start_x.elf $INSTALL/usr/share/bootloader/start.elf + cp -PRv fixup_x.dat ${INSTALL}/usr/share/bootloader/fixup.dat + cp -PRv start_x.elf ${INSTALL}/usr/share/bootloader/start.elf fi - find_file_path bootloader/update.sh $PKG_DIR/files/update.sh && cp -PRv $FOUND_PATH $INSTALL/usr/share/bootloader - find_file_path bootloader/canupdate.sh && cp -PRv $FOUND_PATH $INSTALL/usr/share/bootloader + find_file_path bootloader/update.sh ${PKG_DIR}/files/update.sh && cp -PRv ${FOUND_PATH} ${INSTALL}/usr/share/bootloader + find_file_path bootloader/canupdate.sh && cp -PRv ${FOUND_PATH} ${INSTALL}/usr/share/bootloader - find_file_path config/distroconfig.txt $PKG_DIR/files/distroconfig.txt && cp -PRv ${FOUND_PATH} $INSTALL/usr/share/bootloader - find_file_path config/config.txt $PKG_DIR/files/config.txt && cp -PRv ${FOUND_PATH} $INSTALL/usr/share/bootloader + find_file_path config/distroconfig.txt ${PKG_DIR}/files/distroconfig.txt && cp -PRv ${FOUND_PATH} ${INSTALL}/usr/share/bootloader + find_file_path config/config.txt ${PKG_DIR}/files/config.txt && cp -PRv ${FOUND_PATH} ${INSTALL}/usr/share/bootloader } diff --git a/packages/tools/bcmstat/package.mk b/packages/tools/bcmstat/package.mk index e7bdd8b9f1..3065f5e652 100644 --- a/packages/tools/bcmstat/package.mk +++ b/packages/tools/bcmstat/package.mk @@ -6,12 +6,12 @@ PKG_VERSION="0.5.5" PKG_SHA256="faf21907c183ec45ca5a7737a220d3275d24a7d8a387344ed1562849b2d67f27" PKG_LICENSE="GPL" PKG_SITE="https://github.com/MilhouseVH/bcmstat" -PKG_URL="https://github.com/MilhouseVH/$PKG_NAME/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/MilhouseVH/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Raspberry Pi monitoring script" PKG_TOOLCHAIN="manual" makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -PRv bcmstat.sh $INSTALL/usr/bin - chmod +x $INSTALL/usr/bin/* + mkdir -p ${INSTALL}/usr/bin + cp -PRv bcmstat.sh ${INSTALL}/usr/bin + chmod +x ${INSTALL}/usr/bin/* } diff --git a/packages/tools/crust/package.mk b/packages/tools/crust/package.mk index 276afbfe2b..f15baaca0a 100644 --- a/packages/tools/crust/package.mk +++ b/packages/tools/crust/package.mk @@ -11,20 +11,20 @@ PKG_URL="https://github.com/crust-firmware/crust/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="gcc-or1k-linux:host" PKG_LONGDESC="Crust: Libre SCP firmware for Allwinner sunxi SoCs" PKG_TOOLCHAIN="manual" -PKG_STAMP="$UBOOT_SYSTEM" +PKG_STAMP="${UBOOT_SYSTEM}" pre_configure_target() { - export CROSS_COMPILE="$TOOLCHAIN/lib/gcc-or1k-linux/bin/or1k-linux-" + export CROSS_COMPILE="${TOOLCHAIN}/lib/gcc-or1k-linux/bin/or1k-linux-" } make_target() { - if [ -z "$UBOOT_SYSTEM" ]; then + if [ -z "${UBOOT_SYSTEM}" ]; then echo "crust is only built when building an image" exit 0 fi - CRUST_CONFIG=$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM crust_config) - if [ -z "$CRUST_CONFIG" ]; then + CRUST_CONFIG=$(${ROOT}/${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} ${UBOOT_SYSTEM} crust_config) + if [ -z "${CRUST_CONFIG}" ]; then echo "crust_config must be set to build crust firmware" echo "see './scripts/uboot_helper' for more information" exit 0 @@ -32,18 +32,18 @@ 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 - make $CRUST_CONFIG + echo "CONFIG_PMIC_SHUTDOWN=n" >> configs/${CRUST_CONFIG} + echo "CONFIG_CIR=y" >> configs/${CRUST_CONFIG} + make ${CRUST_CONFIG} make scp } makeinstall_target() { - mkdir -p $INSTALL/usr/share/bootloader - cp -a build/scp/scp.bin $INSTALL/usr/share/bootloader + mkdir -p ${INSTALL}/usr/share/bootloader + cp -a build/scp/scp.bin ${INSTALL}/usr/share/bootloader } diff --git a/packages/tools/dtc/package.mk b/packages/tools/dtc/package.mk index a9c0a3a72f..b5d228bc40 100644 --- a/packages/tools/dtc/package.mk +++ b/packages/tools/dtc/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.6.0" PKG_SHA256="af720893485b02441f8812773484b286f969d1b8c98769d435a75c6ad524104b" PKG_LICENSE="GPL" PKG_SITE="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/" -PKG_URL="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$PKG_VERSION.tar.gz" +PKG_URL="https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="The Device Tree Compiler" @@ -16,15 +16,15 @@ PKG_MAKE_OPTS_TARGET="dtc fdtput fdtget libfdt" PKG_MAKE_OPTS_HOST="libfdt" makeinstall_host() { - mkdir -p $TOOLCHAIN/lib - cp -P $PKG_BUILD/libfdt/libfdt.so $TOOLCHAIN/lib + mkdir -p ${TOOLCHAIN}/lib + cp -P ${PKG_BUILD}/libfdt/libfdt.so ${TOOLCHAIN}/lib } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -P $PKG_BUILD/dtc $INSTALL/usr/bin - cp -P $PKG_BUILD/fdtput $INSTALL/usr/bin/ - cp -P $PKG_BUILD/fdtget $INSTALL/usr/bin/ - mkdir -p $INSTALL/usr/lib - cp -P $PKG_BUILD/libfdt/libfdt.so $INSTALL/usr/lib/ + mkdir -p ${INSTALL}/usr/bin + cp -P ${PKG_BUILD}/dtc ${INSTALL}/usr/bin + cp -P ${PKG_BUILD}/fdtput ${INSTALL}/usr/bin/ + cp -P ${PKG_BUILD}/fdtget ${INSTALL}/usr/bin/ + mkdir -p ${INSTALL}/usr/lib + cp -P ${PKG_BUILD}/libfdt/libfdt.so ${INSTALL}/usr/lib/ } diff --git a/packages/tools/exynos-boot-fip/package.mk b/packages/tools/exynos-boot-fip/package.mk index a080dcb32e..201654b8df 100644 --- a/packages/tools/exynos-boot-fip/package.mk +++ b/packages/tools/exynos-boot-fip/package.mk @@ -9,11 +9,11 @@ PKG_SITE="https://github.com/chewitt/exynos-boot-fip" PKG_URL="https://github.com/chewitt/exynos-boot-fip/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="Firmware Image Package (FIP) sources used with Exynos u-boot binaries in LibreELEC images" PKG_TOOLCHAIN="manual" -PKG_STAMP="$UBOOT_SYSTEM" +PKG_STAMP="${UBOOT_SYSTEM}" makeinstall_target() { - mkdir -p $INSTALL/usr/boot - cp -P $PKG_BUILD/bl1.bin.hardkernel $INSTALL/usr/boot - cp -P $PKG_BUILD/bl2.bin.hardkernel.720k_uboot $INSTALL/usr/boot - cp -P $PKG_BUILD/tzsw.bin.hardkernel $INSTALL/usr/boot + mkdir -p ${INSTALL}/usr/boot + cp -P ${PKG_BUILD}/bl1.bin.hardkernel ${INSTALL}/usr/boot + cp -P ${PKG_BUILD}/bl2.bin.hardkernel.720k_uboot ${INSTALL}/usr/boot + cp -P ${PKG_BUILD}/tzsw.bin.hardkernel ${INSTALL}/usr/boot } diff --git a/packages/tools/grub/package.mk b/packages/tools/grub/package.mk index d949bd5953..3f45c2b515 100755 --- a/packages/tools/grub/package.mk +++ b/packages/tools/grub/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="e099d18bdeef5312765f20c6de3384ca9ff03f776f1c7632b1e4bc4d1715a961" PKG_ARCH="x86_64" PKG_LICENSE="GPLv3" PKG_SITE="https://www.gnu.org/software/grub/index.html" -PKG_URL="http://git.savannah.gnu.org/cgit/grub.git/snapshot/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://git.savannah.gnu.org/cgit/grub.git/snapshot/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain flex freetype:host gettext:host" PKG_DEPENDS_UNPACK="gnulib" PKG_LONGDESC="GRUB is a Multiboot boot loader." @@ -24,29 +24,29 @@ pre_configure_target() { unset LDFLAGS unset CPP - cd $PKG_BUILD + cd ${PKG_BUILD} # keep grub synced with gnulib ./bootstrap --gnulib-srcdir=$(get_build_dir gnulib) --copy --no-git --no-bootstrap-sync --skip-po } make_target() { - make CC=$CC \ - AR=$AR \ - RANLIB=$RANLIB \ - CFLAGS="-I$SYSROOT_PREFIX/usr/include -fomit-frame-pointer -D_FILE_OFFSET_BITS=64" \ - LDFLAGS="-L$SYSROOT_PREFIX/usr/lib" + make CC=${CC} \ + AR=${AR} \ + RANLIB=${RANLIB} \ + CFLAGS="-I${SYSROOT_PREFIX}/usr/include -fomit-frame-pointer -D_FILE_OFFSET_BITS=64" \ + LDFLAGS="-L${SYSROOT_PREFIX}/usr/lib" } makeinstall_target() { - cd $PKG_BUILD/grub-core - $PKG_BUILD/grub-mkimage -d . -o bootia32.efi -O i386-efi -p /EFI/BOOT \ + cd ${PKG_BUILD}/grub-core + ${PKG_BUILD}/grub-mkimage -d . -o bootia32.efi -O i386-efi -p /EFI/BOOT \ boot chain configfile ext2 fat linux search \ efi_gop efi_uga part_gpt gzio \ gettext loadenv loadbios memrw - mkdir -p $INSTALL/usr/share/grub - cp -P $PKG_BUILD/grub-core/bootia32.efi $INSTALL/usr/share/grub + mkdir -p ${INSTALL}/usr/share/grub + cp -P ${PKG_BUILD}/grub-core/bootia32.efi ${INSTALL}/usr/share/grub - mkdir -p $TOOLCHAIN/share/grub - cp -P $PKG_BUILD/grub-core/bootia32.efi $TOOLCHAIN/share/grub + mkdir -p ${TOOLCHAIN}/share/grub + cp -P ${PKG_BUILD}/grub-core/bootia32.efi ${TOOLCHAIN}/share/grub } diff --git a/packages/tools/hdparm/package.mk b/packages/tools/hdparm/package.mk index f5f2dbdf5d..bb4833ad0c 100644 --- a/packages/tools/hdparm/package.mk +++ b/packages/tools/hdparm/package.mk @@ -7,11 +7,11 @@ PKG_VERSION="9.60" PKG_SHA256="8397739c73e44d5ab96c4aef28fa9c0147276d53a1b5657ce04c4565cf6635cc" PKG_LICENSE="BSD" PKG_SITE="http://sourceforge.net/projects/hdparm/" -PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="${SOURCEFORGE_SRC}/${PKG_NAME}/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Shell utility to access/tune ioctl features of the Linux IDE driver and IDE drives." makeinstall_target() { - mkdir -p $INSTALL/usr/sbin - cp -a $PKG_BUILD/hdparm $INSTALL/usr/sbin + mkdir -p ${INSTALL}/usr/sbin + cp -a ${PKG_BUILD}/hdparm ${INSTALL}/usr/sbin } diff --git a/packages/tools/installer/package.mk b/packages/tools/installer/package.mk index 6125d76624..dc0516be08 100644 --- a/packages/tools/installer/package.mk +++ b/packages/tools/installer/package.mk @@ -11,18 +11,18 @@ PKG_LONGDESC="LibreELEC.tv Install manager to install the system on any disk" PKG_TOOLCHAIN="manual" post_install() { - mkdir -p $INSTALL/usr/bin - cp $PKG_DIR/scripts/installer $INSTALL/usr/bin - sed -e "s/@DISTRONAME@/$DISTRONAME/g" \ - -i $INSTALL/usr/bin/installer + mkdir -p ${INSTALL}/usr/bin + cp ${PKG_DIR}/scripts/installer ${INSTALL}/usr/bin + sed -e "s/@DISTRONAME@/${DISTRONAME}/g" \ + -i ${INSTALL}/usr/bin/installer - mkdir -p $INSTALL/etc + mkdir -p ${INSTALL}/etc find_file_path config/installer.conf - cp ${FOUND_PATH} $INSTALL/etc - sed -e "s/@SYSTEM_SIZE@/$SYSTEM_SIZE/g" \ - -e "s/@SYSTEM_PART_START@/$SYSTEM_PART_START/g" \ - -e "s/@SYSLINUX_PARAMETERS@/$SYSLINUX_PARAMETERS/g" \ - -i $INSTALL/etc/installer.conf + cp ${FOUND_PATH} ${INSTALL}/etc + sed -e "s/@SYSTEM_SIZE@/${SYSTEM_SIZE}/g" \ + -e "s/@SYSTEM_PART_START@/${SYSTEM_PART_START}/g" \ + -e "s/@SYSLINUX_PARAMETERS@/${SYSLINUX_PARAMETERS}/g" \ + -i ${INSTALL}/etc/installer.conf enable_service installer.service } diff --git a/packages/tools/mkbootimg/package.mk b/packages/tools/mkbootimg/package.mk index a3b0ca02c0..ce2cf2511e 100644 --- a/packages/tools/mkbootimg/package.mk +++ b/packages/tools/mkbootimg/package.mk @@ -7,11 +7,11 @@ PKG_VERSION="6668fc24a3130ab003aae9fda95bcd4110617de9" PKG_SHA256="d84870e055414d638a3e7eb4b7a3ebf415899841218f24cb3647d06ecf6ddb17" PKG_LICENSE="GPL" PKG_SITE="https://android.googlesource.com/platform/system/core/+/master/mkbootimg/" -PKG_URL="https://github.com/codesnake/mkbootimg/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/codesnake/mkbootimg/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="toolchain:host" PKG_LONGDESC="mkbootimg: Creates kernel boot images for Android" makeinstall_host() { - mkdir -p $SYSROOT_PREFIX/usr/include - cp mkbootimg $TOOLCHAIN/bin/ + mkdir -p ${SYSROOT_PREFIX}/usr/include + cp mkbootimg ${TOOLCHAIN}/bin/ } diff --git a/packages/tools/mtools/package.mk b/packages/tools/mtools/package.mk index e48b5c3eb3..c62c6e12a8 100644 --- a/packages/tools/mtools/package.mk +++ b/packages/tools/mtools/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="4.0.26" PKG_SHA256="539f1c8b476a16e198d8bcb10a5799e22e69de49d854f7dbd85b64c2a45dea1a" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/mtools/" -PKG_URL="http://ftpmirror.gnu.org/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://ftpmirror.gnu.org/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_HOST="toolchain:host" PKG_LONGDESC="mtools: A collection of utilities to access MS-DOS disks" PKG_TOOLCHAIN="autotools" diff --git a/packages/tools/newt/package.mk b/packages/tools/newt/package.mk index 6eaece09e2..f39c336d5e 100644 --- a/packages/tools/newt/package.mk +++ b/packages/tools/newt/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="0.52.21" PKG_SHA256="265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31" PKG_LICENSE="GPL" PKG_SITE="https://pagure.io/newt" -PKG_URL="https://releases.pagure.org/newt/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://releases.pagure.org/newt/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain slang popt" PKG_LONGDESC="Newt is a programming library for color text mode, widget based user interfaces." PKG_TOOLCHAIN="autotools" @@ -17,12 +17,12 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-nls \ pre_configure_target() { # newt fails to build in subdirs - cd $PKG_BUILD - rm -rf .$TARGET_NAME + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME} } pre_configure_host() { # newt fails to build in subdirs - cd $PKG_BUILD - rm -rf .$HOST_NAME + cd ${PKG_BUILD} + rm -rf .${HOST_NAME} } diff --git a/packages/tools/plymouth-lite/package.mk b/packages/tools/plymouth-lite/package.mk index 59f39a7283..f3cad5bef1 100644 --- a/packages/tools/plymouth-lite/package.mk +++ b/packages/tools/plymouth-lite/package.mk @@ -6,21 +6,21 @@ PKG_VERSION="0.6.0" PKG_SHA256="fa7b581bdd38c5751668243ff9d2ebaee7c45753358cbb310fb50cfcd3a8081b" PKG_LICENSE="GPL" PKG_SITE="http://www.meego.com" -PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="${DISTRO_SRC}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_INIT="toolchain gcc:init libpng" PKG_LONGDESC="Boot splash screen based on Fedora's Plymouth code" pre_configure_init() { # plymouth-lite dont support to build in subdirs - cd $PKG_BUILD - rm -rf .$TARGET_NAME-init + cd ${PKG_BUILD} + rm -rf .${TARGET_NAME}-init } makeinstall_init() { - mkdir -p $INSTALL/usr/bin - cp ply-image $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp ply-image ${INSTALL}/usr/bin - mkdir -p $INSTALL/splash - find_file_path splash/splash.conf && cp ${FOUND_PATH} $INSTALL/splash - find_file_path "splash/splash-*.png" && cp ${FOUND_PATH} $INSTALL/splash + mkdir -p ${INSTALL}/splash + find_file_path splash/splash.conf && cp ${FOUND_PATH} ${INSTALL}/splash + find_file_path "splash/splash-*.png" && cp ${FOUND_PATH} ${INSTALL}/splash } diff --git a/packages/tools/populatefs/package.mk b/packages/tools/populatefs/package.mk index 196dca1cbb..e94a1f9160 100644 --- a/packages/tools/populatefs/package.mk +++ b/packages/tools/populatefs/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.0" PKG_SHA256="e5845404188b5da3afb11229ecb38646cc1562b61400035774dbc237c3b706d2" PKG_LICENSE="GPL" PKG_SITE="https://github.com/lipnitsk/populatefs" -PKG_URL="https://github.com/lipnitsk/$PKG_NAME/archive/v${PKG_VERSION}.tar.gz" +PKG_URL="https://github.com/lipnitsk/${PKG_NAME}/archive/v${PKG_VERSION}.tar.gz" PKG_DEPENDS_HOST="e2fsprogs:host" PKG_LONGDESC="populatefs: Tool for replacing genext2fs when creating ext4 images" PKG_BUILD_FLAGS="+pic:host" @@ -16,8 +16,8 @@ make_host() { } makeinstall_host() { - $STRIP src/populatefs + ${STRIP} src/populatefs - mkdir -p $TOOLCHAIN/sbin - cp src/populatefs $TOOLCHAIN/sbin + mkdir -p ${TOOLCHAIN}/sbin + cp src/populatefs ${TOOLCHAIN}/sbin } diff --git a/packages/tools/procps-ng/package.mk b/packages/tools/procps-ng/package.mk index 2a6c522b07..77d593f5d0 100644 --- a/packages/tools/procps-ng/package.mk +++ b/packages/tools/procps-ng/package.mk @@ -23,9 +23,9 @@ PKG_MAKE_OPTS_TARGET="free top/top proc/libprocps.la proc/libprocps.pc" PKG_MAKEINSTALL_OPTS_TARGET="install-libLTLIBRARIES install-pkgconfigDATA" makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -P $PKG_BUILD/.$TARGET_NAME/free $INSTALL/usr/bin - cp -P $PKG_BUILD/.$TARGET_NAME/top/top $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp -P ${PKG_BUILD}/.${TARGET_NAME}/free ${INSTALL}/usr/bin + cp -P ${PKG_BUILD}/.${TARGET_NAME}/top/top ${INSTALL}/usr/bin - make DESTDIR=$SYSROOT_PREFIX -j1 $PKG_MAKEINSTALL_OPTS_TARGET + make DESTDIR=${SYSROOT_PREFIX} -j1 ${PKG_MAKEINSTALL_OPTS_TARGET} } diff --git a/packages/tools/qemu/package.mk b/packages/tools/qemu/package.mk index 5f30788e64..e4f787fd60 100644 --- a/packages/tools/qemu/package.mk +++ b/packages/tools/qemu/package.mk @@ -6,20 +6,20 @@ PKG_VERSION="4.0.0" PKG_SHA256="13a93dfe75b86734326f8d5b475fde82ec692d5b5a338b4262aeeb6b0fa4e469" PKG_LICENSE="GPL" PKG_SITE="http://wiki.qemu.org" -PKG_URL="https://download.qemu.org/qemu-$PKG_VERSION.tar.xz" +PKG_URL="https://download.qemu.org/qemu-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="toolchain:host glib:host pixman:host Python3:host zlib:host" PKG_LONGDESC="QEMU is a generic and open source machine emulator and virtualizer." pre_configure_host() { - HOST_CONFIGURE_OPTS="--bindir=$TOOLCHAIN/bin \ - --extra-cflags=-I$TOOLCHAIN/include \ - --extra-ldflags=-L$TOOLCHAIN/lib \ - --libexecdir=$TOOLCHAIN/lib \ - --localstatedir=$TOOLCHAIN/var \ - --prefix=$TOOLCHAIN \ - --sbindir=$TOOLCHAIN/sbin \ + HOST_CONFIGURE_OPTS="--bindir=${TOOLCHAIN}/bin \ + --extra-cflags=-I${TOOLCHAIN}/include \ + --extra-ldflags=-L${TOOLCHAIN}/lib \ + --libexecdir=${TOOLCHAIN}/lib \ + --localstatedir=${TOOLCHAIN}/var \ + --prefix=${TOOLCHAIN} \ + --sbindir=${TOOLCHAIN}/sbin \ --static \ - --sysconfdir=$TOOLCHAIN/etc \ + --sysconfdir=${TOOLCHAIN}/etc \ --disable-blobs \ --disable-docs \ --disable-gcrypt \ diff --git a/packages/tools/rkbin/package.mk b/packages/tools/rkbin/package.mk index e37a1cf1fb..38dde0b931 100644 --- a/packages/tools/rkbin/package.mk +++ b/packages/tools/rkbin/package.mk @@ -8,6 +8,6 @@ PKG_SHA256="0b3479117700bce9afea2110c1f027b626c76d99045802218b35a53606547d60" PKG_ARCH="arm aarch64" PKG_LICENSE="nonfree" PKG_SITE="https://github.com/rockchip-linux/rkbin" -PKG_URL="https://github.com/rockchip-linux/rkbin/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/rockchip-linux/rkbin/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="rkbin: Rockchip Firmware and Tool Binaries" PKG_TOOLCHAIN="manual" diff --git a/packages/tools/rpi-eeprom/package.mk b/packages/tools/rpi-eeprom/package.mk index f06db0d790..abfc6969a2 100644 --- a/packages/tools/rpi-eeprom/package.mk +++ b/packages/tools/rpi-eeprom/package.mk @@ -17,7 +17,7 @@ makeinstall_target() { mkdir -p ${DESTDIR} _dirs="critical stable" - [ "$LIBREELEC_VERSION" = "devel" ] && _dirs+=" beta" + [ "${LIBREELEC_VERSION}" = "devel" ] && _dirs+=" beta" for _maindir in ${_dirs}; do for _dir in ${PKG_BUILD}/firmware/${_maindir} ${PKG_BUILD}/firmware/{_maindir}-*; do diff --git a/packages/tools/syslinux/package.mk b/packages/tools/syslinux/package.mk index f47bcee789..bc4d037aa1 100644 --- a/packages/tools/syslinux/package.mk +++ b/packages/tools/syslinux/package.mk @@ -8,13 +8,13 @@ PKG_SHA256="26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="http://syslinux.zytor.com/" -PKG_URL="http://www.kernel.org/pub/linux/utils/boot/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://www.kernel.org/pub/linux/utils/boot/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="util-linux:host" PKG_DEPENDS_TARGET="toolchain util-linux e2fsprogs syslinux:host" PKG_LONGDESC="The SYSLINUX project covers lightweight linux bootloaders." pre_configure_target() { - PKG_MAKE_OPTS_TARGET="CC=$CC AR=$AR RANLIB=$RANLIB installer" + PKG_MAKE_OPTS_TARGET="CC=${CC} AR=${AR} RANLIB=${RANLIB} installer" # Unset all compiler FLAGS unset CFLAGS @@ -24,53 +24,53 @@ pre_configure_target() { } pre_build_target() { - mkdir -p $PKG_BUILD/.$TARGET_NAME - cp -RP $PKG_BUILD/* $PKG_BUILD/.$TARGET_NAME + mkdir -p ${PKG_BUILD}/.${TARGET_NAME} + cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${TARGET_NAME} } pre_build_host() { - mkdir -p $PKG_BUILD/.$HOST_NAME - cp -RP $PKG_BUILD/* $PKG_BUILD/.$HOST_NAME + mkdir -p ${PKG_BUILD}/.${HOST_NAME} + cp -RP ${PKG_BUILD}/* ${PKG_BUILD}/.${HOST_NAME} } pre_make_target() { - cd .$TARGET_NAME + cd .${TARGET_NAME} } pre_make_host() { - cd .$HOST_NAME + cd .${HOST_NAME} } make_host() { - make CC=$CC \ - AR=$AR \ - RANLIB=$RANLIB \ - CFLAGS="-I$TOOLCHAIN/include -I$PKG_BUILD/libinstaller -I$PKG_BUILD/libfat -I$PKG_BUILD/bios -I$PKG_BUILD/utils -fomit-frame-pointer -D_FILE_OFFSET_BITS=64" \ - LDFLAGS="-L$TOOLCHAIN/lib" \ + make CC=${CC} \ + AR=${AR} \ + RANLIB=${RANLIB} \ + CFLAGS="-I${TOOLCHAIN}/include -I${PKG_BUILD}/libinstaller -I${PKG_BUILD}/libfat -I${PKG_BUILD}/bios -I${PKG_BUILD}/utils -fomit-frame-pointer -D_FILE_OFFSET_BITS=64" \ + LDFLAGS="-L${TOOLCHAIN}/lib" \ installer } makeinstall_host() { - mkdir -p $TOOLCHAIN/bin - cp bios/linux/syslinux $TOOLCHAIN/bin - cp bios/mtools/syslinux $TOOLCHAIN/bin/syslinux.mtools + mkdir -p ${TOOLCHAIN}/bin + cp bios/linux/syslinux ${TOOLCHAIN}/bin + cp bios/mtools/syslinux ${TOOLCHAIN}/bin/syslinux.mtools - mkdir -p $TOOLCHAIN/share/syslinux - cp bios/mbr/mbr.bin $TOOLCHAIN/share/syslinux - cp bios/mbr/gptmbr.bin $TOOLCHAIN/share/syslinux - cp efi64/efi/syslinux.efi $TOOLCHAIN/share/syslinux/bootx64.efi - cp efi64/com32/elflink/ldlinux/ldlinux.e64 $TOOLCHAIN/share/syslinux + mkdir -p ${TOOLCHAIN}/share/syslinux + cp bios/mbr/mbr.bin ${TOOLCHAIN}/share/syslinux + cp bios/mbr/gptmbr.bin ${TOOLCHAIN}/share/syslinux + cp efi64/efi/syslinux.efi ${TOOLCHAIN}/share/syslinux/bootx64.efi + cp efi64/com32/elflink/ldlinux/ldlinux.e64 ${TOOLCHAIN}/share/syslinux } makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp bios/linux/syslinux $INSTALL/usr/bin + mkdir -p ${INSTALL}/usr/bin + cp bios/linux/syslinux ${INSTALL}/usr/bin - $STRIP $INSTALL/usr/bin/syslinux + ${STRIP} ${INSTALL}/usr/bin/syslinux - mkdir -p $INSTALL/usr/share/syslinux - cp bios/mbr/mbr.bin $INSTALL/usr/share/syslinux - cp bios/mbr/gptmbr.bin $INSTALL/usr/share/syslinux - cp efi64/efi/syslinux.efi $INSTALL/usr/share/syslinux/bootx64.efi - cp efi64/com32/elflink/ldlinux/ldlinux.e64 $INSTALL/usr/share/syslinux + mkdir -p ${INSTALL}/usr/share/syslinux + cp bios/mbr/mbr.bin ${INSTALL}/usr/share/syslinux + cp bios/mbr/gptmbr.bin ${INSTALL}/usr/share/syslinux + cp efi64/efi/syslinux.efi ${INSTALL}/usr/share/syslinux/bootx64.efi + cp efi64/com32/elflink/ldlinux/ldlinux.e64 ${INSTALL}/usr/share/syslinux } diff --git a/packages/tools/texturecache.py/package.mk b/packages/tools/texturecache.py/package.mk index b12eb442d4..802f7b4537 100644 --- a/packages/tools/texturecache.py/package.mk +++ b/packages/tools/texturecache.py/package.mk @@ -6,13 +6,13 @@ PKG_VERSION="2.5.4" PKG_SHA256="0717c2e62dc3f809e8754be2c83d2c7d0f92188741eb425d5377c1d326d25276" PKG_LICENSE="GPL" PKG_SITE="https://github.com/MilhouseVH/texturecache.py" -PKG_URL="https://github.com/MilhouseVH/$PKG_NAME/archive/$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/MilhouseVH/${PKG_NAME}/archive/${PKG_VERSION}.tar.gz" PKG_LONGDESC="The Swiss Army knife for Kodi" PKG_TOOLCHAIN="manual" makeinstall_target() { - mkdir -p $INSTALL/usr/bin - cp -PRv texturecache.py $INSTALL/usr/bin - cp -PRv tools/mklocal.py $INSTALL/usr/bin - chmod +x $INSTALL/usr/bin/* + mkdir -p ${INSTALL}/usr/bin + cp -PRv texturecache.py ${INSTALL}/usr/bin + cp -PRv tools/mklocal.py ${INSTALL}/usr/bin + chmod +x ${INSTALL}/usr/bin/* } diff --git a/packages/tools/u-boot-script/package.mk b/packages/tools/u-boot-script/package.mk index 808cb5f499..3ada32eeca 100644 --- a/packages/tools/u-boot-script/package.mk +++ b/packages/tools/u-boot-script/package.mk @@ -8,18 +8,18 @@ PKG_DEPENDS_TARGET="u-boot-tools:host" PKG_TOOLCHAIN="manual" PKG_LONGDESC="Compile scripts for u-boot environment." -PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader" -[ -n "$DEVICE" ] && PKG_NEED_UNPACK+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader" +PKG_NEED_UNPACK="${PROJECT_DIR}/${PROJECT}/bootloader" +[ -n "${DEVICE}" ] && PKG_NEED_UNPACK+=" ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/bootloader" make_target() { - if find_dir_path bootloader/scripts ; then - for src in $FOUND_PATH/*.src ; do - mkimage -A $TARGET_KERNEL_ARCH -O linux -T script -C none -d "$src" "$(basename $src .src)" + if find_dir_path bootloader/scripts; then + for src in ${FOUND_PATH}/*.src; do + mkimage -A ${TARGET_KERNEL_ARCH} -O linux -T script -C none -d "${src}" "$(basename ${src} .src)" done fi } makeinstall_target() { - mkdir -p $INSTALL/usr/share/bootloader - cp -a $PKG_BUILD/* $INSTALL/usr/share/bootloader/ + mkdir -p ${INSTALL}/usr/share/bootloader + cp -a ${PKG_BUILD}/* ${INSTALL}/usr/share/bootloader/ } diff --git a/packages/tools/u-boot-tools/package.mk b/packages/tools/u-boot-tools/package.mk index 60d7f0c864..1fa15b30d8 100644 --- a/packages/tools/u-boot-tools/package.mk +++ b/packages/tools/u-boot-tools/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="2021.01" PKG_SHA256="b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454" PKG_LICENSE="GPL" PKG_SITE="https://www.denx.de/wiki/U-Boot" -PKG_URL="http://ftp.denx.de/pub/u-boot/u-boot-$PKG_VERSION.tar.bz2" +PKG_URL="http://ftp.denx.de/pub/u-boot/u-boot-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_HOST="ccache:host bison:host flex:host" PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems." @@ -20,6 +20,6 @@ make_target() { } makeinstall_host() { - mkdir -p $TOOLCHAIN/bin - cp tools/mkimage $TOOLCHAIN/bin + mkdir -p ${TOOLCHAIN}/bin + cp tools/mkimage ${TOOLCHAIN}/bin } diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index af8550034c..eed24ae828 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -9,69 +9,69 @@ PKG_SITE="https://www.denx.de/wiki/U-Boot" PKG_DEPENDS_TARGET="toolchain Python3:host swig:host" PKG_LONGDESC="Das U-Boot is a cross-platform bootloader for embedded systems." -PKG_STAMP="$UBOOT_SYSTEM $UBOOT_TARGET" +PKG_STAMP="${UBOOT_SYSTEM} ${UBOOT_TARGET}" -[ -n "$KERNEL_TOOLCHAIN" ] && PKG_DEPENDS_TARGET+=" gcc-arm-$KERNEL_TOOLCHAIN:host" +[ -n "${KERNEL_TOOLCHAIN}" ] && PKG_DEPENDS_TARGET+=" gcc-arm-${KERNEL_TOOLCHAIN}:host" -if [ -n "$UBOOT_FIRMWARE" ]; then - PKG_DEPENDS_TARGET+=" $UBOOT_FIRMWARE" - PKG_DEPENDS_UNPACK+=" $UBOOT_FIRMWARE" +if [ -n "${UBOOT_FIRMWARE}" ]; then + PKG_DEPENDS_TARGET+=" ${UBOOT_FIRMWARE}" + PKG_DEPENDS_UNPACK+=" ${UBOOT_FIRMWARE}" fi -PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader" -[ -n "$DEVICE" ] && PKG_NEED_UNPACK+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader" +PKG_NEED_UNPACK="${PROJECT_DIR}/${PROJECT}/bootloader" +[ -n "${DEVICE}" ] && PKG_NEED_UNPACK+=" ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/bootloader" -case "$PROJECT" in +case "${PROJECT}" in Rockchip) PKG_VERSION="8659d08d2b589693d121c1298484e861b7dafc4f" PKG_SHA256="3f9f2bbd0c28be6d7d6eb909823fee5728da023aca0ce37aef3c8f67d1179ec1" - PKG_URL="https://github.com/rockchip-linux/u-boot/archive/$PKG_VERSION.tar.gz" + PKG_URL="https://github.com/rockchip-linux/u-boot/archive/${PKG_VERSION}.tar.gz" PKG_PATCH_DIRS="rockchip" ;; *) PKG_VERSION="2021.01" PKG_SHA256="b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454" - PKG_URL="http://ftp.denx.de/pub/u-boot/$PKG_NAME-$PKG_VERSION.tar.bz2" + PKG_URL="http://ftp.denx.de/pub/u-boot/${PKG_NAME}-${PKG_VERSION}.tar.bz2" ;; esac 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" + 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}" fi fi } make_target() { - if [ -z "$UBOOT_SYSTEM" ]; then + if [ -z "${UBOOT_SYSTEM}" ]; then echo "UBOOT_SYSTEM must be set to build an image" echo "see './scripts/uboot_helper' for more information" else [ "${BUILD_WITH_DEBUG}" = "yes" ] && PKG_DEBUG=1 || PKG_DEBUG=0 - DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm make mrproper - [ -n "$UBOOT_FIRMWARE" ] && find_file_path bootloader/firmware && . ${FOUND_PATH} - DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm make $($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM config) - DEBUG=${PKG_DEBUG} CROSS_COMPILE="$TARGET_KERNEL_PREFIX" LDFLAGS="" ARCH=arm _python_sysroot="$TOOLCHAIN" _python_prefix=/ _python_exec_prefix=/ make $UBOOT_TARGET HOSTCC="$HOST_CC" HOSTLDFLAGS="-L$TOOLCHAIN/lib" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc" + DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm make mrproper + [ -n "${UBOOT_FIRMWARE}" ] && find_file_path bootloader/firmware && . ${FOUND_PATH} + DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm make $(${ROOT}/${SCRIPTS}/uboot_helper ${PROJECT} ${DEVICE} ${UBOOT_SYSTEM} config) + DEBUG=${PKG_DEBUG} CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="" ARCH=arm _python_sysroot="${TOOLCHAIN}" _python_prefix=/ _python_exec_prefix=/ make ${UBOOT_TARGET} HOSTCC="${HOST_CC}" HOSTLDFLAGS="-L${TOOLCHAIN}/lib" HOSTSTRIP="true" CONFIG_MKIMAGE_DTC_PATH="scripts/dtc/dtc" fi } makeinstall_target() { - mkdir -p $INSTALL/usr/share/bootloader + mkdir -p ${INSTALL}/usr/share/bootloader # Only install u-boot.img et al when building a board specific image - if [ -n "$UBOOT_SYSTEM" ]; then + if [ -n "${UBOOT_SYSTEM}" ]; then find_file_path bootloader/install && . ${FOUND_PATH} fi # Always install the update script - find_file_path bootloader/update.sh && cp -av ${FOUND_PATH} $INSTALL/usr/share/bootloader + find_file_path bootloader/update.sh && cp -av ${FOUND_PATH} ${INSTALL}/usr/share/bootloader # Always install the canupdate script if find_file_path bootloader/canupdate.sh; then - cp -av ${FOUND_PATH} $INSTALL/usr/share/bootloader - sed -e "s/@PROJECT@/${DEVICE:-$PROJECT}/g" \ - -i $INSTALL/usr/share/bootloader/canupdate.sh + cp -av ${FOUND_PATH} ${INSTALL}/usr/share/bootloader + sed -e "s/@PROJECT@/${DEVICE:-${PROJECT}}/g" \ + -i ${INSTALL}/usr/share/bootloader/canupdate.sh fi } From e501e0c75a546a9e0845f83eb34a77d22231798f Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:20 +0000 Subject: [PATCH 24/27] virtual: automated code cleanup Signed-off-by: Ian Leonard --- packages/virtual/corefonts/package.mk | 6 ++--- packages/virtual/debug/package.mk | 16 ++++++------- packages/virtual/image/package.mk | 20 ++++++++-------- packages/virtual/initramfs/package.mk | 8 +++---- packages/virtual/libc/package.mk | 4 ++-- packages/virtual/linux-drivers/package.mk | 6 ++--- packages/virtual/linux-firmware/package.mk | 2 +- packages/virtual/mediacenter/package.mk | 28 +++++++++++----------- packages/virtual/misc-packages/package.mk | 2 +- packages/virtual/network/package.mk | 20 ++++++++-------- packages/virtual/virtual/package.mk | 2 +- packages/virtual/x11/package.mk | 20 ++++++++-------- 12 files changed, 67 insertions(+), 67 deletions(-) diff --git a/packages/virtual/corefonts/package.mk b/packages/virtual/corefonts/package.mk index c269c60b38..b6bf482f6d 100644 --- a/packages/virtual/corefonts/package.mk +++ b/packages/virtual/corefonts/package.mk @@ -10,8 +10,8 @@ PKG_DEPENDS_TARGET="toolchain" PKG_SECTION="virtual" PKG_LONGDESC="corefonts is a Metapackage for installing fonts" -if [ -n "$CUSTOM_FONTS" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $CUSTOM_FONTS" +if [ -n "${CUSTOM_FONTS}" ]; then + PKG_DEPENDS_TARGET+=" ${CUSTOM_FONTS}" else - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET liberation-fonts-ttf" + PKG_DEPENDS_TARGET+=" liberation-fonts-ttf" fi diff --git a/packages/virtual/debug/package.mk b/packages/virtual/debug/package.mk index b12030eff6..bc1a2c5982 100644 --- a/packages/virtual/debug/package.mk +++ b/packages/virtual/debug/package.mk @@ -13,18 +13,18 @@ PKG_LONGDESC="debug is a Metapackage for installing debugging tools" # configure GPU drivers and dependencies: get_graphicdrivers -if [ "$VDPAU_SUPPORT" = "yes" -a "$DISPLAYSERVER" = "x11" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET vdpauinfo" +if [ "${VDPAU_SUPPORT}" = "yes" -a "${DISPLAYSERVER}" = "x11" ]; then + PKG_DEPENDS_TARGET+=" vdpauinfo" fi -if [ "$VAAPI_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libva-utils" +if [ "${VAAPI_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" libva-utils" fi -if build_with_debug && [ "$VALGRIND" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET valgrind" +if build_with_debug && [ "${VALGRIND}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" valgrind" fi -if [ "$REMOTE_GDB" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gdb:host" +if [ "${REMOTE_GDB}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" gdb:host" fi diff --git a/packages/virtual/image/package.mk b/packages/virtual/image/package.mk index 1b4b85568f..d2d3957730 100644 --- a/packages/virtual/image/package.mk +++ b/packages/virtual/image/package.mk @@ -9,33 +9,33 @@ PKG_SECTION="virtual" PKG_LONGDESC="Root package used to build and create complete image" # Graphic support -[ ! "$DISPLAYSERVER" = "no" ] && PKG_DEPENDS_TARGET+=" $DISPLAYSERVER" +[ ! "${DISPLAYSERVER}" = "no" ] && PKG_DEPENDS_TARGET+=" ${DISPLAYSERVER}" # Multimedia support -[ ! "$MEDIACENTER" = "no" ] && PKG_DEPENDS_TARGET+=" mediacenter" +[ ! "${MEDIACENTER}" = "no" ] && PKG_DEPENDS_TARGET+=" mediacenter" # Sound support -[ "$ALSA_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" alsa" +[ "${ALSA_SUPPORT}" = "yes" ] && PKG_DEPENDS_TARGET+=" alsa" # Automounter support -[ "$UDEVIL" = "yes" ] && PKG_DEPENDS_TARGET+=" udevil" +[ "${UDEVIL}" = "yes" ] && PKG_DEPENDS_TARGET+=" udevil" # NTFS 3G support -[ "$NTFS3G" = "yes" ] && PKG_DEPENDS_TARGET+=" ntfs-3g_ntfsprogs" +[ "${NTFS3G}" = "yes" ] && PKG_DEPENDS_TARGET+=" ntfs-3g_ntfsprogs" # Remote support -[ "$REMOTE_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" remote" +[ "${REMOTE_SUPPORT}" = "yes" ] && PKG_DEPENDS_TARGET+=" remote" # Virtual image creation support -[ "$PROJECT" = "Generic" ] && PKG_DEPENDS_TARGET+=" virtual" +[ "${PROJECT}" = "Generic" ] && PKG_DEPENDS_TARGET+=" virtual" # Installer support -[ "$INSTALLER_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" installer" +[ "${INSTALLER_SUPPORT}" = "yes" ] && PKG_DEPENDS_TARGET+=" installer" # Devtools... (not for Release) -[ "$TESTING" = "yes" ] && PKG_DEPENDS_TARGET+=" testing" +[ "${TESTING}" = "yes" ] && PKG_DEPENDS_TARGET+=" testing" # OEM packages -[ "$OEM_SUPPORT" = "yes" ] && PKG_DEPENDS_TARGET+=" oem" +[ "${OEM_SUPPORT}" = "yes" ] && PKG_DEPENDS_TARGET+=" oem" true diff --git a/packages/virtual/initramfs/package.mk b/packages/virtual/initramfs/package.mk index 65e5ce4bf5..7bd69ecd7a 100644 --- a/packages/virtual/initramfs/package.mk +++ b/packages/virtual/initramfs/package.mk @@ -12,14 +12,14 @@ PKG_DEPENDS_TARGET="toolchain initramfs:init" PKG_SECTION="virtual" PKG_LONGDESC="Metapackage for installing initramfs" -if [ "$ISCSI_SUPPORT" = yes ]; then +if [ "${ISCSI_SUPPORT}" = yes ]; then PKG_DEPENDS_INIT+=" open-iscsi:init" fi -if [ "$INITRAMFS_PARTED_SUPPORT" = yes ]; then +if [ "${INITRAMFS_PARTED_SUPPORT}" = yes ]; then PKG_DEPENDS_INIT+=" parted:init" fi -for i in $PKG_DEPENDS_INIT; do - PKG_NEED_UNPACK+=" $(get_pkg_directory $i)" +for i in ${PKG_DEPENDS_INIT}; do + PKG_NEED_UNPACK+=" $(get_pkg_directory ${i})" done diff --git a/packages/virtual/libc/package.mk b/packages/virtual/libc/package.mk index 01f646d185..4535bb3088 100644 --- a/packages/virtual/libc/package.mk +++ b/packages/virtual/libc/package.mk @@ -13,6 +13,6 @@ PKG_SECTION="virtual" PKG_LONGDESC="Meta package for installing various tools and libs needed for libc" if [ "${TARGET_ARCH}" = "arm" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET arm-mem" - PKG_DEPENDS_INIT="$PKG_DEPENDS_INIT arm-mem:init" + PKG_DEPENDS_TARGET+=" arm-mem" + PKG_DEPENDS_INIT+=" arm-mem:init" fi diff --git a/packages/virtual/linux-drivers/package.mk b/packages/virtual/linux-drivers/package.mk index 5933bc45ec..56eb39c3ba 100644 --- a/packages/virtual/linux-drivers/package.mk +++ b/packages/virtual/linux-drivers/package.mk @@ -6,10 +6,10 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain $ADDITIONAL_DRIVERS" +PKG_DEPENDS_TARGET="toolchain ${ADDITIONAL_DRIVERS}" PKG_SECTION="virtual" PKG_LONGDESC="linux-drivers is a Meta package to install additional drivers" -if [ "$DRIVER_ADDONS_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $DRIVER_ADDONS driverselect" +if [ "${DRIVER_ADDONS_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" ${DRIVER_ADDONS} driverselect" fi diff --git a/packages/virtual/linux-firmware/package.mk b/packages/virtual/linux-firmware/package.mk index fa377ebba1..4d9a2382e7 100644 --- a/packages/virtual/linux-firmware/package.mk +++ b/packages/virtual/linux-firmware/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain $FIRMWARE" +PKG_DEPENDS_TARGET="toolchain ${FIRMWARE}" PKG_SECTION="virtual" PKG_LONGDESC="linux-firmware is a meta-package to install various free firmware drivers" diff --git a/packages/virtual/mediacenter/package.mk b/packages/virtual/mediacenter/package.mk index 1594871d43..32ffbf7038 100644 --- a/packages/virtual/mediacenter/package.mk +++ b/packages/virtual/mediacenter/package.mk @@ -7,40 +7,40 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain $MEDIACENTER" +PKG_DEPENDS_TARGET="toolchain ${MEDIACENTER}" PKG_SECTION="virtual" PKG_LONGDESC="Mediacenter: Metapackage" -if [ "$MEDIACENTER" = "kodi" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $MEDIACENTER-theme-$SKIN_DEFAULT" +if [ "${MEDIACENTER}" = "kodi" ]; then + PKG_DEPENDS_TARGET+=" ${MEDIACENTER}-theme-${SKIN_DEFAULT}" - for i in $SKINS; do - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $MEDIACENTER-theme-$i" + for i in ${SKINS}; do + PKG_DEPENDS_TARGET+=" ${MEDIACENTER}-theme-${i}" done # python-based tool for kodi management - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET texturecache.py" + PKG_DEPENDS_TARGET+=" texturecache.py" # some python stuff needed for various addons - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Pillow \ + PKG_DEPENDS_TARGET="${PKG_DEPENDS_TARGET} Pillow \ simplejson \ pycryptodome" # settings addon - if [ -n "$DISTRO_PKG_SETTINGS" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $DISTRO_PKG_SETTINGS" + if [ -n "${DISTRO_PKG_SETTINGS}" ]; then + PKG_DEPENDS_TARGET+=" ${DISTRO_PKG_SETTINGS}" fi # other packages - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xmlstarlet" + PKG_DEPENDS_TARGET+=" xmlstarlet" - if [ "$JOYSTICK_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET peripheral.joystick" + if [ "${JOYSTICK_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" peripheral.joystick" fi get_graphicdrivers - if listcontains "$GRAPHIC_DRIVERS" "(iris|i915|i965)"; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-vaapi-driver media-driver" + if listcontains "${GRAPHIC_DRIVERS}" "(iris|i915|i965)"; then + PKG_DEPENDS_TARGET+=" intel-vaapi-driver media-driver" fi fi diff --git a/packages/virtual/misc-packages/package.mk b/packages/virtual/misc-packages/package.mk index b1e9effe18..88afd339db 100644 --- a/packages/virtual/misc-packages/package.mk +++ b/packages/virtual/misc-packages/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain $ADDITIONAL_PACKAGES" +PKG_DEPENDS_TARGET="toolchain ${ADDITIONAL_PACKAGES}" PKG_SECTION="virtual" PKG_LONGDESC="misc-packages: Metapackage for miscellaneous packages" diff --git a/packages/virtual/network/package.mk b/packages/virtual/network/package.mk index 293c1651fe..24c1d5c73f 100644 --- a/packages/virtual/network/package.mk +++ b/packages/virtual/network/package.mk @@ -10,23 +10,23 @@ PKG_DEPENDS_TARGET="toolchain connman netbase ethtool openssh iw wireless-regdb" PKG_SECTION="virtual" PKG_LONGDESC="Metapackage for various packages to install network support" -if [ "$BLUETOOTH_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET bluez" +if [ "${BLUETOOTH_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" bluez" fi -if [ "$SAMBA_SERVER" = "yes" ] || [ "$SAMBA_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET samba" +if [ "${SAMBA_SERVER}" = "yes" ] || [ "${SAMBA_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" samba" fi -if [ "$OPENVPN_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET openvpn" +if [ "${OPENVPN_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" openvpn" fi -if [ "$WIREGUARD_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET wireguard-tools" +if [ "${WIREGUARD_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" wireguard-tools" fi # nss needed by inputstream.adaptive, chromium etc. -if [ "$TARGET_ARCH" = "x86_64" ] || [ "$TARGET_ARCH" = "arm" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET nss" +if [ "${TARGET_ARCH}" = "x86_64" ] || [ "${TARGET_ARCH}" = "arm" ]; then + PKG_DEPENDS_TARGET+=" nss" fi diff --git a/packages/virtual/virtual/package.mk b/packages/virtual/virtual/package.mk index a6cfaef8d2..ae5e381d42 100644 --- a/packages/virtual/virtual/package.mk +++ b/packages/virtual/virtual/package.mk @@ -12,4 +12,4 @@ PKG_LONGDESC="virtual is a Meta package to install Virtual project extra depende get_graphicdrivers -listcontains "$GRAPHIC_DRIVERS" "vmware" && PKG_DEPENDS_TARGET+=" open-vm-tools" || true +listcontains "${GRAPHIC_DRIVERS}" "vmware" && PKG_DEPENDS_TARGET+=" open-vm-tools" || true diff --git a/packages/virtual/x11/package.mk b/packages/virtual/x11/package.mk index bd18d16abb..a6adada8f9 100644 --- a/packages/virtual/x11/package.mk +++ b/packages/virtual/x11/package.mk @@ -12,27 +12,27 @@ PKG_LONGDESC="X11 is the Windowing system" # Additional packages we need for using xorg-server: # Fonts - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET encodings font-xfree86-type1 font-bitstream-type1 font-misc-misc" + PKG_DEPENDS_TARGET+=" encodings font-xfree86-type1 font-bitstream-type1 font-misc-misc" # Server - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xkeyboard-config xkbcomp" + PKG_DEPENDS_TARGET+=" xkeyboard-config xkbcomp" # Tools - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xrandr setxkbmap" + PKG_DEPENDS_TARGET+=" xrandr setxkbmap" -if [ -n "$WINDOWMANAGER" -a "$WINDOWMANAGER" != "none" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $WINDOWMANAGER" +if [ -n "${WINDOWMANAGER}" -a "${WINDOWMANAGER}" != "none" ]; then + PKG_DEPENDS_TARGET+=" ${WINDOWMANAGER}" fi get_graphicdrivers # Drivers -if [ -n "$LIBINPUT" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-input-libinput" +if [ -n "${LIBINPUT}" ]; then + PKG_DEPENDS_TARGET+=" xf86-input-libinput" else - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-input-evdev xf86-input-synaptics" + PKG_DEPENDS_TARGET+=" xf86-input-evdev xf86-input-synaptics" fi -for drv in $XORG_DRIVERS; do - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xf86-video-$drv" +for drv in ${XORG_DRIVERS}; do + PKG_DEPENDS_TARGET+=" xf86-video-${drv}" done From b72e75bec7b9f596299f1745bb2c2d4c91d3fcef Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:21 +0000 Subject: [PATCH 25/27] wayland: automated code cleanup Signed-off-by: Ian Leonard --- packages/wayland/libxkbcommon/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wayland/libxkbcommon/package.mk b/packages/wayland/libxkbcommon/package.mk index 89d52bb05d..0ea39a1951 100644 --- a/packages/wayland/libxkbcommon/package.mk +++ b/packages/wayland/libxkbcommon/package.mk @@ -26,6 +26,6 @@ fi pre_configure_target() { if [ "${DISPLAYSERVER}" = "x11" ]; then - TARGET_LDFLAGS="$LDFLAGS -lXau -lxcb" + TARGET_LDFLAGS="${LDFLAGS} -lXau -lxcb" fi } From df9ea457e0cc8acdd648174ccda01c4f78062207 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:21 +0000 Subject: [PATCH 26/27] web: automated code cleanup Signed-off-by: Ian Leonard --- packages/web/curl/package.mk | 8 ++++---- packages/web/libmicrohttpd/package.mk | 6 +++--- packages/web/nghttp2/package.mk | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/web/curl/package.mk b/packages/web/curl/package.mk index 835cba43f7..844de76681 100644 --- a/packages/web/curl/package.mk +++ b/packages/web/curl/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="7.74.0" PKG_SHA256="999d5f2c403cf6e25d58319fdd596611e455dd195208746bc6e6d197a77e878b" PKG_LICENSE="MIT" PKG_SITE="http://curl.haxx.se" -PKG_URL="http://curl.haxx.se/download/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://curl.haxx.se/download/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain zlib gnutls rtmpdump libidn2 nghttp2" PKG_LONGDESC="Client and library for (HTTP, HTTPS, FTP, ...) transfers." PKG_TOOLCHAIN="configure" @@ -72,8 +72,8 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_lib_rtmp_RTMP_Init=yes \ --with-nghttp2" post_makeinstall_target() { - rm -rf $INSTALL/usr/share/zsh - rm -rf $INSTALL/usr/bin/curl-config + rm -rf ${INSTALL}/usr/share/zsh + rm -rf ${INSTALL}/usr/bin/curl-config - sed -e "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" -i $SYSROOT_PREFIX/usr/bin/curl-config + sed -e "s:\(['= ]\)/usr:\\1${SYSROOT_PREFIX}/usr:g" -i ${SYSROOT_PREFIX}/usr/bin/curl-config } diff --git a/packages/web/libmicrohttpd/package.mk b/packages/web/libmicrohttpd/package.mk index c26c5e5768..32bda2d330 100644 --- a/packages/web/libmicrohttpd/package.mk +++ b/packages/web/libmicrohttpd/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.9.72" PKG_SHA256="0ae825f8e0d7f41201fd44a0df1cf454c1cb0bc50fe9d59c26552260264c2ff8" PKG_LICENSE="LGPLv2.1" PKG_SITE="http://www.gnu.org/software/libmicrohttpd/" -PKG_URL="http://ftpmirror.gnu.org/libmicrohttpd/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://ftpmirror.gnu.org/libmicrohttpd/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A small C library that is supposed to make it easy to run an HTTP server as part of another application." @@ -15,8 +15,8 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared \ --enable-static \ --disable-curl \ --disable-https \ - --with-libgcrypt-prefix=$SYSROOT_PREFIX/usr" + --with-libgcrypt-prefix=${SYSROOT_PREFIX}/usr" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/web/nghttp2/package.mk b/packages/web/nghttp2/package.mk index 7bfa09148d..d05849d111 100644 --- a/packages/web/nghttp2/package.mk +++ b/packages/web/nghttp2/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.42.0" PKG_SHA256="c5a7f09020f31247d0d1609078a75efadeccb7e5b86fc2e4389189b1b431fe63" PKG_LICENSE="MIT" PKG_SITE="http://www.linuxfromscratch.org/blfs/view/cvs/basicnet/nghttp2.html" -PKG_URL="https://github.com/nghttp2/nghttp2/releases/download/v$PKG_VERSION/nghttp2-$PKG_VERSION.tar.xz" +PKG_URL="https://github.com/nghttp2/nghttp2/releases/download/v${PKG_VERSION}/nghttp2-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="nghttp2 is an implementation of HTTP/2 and its header compression algorithm, HPACK." PKG_TOOLCHAIN="configure" From 6f08b82b0bf3ae5d03a2cb6588a359e2a6382fdb Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Tue, 19 Jan 2021 19:34:25 +0000 Subject: [PATCH 27/27] x11: automated code cleanup Signed-off-by: Ian Leonard --- packages/x11/app/setxkbmap/package.mk | 2 +- packages/x11/app/xkbcomp/package.mk | 4 +- packages/x11/app/xrandr/package.mk | 4 +- packages/x11/data/xkeyboard-config/package.mk | 2 +- .../x11/driver/xf86-input-evdev/package.mk | 4 +- .../x11/driver/xf86-input-libinput/package.mk | 8 +-- .../driver/xf86-input-synaptics/package.mk | 4 +- .../x11/driver/xf86-video-amdgpu/package.mk | 10 +-- packages/x11/driver/xf86-video-ati/package.mk | 8 +-- .../x11/driver/xf86-video-intel/package.mk | 6 +- .../xf86-video-nvidia-legacy/package.mk | 62 +++++++++---------- .../x11/driver/xf86-video-vmware/package.mk | 2 +- packages/x11/font/encodings/package.mk | 2 +- .../x11/font/font-bitstream-type1/package.mk | 6 +- packages/x11/font/font-cursor-misc/package.mk | 6 +- packages/x11/font/font-misc-misc/package.mk | 12 ++-- packages/x11/font/font-util/package.mk | 4 +- .../x11/font/font-xfree86-type1/package.mk | 6 +- .../x11/font/liberation-fonts-ttf/package.mk | 10 +-- packages/x11/lib/libICE/package.mk | 2 +- packages/x11/lib/libSM/package.mk | 2 +- packages/x11/lib/libX11/package.mk | 4 +- packages/x11/lib/libXau/package.mk | 2 +- packages/x11/lib/libXcomposite/package.mk | 2 +- packages/x11/lib/libXdamage/package.mk | 2 +- packages/x11/lib/libXext/package.mk | 2 +- packages/x11/lib/libXfixes/package.mk | 2 +- packages/x11/lib/libXfont2/package.mk | 2 +- packages/x11/lib/libXi/package.mk | 2 +- packages/x11/lib/libXinerama/package.mk | 2 +- packages/x11/lib/libXmu/package.mk | 2 +- packages/x11/lib/libXrandr/package.mk | 2 +- packages/x11/lib/libXrender/package.mk | 2 +- packages/x11/lib/libXt/package.mk | 8 +-- packages/x11/lib/libXtst/package.mk | 2 +- packages/x11/lib/libXxf86vm/package.mk | 2 +- packages/x11/lib/libfontenc/package.mk | 2 +- packages/x11/lib/libpciaccess/package.mk | 4 +- packages/x11/lib/libxcb/package.mk | 10 +-- packages/x11/lib/libxkbfile/package.mk | 2 +- packages/x11/lib/libxshmfence/package.mk | 2 +- packages/x11/lib/pixman/package.mk | 20 +++--- packages/x11/lib/xtrans/package.mk | 6 +- packages/x11/other/fluxbox/package.mk | 20 +++--- packages/x11/other/fontconfig/package.mk | 18 +++--- packages/x11/proto/xcb-proto/package.mk | 2 +- packages/x11/proto/xorgproto/package.mk | 2 +- packages/x11/util/util-macros/package.mk | 4 +- .../x11/util/xorg-launch-helper/package.mk | 6 +- packages/x11/xserver/xorg-server/package.mk | 48 +++++++------- 50 files changed, 175 insertions(+), 175 deletions(-) diff --git a/packages/x11/app/setxkbmap/package.mk b/packages/x11/app/setxkbmap/package.mk index 4e6b28e9ba..8c757e90fd 100644 --- a/packages/x11/app/setxkbmap/package.mk +++ b/packages/x11/app/setxkbmap/package.mk @@ -7,6 +7,6 @@ PKG_VERSION="1.3.2" PKG_SHA256="8ff27486442725e50b02d7049152f51d125ecad71b7ce503cfa09d5d8ceeb9f5" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/app/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libX11 libxkbfile" PKG_LONGDESC="Setxkbmap sets the keyboard using the X Keyboard Extension." diff --git a/packages/x11/app/xkbcomp/package.mk b/packages/x11/app/xkbcomp/package.mk index a8aa91fa77..a0f943a840 100644 --- a/packages/x11/app/xkbcomp/package.mk +++ b/packages/x11/app/xkbcomp/package.mk @@ -7,8 +7,8 @@ PKG_VERSION="1.4.4" PKG_SHA256="59cce603a607a17722a0a1cf99010f4894e7812beb5d695abbc08474d59af27e" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/app/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11 libxkbfile" PKG_LONGDESC="The xkbcomp keymap compiler converts a description of an XKB keymap into one of several output formats." -PKG_CONFIGURE_OPTS_TARGET="--with-xkb-config-root=$XORG_PATH_XKB" +PKG_CONFIGURE_OPTS_TARGET="--with-xkb-config-root=${XORG_PATH_XKB}" diff --git a/packages/x11/app/xrandr/package.mk b/packages/x11/app/xrandr/package.mk index 027eec7743..375dd67e14 100644 --- a/packages/x11/app/xrandr/package.mk +++ b/packages/x11/app/xrandr/package.mk @@ -7,10 +7,10 @@ PKG_VERSION="1.5.1" PKG_SHA256="7bc76daf9d72f8aff885efad04ce06b90488a1a169d118dea8a2b661832e8762" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://xorg.freedesktop.org/archive/individual/app/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain util-macros libXrandr" PKG_LONGDESC="Xrandr is a primitive command line interface to the RandR extension and used to set the screen size, orientation and/or reflection." post_makeinstall_target() { - rm -rf $INSTALL/usr/bin/xkeystone + rm -rf ${INSTALL}/usr/bin/xkeystone } diff --git a/packages/x11/data/xkeyboard-config/package.mk b/packages/x11/data/xkeyboard-config/package.mk index 2a1fcedad3..7abe99ae4f 100644 --- a/packages/x11/data/xkeyboard-config/package.mk +++ b/packages/x11/data/xkeyboard-config/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.31" PKG_SHA256="da44181f2c8828789c720decf7d13acb3c3950e2a040af5132f50f04bb6aada3" PKG_LICENSE="MIT" PKG_SITE="http://www.X.org" -PKG_URL="http://www.x.org/releases/individual/data/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://www.x.org/releases/individual/data/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="X keyboard extension data files." PKG_TOOLCHAIN="autotools" diff --git a/packages/x11/driver/xf86-input-evdev/package.mk b/packages/x11/driver/xf86-input-evdev/package.mk index 05e61d4294..eacc3dfa6b 100644 --- a/packages/x11/driver/xf86-input-evdev/package.mk +++ b/packages/x11/driver/xf86-input-evdev/package.mk @@ -7,11 +7,11 @@ PKG_VERSION="2.10.6" PKG_SHA256="8726073e81861bc7b2321e76272cbdbd33c7e1a121535a9827977265b9033ec0" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain xorg-server util-macros libevdev mtdev systemd" PKG_LONGDESC="Evdev is an Xorg input driver for Linux's generic event devices." PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \ - --with-xorg-module-dir=$XORG_PATH_MODULES \ + --with-xorg-module-dir=${XORG_PATH_MODULES} \ --with-gnu-ld" diff --git a/packages/x11/driver/xf86-input-libinput/package.mk b/packages/x11/driver/xf86-input-libinput/package.mk index e05bca7736..454e737eac 100644 --- a/packages/x11/driver/xf86-input-libinput/package.mk +++ b/packages/x11/driver/xf86-input-libinput/package.mk @@ -7,14 +7,14 @@ PKG_VERSION="0.30.0" PKG_SHA256="f9c7f9fd41ae14061e0e9c3bd45fa170e5e21027a2bc5810034e1e748db996c0" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/libinput/" -PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libinput" PKG_LONGDESC="This is an X driver based on libinput." PKG_TOOLCHAIN="autotools" -PKG_CONFIGURE_OPTS_TARGET="--with-xorg-module-dir=$XORG_PATH_MODULES" +PKG_CONFIGURE_OPTS_TARGET="--with-xorg-module-dir=${XORG_PATH_MODULES}" post_makeinstall_target() { - mkdir -p $INSTALL/usr/share/X11/xorg.conf.d - cp $PKG_BUILD/conf/*-libinput.conf $INSTALL/usr/share/X11/xorg.conf.d + mkdir -p ${INSTALL}/usr/share/X11/xorg.conf.d + cp ${PKG_BUILD}/conf/*-libinput.conf ${INSTALL}/usr/share/X11/xorg.conf.d } diff --git a/packages/x11/driver/xf86-input-synaptics/package.mk b/packages/x11/driver/xf86-input-synaptics/package.mk index 9966a0bd2c..cf98ea8f3b 100644 --- a/packages/x11/driver/xf86-input-synaptics/package.mk +++ b/packages/x11/driver/xf86-input-synaptics/package.mk @@ -6,9 +6,9 @@ PKG_VERSION="1.9.1" PKG_SHA256="7af83526eff1c76e8b9e1553b34245c203d029028d8044dd9dcf71eef1001576" PKG_LICENSE="GPL" PKG_SITE="http://lists.freedesktop.org/mailman/listinfo/xorg" -PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain xorg-server libXi libXext libevdev" PKG_LONGDESC="Synaptics touchpad driver for X.Org." PKG_TOOLCHAIN="autotools" -PKG_CONFIGURE_OPTS_TARGET="--with-xorg-module-dir=$XORG_PATH_MODULES" +PKG_CONFIGURE_OPTS_TARGET="--with-xorg-module-dir=${XORG_PATH_MODULES}" diff --git a/packages/x11/driver/xf86-video-amdgpu/package.mk b/packages/x11/driver/xf86-video-amdgpu/package.mk index f7516cd357..2e896eb925 100644 --- a/packages/x11/driver/xf86-video-amdgpu/package.mk +++ b/packages/x11/driver/xf86-video-amdgpu/package.mk @@ -8,17 +8,17 @@ PKG_SHA256="4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d" PKG_ARCH="x86_64" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" -PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain xorg-server" PKG_LONGDESC="AMD Radeon video driver for the Xorg X server." PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--enable-udev \ --enable-glamor \ - --with-xorg-module-dir=$XORG_PATH_MODULES" + --with-xorg-module-dir=${XORG_PATH_MODULES}" post_makeinstall_target() { - rm -r $INSTALL/usr/share - mkdir -p $INSTALL/etc/X11 - cp $PKG_BUILD/conf/10-amdgpu.conf $INSTALL/etc/X11/xorg-amdgpu.conf + rm -r ${INSTALL}/usr/share + mkdir -p ${INSTALL}/etc/X11 + cp ${PKG_BUILD}/conf/10-amdgpu.conf ${INSTALL}/etc/X11/xorg-amdgpu.conf } diff --git a/packages/x11/driver/xf86-video-ati/package.mk b/packages/x11/driver/xf86-video-ati/package.mk index 0330cc16ed..9631f6dec0 100644 --- a/packages/x11/driver/xf86-video-ati/package.mk +++ b/packages/x11/driver/xf86-video-ati/package.mk @@ -8,14 +8,14 @@ PKG_SHA256="659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49" PKG_ARCH="x86_64" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" -PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain xorg-server" PKG_LONGDESC="The ati driver supports various ATi, know AMD, video chips." PKG_TOOLCHAIN="autotools" -PKG_CONFIGURE_OPTS_TARGET="--enable-glamor --with-xorg-module-dir=$XORG_PATH_MODULES" +PKG_CONFIGURE_OPTS_TARGET="--enable-glamor --with-xorg-module-dir=${XORG_PATH_MODULES}" post_makeinstall_target() { - mkdir -p $INSTALL/etc/X11 - cp $PKG_DIR/config/*.conf $INSTALL/etc/X11 + mkdir -p ${INSTALL}/etc/X11 + cp ${PKG_DIR}/config/*.conf ${INSTALL}/etc/X11 } diff --git a/packages/x11/driver/xf86-video-intel/package.mk b/packages/x11/driver/xf86-video-intel/package.mk index 60561456cb..e90c7b38bf 100644 --- a/packages/x11/driver/xf86-video-intel/package.mk +++ b/packages/x11/driver/xf86-video-intel/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="ea41bbab7d2720a4bcd3b083800b8226f217c6af3e8bace4310063a7c5b56c25" PKG_ARCH="x86_64" PKG_LICENSE="OSS" PKG_SITE="http://intellinuxgraphics.org/" -PKG_URL="https://gitlab.freedesktop.org/xorg/driver/$PKG_NAME/-/archive/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="https://gitlab.freedesktop.org/xorg/driver/${PKG_NAME}/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain libXcomposite libXxf86vm libXdamage libdrm util-macros systemd xorg-server" PKG_LONGDESC="The Xorg driver for Intel i810, i815, 830M, 845G, 852GM, 855GM, 865G, 915G, 915GM and 965G." PKG_TOOLCHAIN="autotools" @@ -34,8 +34,8 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-backlight \ --disable-create2 \ --disable-async-swap \ --with-default-dri=2 \ - --with-xorg-module-dir=$XORG_PATH_MODULES" + --with-xorg-module-dir=${XORG_PATH_MODULES}" post_makeinstall_target() { - rm -rf $INSTALL/usr/share/polkit-1 + rm -rf ${INSTALL}/usr/share/polkit-1 } diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk index 9b99530e5e..4371f70486 100644 --- a/packages/x11/driver/xf86-video-nvidia-legacy/package.mk +++ b/packages/x11/driver/xf86-video-nvidia-legacy/package.mk @@ -8,18 +8,18 @@ PKG_SHA256="995d44fef587ff5284497a47a95d71adbee0c13020d615e940ac928f180f5b77" PKG_ARCH="x86_64" PKG_LICENSE="nonfree" PKG_SITE="http://www.nvidia.com/" -PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-$PKG_VERSION-no-compat32.run" +PKG_URL="http://us.download.nvidia.com/XFree86/Linux-x86_64/${PKG_VERSION}/NVIDIA-Linux-x86_64-${PKG_VERSION}-no-compat32.run" PKG_DEPENDS_TARGET="util-macros xorg-server libvdpau" -PKG_NEED_UNPACK="$LINUX_DEPENDS" +PKG_NEED_UNPACK="${LINUX_DEPENDS}" PKG_LONGDESC="The Xorg driver for NVIDIA video chips supporting Geforce 6 and Geforce 7 devices." PKG_TOOLCHAIN="manual" PKG_IS_KERNEL_PKG="yes" unpack() { - [ -d $PKG_BUILD ] && rm -rf $PKG_BUILD + [ -d ${PKG_BUILD} ] && rm -rf ${PKG_BUILD} - sh $SOURCES/$PKG_NAME/$PKG_SOURCE_NAME --extract-only --target $PKG_BUILD + sh ${SOURCES}/${PKG_NAME}/${PKG_SOURCE_NAME} --extract-only --target ${PKG_BUILD} } make_target() { @@ -27,44 +27,44 @@ make_target() { cd kernel make module CC=${CC} LD=${LD} SYSSRC=$(kernel_path) SYSOUT=$(kernel_path) - $STRIP --strip-debug nvidia.ko + ${STRIP} --strip-debug nvidia.ko cd .. } makeinstall_target() { - mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers - cp -P nvidia_drv.so $INSTALL/$XORG_PATH_MODULES/drivers/nvidia-legacy_drv.so - ln -sf /var/lib/nvidia_drv.so $INSTALL/$XORG_PATH_MODULES/drivers/nvidia_drv.so + mkdir -p ${INSTALL}/${XORG_PATH_MODULES}/drivers + cp -P nvidia_drv.so ${INSTALL}/${XORG_PATH_MODULES}/drivers/nvidia-legacy_drv.so + ln -sf /var/lib/nvidia_drv.so ${INSTALL}/${XORG_PATH_MODULES}/drivers/nvidia_drv.so - mkdir -p $INSTALL/$XORG_PATH_MODULES/extensions + mkdir -p ${INSTALL}/${XORG_PATH_MODULES}/extensions # rename to not conflicting with Mesa libGL.so - cp -P libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia-legacy.so + cp -P libglx.so* ${INSTALL}/${XORG_PATH_MODULES}/extensions/libglx_nvidia-legacy.so - mkdir -p $INSTALL/etc/X11 - cp $PKG_DIR/config/*.conf $INSTALL/etc/X11 + mkdir -p ${INSTALL}/etc/X11 + cp ${PKG_DIR}/config/*.conf ${INSTALL}/etc/X11 - mkdir -p $INSTALL/usr/lib - cp -P libnvidia-glcore.so.$PKG_VERSION $INSTALL/usr/lib - cp -P libnvidia-ml.so.$PKG_VERSION $INSTALL/usr/lib - ln -sf /var/lib/libnvidia-ml.so.1 $INSTALL/usr/lib/libnvidia-ml.so.1 - cp -P tls/libnvidia-tls.so.$PKG_VERSION $INSTALL/usr/lib + mkdir -p ${INSTALL}/usr/lib + cp -P libnvidia-glcore.so.${PKG_VERSION} ${INSTALL}/usr/lib + cp -P libnvidia-ml.so.${PKG_VERSION} ${INSTALL}/usr/lib + ln -sf /var/lib/libnvidia-ml.so.1 ${INSTALL}/usr/lib/libnvidia-ml.so.1 + cp -P tls/libnvidia-tls.so.${PKG_VERSION} ${INSTALL}/usr/lib # rename to not conflicting with Mesa libGL.so - cp -P libGL.so* $INSTALL/usr/lib/libGL_nvidia-legacy.so.1 + cp -P libGL.so* ${INSTALL}/usr/lib/libGL_nvidia-legacy.so.1 - mkdir -p $INSTALL/$(get_full_module_dir)/nvidia - ln -sf /var/lib/nvidia.ko $INSTALL/$(get_full_module_dir)/nvidia/nvidia.ko + mkdir -p ${INSTALL}/$(get_full_module_dir)/nvidia + ln -sf /var/lib/nvidia.ko ${INSTALL}/$(get_full_module_dir)/nvidia/nvidia.ko - mkdir -p $INSTALL/usr/lib/nvidia-legacy - cp kernel/nvidia.ko $INSTALL/usr/lib/nvidia-legacy + mkdir -p ${INSTALL}/usr/lib/nvidia-legacy + cp kernel/nvidia.ko ${INSTALL}/usr/lib/nvidia-legacy - mkdir -p $INSTALL/usr/bin - ln -s /var/lib/nvidia-smi $INSTALL/usr/bin/nvidia-smi - cp nvidia-smi $INSTALL/usr/bin/nvidia-legacy-smi - ln -s /var/lib/nvidia-xconfig $INSTALL/usr/bin/nvidia-xconfig - cp nvidia-xconfig $INSTALL/usr/bin/nvidia-legacy-xconfig + mkdir -p ${INSTALL}/usr/bin + ln -s /var/lib/nvidia-smi ${INSTALL}/usr/bin/nvidia-smi + cp nvidia-smi ${INSTALL}/usr/bin/nvidia-legacy-smi + ln -s /var/lib/nvidia-xconfig ${INSTALL}/usr/bin/nvidia-xconfig + cp nvidia-xconfig ${INSTALL}/usr/bin/nvidia-legacy-xconfig - mkdir -p $INSTALL/usr/lib/vdpau - cp libvdpau_nvidia.so* $INSTALL/usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 - ln -sf /var/lib/libvdpau_nvidia.so $INSTALL/usr/lib/vdpau/libvdpau_nvidia.so - ln -sf /var/lib/libvdpau_nvidia.so.1 $INSTALL/usr/lib/vdpau/libvdpau_nvidia.so.1 + mkdir -p ${INSTALL}/usr/lib/vdpau + cp libvdpau_nvidia.so* ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia-legacy.so.1 + ln -sf /var/lib/libvdpau_nvidia.so ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so + ln -sf /var/lib/libvdpau_nvidia.so.1 ${INSTALL}/usr/lib/vdpau/libvdpau_nvidia.so.1 } diff --git a/packages/x11/driver/xf86-video-vmware/package.mk b/packages/x11/driver/xf86-video-vmware/package.mk index 215fd086bb..001e226055 100644 --- a/packages/x11/driver/xf86-video-vmware/package.mk +++ b/packages/x11/driver/xf86-video-vmware/package.mk @@ -14,4 +14,4 @@ PKG_LONGDESC="xf86-video-vmware: The Xorg driver for vmware video" PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="--enable-vmwarectrl-client \ - --with-xorg-module-dir=$XORG_PATH_MODULES" + --with-xorg-module-dir=${XORG_PATH_MODULES}" diff --git a/packages/x11/font/encodings/package.mk b/packages/x11/font/encodings/package.mk index bca211007d..a8722acdc7 100644 --- a/packages/x11/font/encodings/package.mk +++ b/packages/x11/font/encodings/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.0.5" PKG_SHA256="bd96e16143a044b19e87f217cf6a3763a70c561d1076aad6f6d862ec41774a31" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/font/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros font-util:host" PKG_LONGDESC="X font encoding meta files." diff --git a/packages/x11/font/font-bitstream-type1/package.mk b/packages/x11/font/font-bitstream-type1/package.mk index a0e4695506..7d9dc612fa 100644 --- a/packages/x11/font/font-bitstream-type1/package.mk +++ b/packages/x11/font/font-bitstream-type1/package.mk @@ -7,13 +7,13 @@ PKG_VERSION="1.0.3" PKG_SHA256="c6ea0569adad2c577f140328dc3302e729cb1b1ea90cd0025caf380625f8a688" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/font/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros font-xfree86-type1" PKG_LONGDESC="Bitstream font family." PKG_CONFIGURE_OPTS_TARGET="--with-fontrootdir=/usr/share/fonts" post_install() { - mkfontdir $INSTALL/usr/share/fonts/Type1 - mkfontscale $INSTALL/usr/share/fonts/Type1 + mkfontdir ${INSTALL}/usr/share/fonts/Type1 + mkfontscale ${INSTALL}/usr/share/fonts/Type1 } diff --git a/packages/x11/font/font-cursor-misc/package.mk b/packages/x11/font/font-cursor-misc/package.mk index ae7dce292e..144e7e77a3 100644 --- a/packages/x11/font/font-cursor-misc/package.mk +++ b/packages/x11/font/font-cursor-misc/package.mk @@ -6,13 +6,13 @@ PKG_VERSION="1.0.3" PKG_SHA256="17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/font/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros font-util:host" PKG_LONGDESC="X11 cursor fonts." PKG_CONFIGURE_OPTS_TARGET="--with-fontrootdir=/usr/share/fonts" post_install() { - mkfontdir $INSTALL/usr/share/fonts/misc - mkfontscale $INSTALL/usr/share/fonts/misc + mkfontdir ${INSTALL}/usr/share/fonts/misc + mkfontscale ${INSTALL}/usr/share/fonts/misc } diff --git a/packages/x11/font/font-misc-misc/package.mk b/packages/x11/font/font-misc-misc/package.mk index d134791bb3..623552ae8c 100644 --- a/packages/x11/font/font-misc-misc/package.mk +++ b/packages/x11/font/font-misc-misc/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="1.1.2" PKG_SHA256="b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/font/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros font-util font-cursor-misc" PKG_LONGDESC="A misc. public domain font." @@ -29,14 +29,14 @@ PKG_CONFIGURE_OPTS_TARGET="--with-fontrootdir=/usr/share/fonts \ --disable-koi8-r \ --disable-jisx0201" -PKG_MAKE_OPTS_TARGET="UTIL_DIR=$SYSROOT_PREFIX/usr/share/fonts/util/" +PKG_MAKE_OPTS_TARGET="UTIL_DIR=${SYSROOT_PREFIX}/usr/share/fonts/util/" makeinstall_target() { - mkdir -p $INSTALL/usr/share/fonts/misc - cp 6x13-ISO8859-1.pcf.gz $INSTALL/usr/share/fonts/misc + mkdir -p ${INSTALL}/usr/share/fonts/misc + cp 6x13-ISO8859-1.pcf.gz ${INSTALL}/usr/share/fonts/misc } post_install() { - mkfontdir $INSTALL/usr/share/fonts/misc - mkfontscale $INSTALL/usr/share/fonts/misc + mkfontdir ${INSTALL}/usr/share/fonts/misc + mkfontscale ${INSTALL}/usr/share/fonts/misc } diff --git a/packages/x11/font/font-util/package.mk b/packages/x11/font/font-util/package.mk index 2967168b7e..6d1a2558b6 100644 --- a/packages/x11/font/font-util/package.mk +++ b/packages/x11/font/font-util/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3.2" PKG_SHA256="3ad880444123ac06a7238546fa38a2a6ad7f7e0cc3614de7e103863616522282" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/font/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_DEPENDS_HOST="util-macros" PKG_LONGDESC="X.org font utilities." @@ -15,5 +15,5 @@ PKG_LONGDESC="X.org font utilities." PKG_CONFIGURE_OPTS_TARGET="--with-mapdir=/usr/share/fonts/util" post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin } diff --git a/packages/x11/font/font-xfree86-type1/package.mk b/packages/x11/font/font-xfree86-type1/package.mk index 30b1fbe2d5..9a2df9ec4b 100644 --- a/packages/x11/font/font-xfree86-type1/package.mk +++ b/packages/x11/font/font-xfree86-type1/package.mk @@ -6,13 +6,13 @@ PKG_VERSION="1.0.4" PKG_SHA256="caebf42aec7be7f3bd40e0f232d6f34881b853dc84acfcdf7458358701fbe34a" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/releases/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/releases/individual/font/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="A Xfree86 Inc. Type1 font." PKG_CONFIGURE_OPTS_TARGET="--with-fontrootdir=/usr/share/fonts" post_install() { - mkfontdir $INSTALL/usr/share/fonts/Type1 - mkfontscale $INSTALL/usr/share/fonts/Type1 + mkfontdir ${INSTALL}/usr/share/fonts/Type1 + mkfontscale ${INSTALL}/usr/share/fonts/Type1 } diff --git a/packages/x11/font/liberation-fonts-ttf/package.mk b/packages/x11/font/liberation-fonts-ttf/package.mk index 8133f4c58f..243c4f0b43 100644 --- a/packages/x11/font/liberation-fonts-ttf/package.mk +++ b/packages/x11/font/liberation-fonts-ttf/package.mk @@ -7,17 +7,17 @@ PKG_VERSION="2.1.2" PKG_SHA256="14694930f28391675008c67b18889d1a7dfea74b16adf50394f8057b57eaf8e0" PKG_LICENSE="OFL1_1" PKG_SITE="https://github.com/liberationfonts/liberation-fonts" -PKG_URL="https://github.com/liberationfonts/liberation-fonts/files/5722233/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://github.com/liberationfonts/liberation-fonts/files/5722233/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="This packages included the high-quality and open-sourced TrueType vector fonts." PKG_TOOLCHAIN="manual" makeinstall_target() { - mkdir -p $INSTALL/usr/share/fonts/liberation - cp *.ttf $INSTALL/usr/share/fonts/liberation + mkdir -p ${INSTALL}/usr/share/fonts/liberation + cp *.ttf ${INSTALL}/usr/share/fonts/liberation } post_install() { - mkfontdir $INSTALL/usr/share/fonts/liberation - mkfontscale $INSTALL/usr/share/fonts/liberation + mkfontdir ${INSTALL}/usr/share/fonts/liberation + mkfontscale ${INSTALL}/usr/share/fonts/liberation } diff --git a/packages/x11/lib/libICE/package.mk b/packages/x11/lib/libICE/package.mk index 4cdef247ca..acfa60613b 100644 --- a/packages/x11/lib/libICE/package.mk +++ b/packages/x11/lib/libICE/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.0.10" PKG_SHA256="6f86dce12cf4bcaf5c37dddd8b1b64ed2ddf1ef7b218f22b9942595fb747c348" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros xtrans" PKG_LONGDESC="X Inter-Client Exchange (ICE) protocol library." diff --git a/packages/x11/lib/libSM/package.mk b/packages/x11/lib/libSM/package.mk index 9793a56e07..a2b16ef523 100644 --- a/packages/x11/lib/libSM/package.mk +++ b/packages/x11/lib/libSM/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.2.3" PKG_SHA256="2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros util-linux libICE" PKG_LONGDESC="This package provides the main interface to the X11 Session Management library." diff --git a/packages/x11/lib/libX11/package.mk b/packages/x11/lib/libX11/package.mk index 6590dee495..f971ce8d18 100644 --- a/packages/x11/lib/libX11/package.mk +++ b/packages/x11/lib/libX11/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.7.0" PKG_SHA256="36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros xtrans libXau libxcb xorgproto" PKG_LONGDESC="LibX11 is the main X11 library containing all the client-side code to access the X11 windowing system." PKG_TOOLCHAIN="autotools" @@ -19,7 +19,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-loadable-i18n \ --enable-xlocale \ --disable-xlocaledir \ --enable-xkb \ - --with-keysymdefdir=$SYSROOT_PREFIX/usr/include/X11 \ + --with-keysymdefdir=${SYSROOT_PREFIX}/usr/include/X11 \ --disable-xf86bigfont \ --enable-malloc0returnsnull \ --disable-specs \ diff --git a/packages/x11/lib/libXau/package.mk b/packages/x11/lib/libXau/package.mk index 7df01cc97a..8753221c26 100644 --- a/packages/x11/lib/libXau/package.mk +++ b/packages/x11/lib/libXau/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.0.9" PKG_SHA256="ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros xorgproto" PKG_LONGDESC="X authorization file management libary" PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libXcomposite/package.mk b/packages/x11/lib/libXcomposite/package.mk index 8c6320c355..8dbc06068f 100644 --- a/packages/x11/lib/libXcomposite/package.mk +++ b/packages/x11/lib/libXcomposite/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.4.5" PKG_SHA256="b3218a2c15bab8035d16810df5b8251ffc7132ff3aa70651a1fba0bfe9634e8f" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libXfixes libXext libX11" PKG_LONGDESC="X Composite Library" PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libXdamage/package.mk b/packages/x11/lib/libXdamage/package.mk index 05d9df6b86..b077f3d75f 100644 --- a/packages/x11/lib/libXdamage/package.mk +++ b/packages/x11/lib/libXdamage/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.5" PKG_SHA256="b734068643cac3b5f3d2c8279dd366b5bf28c7219d9e9d8717e1383995e0ea45" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXfixes" PKG_LONGDESC="LibXdamage provides an X Window System client interface to the DAMAGE extension to the X protocol." PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libXext/package.mk b/packages/x11/lib/libXext/package.mk index 32e22a406d..9433d1d4ad 100644 --- a/packages/x11/lib/libXext/package.mk +++ b/packages/x11/lib/libXext/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3.4" PKG_SHA256="59ad6fcce98deaecc14d39a672cf218ca37aba617c9a0f691cac3bcd28edf82b" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11" PKG_LONGDESC="LibXext provides an X Window System client interface to several extensions to the X protocol." diff --git a/packages/x11/lib/libXfixes/package.mk b/packages/x11/lib/libXfixes/package.mk index 5cb1060e69..83247f819a 100644 --- a/packages/x11/lib/libXfixes/package.mk +++ b/packages/x11/lib/libXfixes/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="5.0.3" PKG_SHA256="de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11" PKG_LONGDESC="X Fixes Library" PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libXfont2/package.mk b/packages/x11/lib/libXfont2/package.mk index dc84636af0..387513746c 100644 --- a/packages/x11/lib/libXfont2/package.mk +++ b/packages/x11/lib/libXfont2/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="2.0.4" PKG_SHA256="6d151b3368e5035efede4b6264c0fdc6662c1c99dbc2de425e3480cababc69e6" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros xtrans freetype libfontenc" PKG_LONGDESC="X font Library" diff --git a/packages/x11/lib/libXi/package.mk b/packages/x11/lib/libXi/package.mk index 35a1b9746c..6122125042 100644 --- a/packages/x11/lib/libXi/package.mk +++ b/packages/x11/lib/libXi/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.7.10" PKG_SHA256="36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXfixes libXext" PKG_LONGDESC="LibXi provides an X Window System client interface to the XINPUT extension to the X protocol." PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libXinerama/package.mk b/packages/x11/lib/libXinerama/package.mk index 05cec4a5a9..a07df82192 100644 --- a/packages/x11/lib/libXinerama/package.mk +++ b/packages/x11/lib/libXinerama/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.4" PKG_SHA256="0008dbd7ecf717e1e507eed1856ab0d9cf946d03201b85d5dcf61489bb02d720" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libXext" PKG_LONGDESC="libXinerama is the Xinerama library." diff --git a/packages/x11/lib/libXmu/package.mk b/packages/x11/lib/libXmu/package.mk index ed61419991..8e08bdfd5e 100644 --- a/packages/x11/lib/libXmu/package.mk +++ b/packages/x11/lib/libXmu/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.3" PKG_SHA256="9c343225e7c3dc0904f2122b562278da5fed639b1b5e880d25111561bac5b731" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libXext libX11 libXt" PKG_LONGDESC="LibXmu provides a set of miscellaneous utility convenience functions for X libraries to use." PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libXrandr/package.mk b/packages/x11/lib/libXrandr/package.mk index 21a71ab930..2d9683f11d 100644 --- a/packages/x11/lib/libXrandr/package.mk +++ b/packages/x11/lib/libXrandr/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.5.2" PKG_SHA256="8aea0ebe403d62330bb741ed595b53741acf45033d3bda1792f1d4cc3daee023" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXrender libXext" PKG_LONGDESC="Xrandr is a simple library designed to interface the X Resize and Rotate Extension." diff --git a/packages/x11/lib/libXrender/package.mk b/packages/x11/lib/libXrender/package.mk index 32ceedb8a2..4f23c859dc 100644 --- a/packages/x11/lib/libXrender/package.mk +++ b/packages/x11/lib/libXrender/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.9.10" PKG_SHA256="c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11" PKG_LONGDESC="The X Rendering Extension introduces digital image composition within the X Window System." PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libXt/package.mk b/packages/x11/lib/libXt/package.mk index 0444277cd7..78fa454d6d 100644 --- a/packages/x11/lib/libXt/package.mk +++ b/packages/x11/lib/libXt/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.2.0" PKG_SHA256="b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11 libSM" PKG_LONGDESC="LibXt provides the X Toolkit Intrinsics, an abstract widget library upon which other toolkits are based." @@ -17,8 +17,8 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --enable-malloc0returnsnull" pre_make_target() { - make -C util CC=$HOST_CC \ - CFLAGS="$HOST_CFLAGS " \ - LDFLAGS="$HOST_LDFLAGS" \ + make -C util CC=${HOST_CC} \ + CFLAGS="${HOST_CFLAGS} " \ + LDFLAGS="${HOST_LDFLAGS}" \ makestrs } diff --git a/packages/x11/lib/libXtst/package.mk b/packages/x11/lib/libXtst/package.mk index 60d94c2561..177207d5ff 100644 --- a/packages/x11/lib/libXtst/package.mk +++ b/packages/x11/lib/libXtst/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.2.3" PKG_SHA256="4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libXext libXi libX11" PKG_LONGDESC="The Xtst Library" diff --git a/packages/x11/lib/libXxf86vm/package.mk b/packages/x11/lib/libXxf86vm/package.mk index 9b6060ef17..5aacc56225 100644 --- a/packages/x11/lib/libXxf86vm/package.mk +++ b/packages/x11/lib/libXxf86vm/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.4" PKG_SHA256="afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11 libXext" PKG_LONGDESC="The libxxf86vm provides an interface to the server extension XFree86-VidModeExtension." PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libfontenc/package.mk b/packages/x11/lib/libfontenc/package.mk index 5bfa9ed7de..42cc822e95 100644 --- a/packages/x11/lib/libfontenc/package.mk +++ b/packages/x11/lib/libfontenc/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.4" PKG_SHA256="2cfcce810ddd48f2e5dc658d28c1808e86dcf303eaff16728b9aa3dbc0092079" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros zlib font-util xorgproto" PKG_LONGDESC="Libfontenc is a library which helps font libraries portably determine and deal with different encodings of fonts." PKG_BUILD_FLAGS="+pic" diff --git a/packages/x11/lib/libpciaccess/package.mk b/packages/x11/lib/libpciaccess/package.mk index 605d3e0e83..1e4cacf3a0 100644 --- a/packages/x11/lib/libpciaccess/package.mk +++ b/packages/x11/lib/libpciaccess/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="0.16" PKG_SHA256="214c9d0d884fdd7375ec8da8dcb91a8d3169f263294c9a90c575bf1938b9f489" PKG_LICENSE="OSS" PKG_SITE="http://freedesktop.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros zlib" PKG_LONGDESC="X.org libpciaccess library." @@ -16,5 +16,5 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_asm_mtrr_h=set \ --with-zlib " pre_configure_target() { - CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE" + CFLAGS+=" -D_LARGEFILE64_SOURCE" } diff --git a/packages/x11/lib/libxcb/package.mk b/packages/x11/lib/libxcb/package.mk index b760d0ba9a..a62dbe7976 100644 --- a/packages/x11/lib/libxcb/package.mk +++ b/packages/x11/lib/libxcb/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.14" PKG_SHA256="a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34" PKG_LICENSE="OSS" PKG_SITE="http://xcb.freedesktop.org" -PKG_URL="http://xcb.freedesktop.org/dist/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://xcb.freedesktop.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain util-macros Python3:host xcb-proto libpthread-stubs libXau" PKG_LONGDESC="X C-language Bindings library." PKG_BUILD_FLAGS="+pic" @@ -20,9 +20,9 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --disable-xvmc" pre_configure_target() { - PYTHON_LIBDIR=$SYSROOT_PREFIX/usr/lib/$PKG_PYTHON_VERSION - PYTHON_TOOLCHAIN_PATH=$PYTHON_LIBDIR/site-packages + PYTHON_LIBDIR=${SYSROOT_PREFIX}/usr/lib/${PKG_PYTHON_VERSION} + PYTHON_TOOLCHAIN_PATH=${PYTHON_LIBDIR}/site-packages - PKG_CONFIG="$PKG_CONFIG --define-variable=pythondir=$PYTHON_TOOLCHAIN_PATH" - PKG_CONFIG="$PKG_CONFIG --define-variable=xcbincludedir=$SYSROOT_PREFIX/usr/share/xcb" + PKG_CONFIG+=" --define-variable=pythondir=${PYTHON_TOOLCHAIN_PATH}" + PKG_CONFIG+=" --define-variable=xcbincludedir=${SYSROOT_PREFIX}/usr/share/xcb" } diff --git a/packages/x11/lib/libxkbfile/package.mk b/packages/x11/lib/libxkbfile/package.mk index b8625de30e..ced64b060c 100644 --- a/packages/x11/lib/libxkbfile/package.mk +++ b/packages/x11/lib/libxkbfile/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.1.0" PKG_SHA256="758dbdaa20add2db4902df0b1b7c936564b7376c02a0acd1f2a331bd334b38c7" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros libX11" PKG_LONGDESC="Libxkbfile provides an interface to read and manipulate description files for XKB, the X11 keyboard configuration extension." diff --git a/packages/x11/lib/libxshmfence/package.mk b/packages/x11/lib/libxshmfence/package.mk index 63d48f66aa..aaef332882 100644 --- a/packages/x11/lib/libxshmfence/package.mk +++ b/packages/x11/lib/libxshmfence/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3" PKG_SHA256="b884300d26a14961a076fbebc762a39831cb75f92bed5ccf9836345b459220c7" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros xorgproto" PKG_LONGDESC="libxshmfence is the Shared memory 'SyncFence' synchronization primitive." PKG_TOOLCHAIN="autotools" diff --git a/packages/x11/lib/pixman/package.mk b/packages/x11/lib/pixman/package.mk index 25e38fdb7a..19ddcbfbe6 100644 --- a/packages/x11/lib/pixman/package.mk +++ b/packages/x11/lib/pixman/package.mk @@ -7,28 +7,28 @@ PKG_VERSION="0.40.0" PKG_SHA256="da8ed9fe2d1c5ef8ce5d1207992db959226bd4e37e3f88acf908fd9a71e2704e" PKG_LICENSE="OSS" PKG_SITE="http://www.x.org/" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_HOST="toolchain:host" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="Pixman is a generic library for manipulating pixel regions, contains low-level pixel manipulation routines." PKG_TOOLCHAIN="configure" -if [ "$TARGET_ARCH" = arm ]; then +if [ "${TARGET_ARCH}" = arm ]; then if target_has_feature neon; then PIXMAN_NEON="--enable-arm-neon" else PIXMAN_NEON="--disable-arm-neon" fi - PIXMAN_CONFIG="--disable-mmx --disable-sse2 --disable-vmx --enable-arm-simd $PIXMAN_NEON --disable-arm-iwmmxt" -elif [ "$TARGET_ARCH" = aarch64 ]; then + PIXMAN_CONFIG="--disable-mmx --disable-sse2 --disable-vmx --enable-arm-simd ${PIXMAN_NEON} --disable-arm-iwmmxt" +elif [ "${TARGET_ARCH}" = aarch64 ]; then PIXMAN_CONFIG="--disable-mmx --disable-sse2 --disable-vmx --disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt" -elif [ "$TARGET_ARCH" = x86_64 ]; then +elif [ "${TARGET_ARCH}" = x86_64 ]; then PIXMAN_CONFIG="--enable-mmx --enable-sse2 --disable-ssse3 --disable-vmx --disable-arm-simd --disable-arm-neon" fi PKG_CONFIGURE_OPTS_TARGET="--disable-openmp \ --disable-loongson-mmi \ - $PIXMAN_CONFIG \ + ${PIXMAN_CONFIG} \ --disable-mips-dspr2 \ --enable-gcc-inline-asm \ --disable-timers \ @@ -37,8 +37,8 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-openmp \ --with-gnu-ld" post_makeinstall_target() { - cp $SYSROOT_PREFIX/usr/lib/pkgconfig/pixman-1.pc \ - $SYSROOT_PREFIX/usr/lib/pkgconfig/pixman.pc - cp -rf $SYSROOT_PREFIX/usr/include/pixman-1 \ - $SYSROOT_PREFIX/usr/include/pixman + cp ${SYSROOT_PREFIX}/usr/lib/pkgconfig/pixman-1.pc \ + ${SYSROOT_PREFIX}/usr/lib/pkgconfig/pixman.pc + cp -rf ${SYSROOT_PREFIX}/usr/include/pixman-1 \ + ${SYSROOT_PREFIX}/usr/include/pixman } diff --git a/packages/x11/lib/xtrans/package.mk b/packages/x11/lib/xtrans/package.mk index abd8dff183..a5c43997bb 100644 --- a/packages/x11/lib/xtrans/package.mk +++ b/packages/x11/lib/xtrans/package.mk @@ -7,13 +7,13 @@ PKG_VERSION="1.4.0" PKG_SHA256="377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="Abstract network code for X." PKG_CONFIGURE_OPTS_TARGET="--without-xmlto" post_makeinstall_target() { - mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig - cp xtrans.pc $SYSROOT_PREFIX/usr/lib/pkgconfig + mkdir -p ${SYSROOT_PREFIX}/usr/lib/pkgconfig + cp xtrans.pc ${SYSROOT_PREFIX}/usr/lib/pkgconfig } diff --git a/packages/x11/other/fluxbox/package.mk b/packages/x11/other/fluxbox/package.mk index caae72af0b..cfc1381b76 100644 --- a/packages/x11/other/fluxbox/package.mk +++ b/packages/x11/other/fluxbox/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.3.7" PKG_SHA256="fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0" PKG_LICENSE="OSS" PKG_SITE="http://fluxbox.org/" -PKG_URL="http://sourceforge.net/projects/fluxbox/files/fluxbox/${PKG_VERSION}/$PKG_NAME-${PKG_VERSION}.tar.xz" +PKG_URL="http://sourceforge.net/projects/fluxbox/files/fluxbox/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain libX11 libXrandr libXext libXrender" PKG_LONGDESC="Fluxbox is a windowmanager for X that was based on the Blackbox 0.61.1 code." PKG_TOOLCHAIN="autotools" @@ -31,15 +31,15 @@ post_install() { } post_makeinstall_target() { - rm -rf $INSTALL/usr/bin/fbrun - rm -rf $INSTALL/usr/bin/fbsetbg - rm -rf $INSTALL/usr/bin/fluxbox-generate_menu - rm -rf $INSTALL/usr/bin/fluxbox-remote - rm -rf $INSTALL/usr/bin/startfluxbox + rm -rf ${INSTALL}/usr/bin/fbrun + rm -rf ${INSTALL}/usr/bin/fbsetbg + rm -rf ${INSTALL}/usr/bin/fluxbox-generate_menu + rm -rf ${INSTALL}/usr/bin/fluxbox-remote + rm -rf ${INSTALL}/usr/bin/startfluxbox - rm -rf $INSTALL/usr/share/fluxbox/styles + rm -rf ${INSTALL}/usr/share/fluxbox/styles - cp $PKG_DIR/config/apps $INSTALL/usr/share/fluxbox/ - cp $PKG_DIR/config/init $INSTALL/usr/share/fluxbox/ - cp $PKG_DIR/config/keys $INSTALL/usr/share/fluxbox/ + cp ${PKG_DIR}/config/apps ${INSTALL}/usr/share/fluxbox/ + cp ${PKG_DIR}/config/init ${INSTALL}/usr/share/fluxbox/ + cp ${PKG_DIR}/config/keys ${INSTALL}/usr/share/fluxbox/ } diff --git a/packages/x11/other/fontconfig/package.mk b/packages/x11/other/fontconfig/package.mk index 6b0000b5f1..c9824dbc1b 100644 --- a/packages/x11/other/fontconfig/package.mk +++ b/packages/x11/other/fontconfig/package.mk @@ -7,11 +7,11 @@ PKG_VERSION="2.13.1" PKG_SHA256="9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f" PKG_LICENSE="OSS" PKG_SITE="http://www.fontconfig.org" -PKG_URL="http://www.freedesktop.org/software/fontconfig/release/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="http://www.freedesktop.org/software/fontconfig/release/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain util-linux util-macros freetype libxml2 zlib expat" PKG_LONGDESC="Fontconfig is a library for font customization and configuration." -PKG_CONFIGURE_OPTS_TARGET="--with-arch=$TARGET_ARCH \ +PKG_CONFIGURE_OPTS_TARGET="--with-arch=${TARGET_ARCH} \ --with-cache-dir=/storage/.cache/fontconfig \ --with-default-fonts=/usr/share/fonts \ --without-add-fonts \ @@ -20,15 +20,15 @@ PKG_CONFIGURE_OPTS_TARGET="--with-arch=$TARGET_ARCH \ pre_configure_target() { # ensure we dont use '-O3' optimization. - CFLAGS=`echo $CFLAGS | sed -e "s|-O3|-O2|"` - CXXFLAGS=`echo $CXXFLAGS | sed -e "s|-O3|-O2|"` - CFLAGS="$CFLAGS -I$PKG_BUILD" - CXXFLAGS="$CXXFLAGS -I$PKG_BUILD" + CFLAGS=$(echo ${CFLAGS} | sed -e "s|-O3|-O2|") + CXXFLAGS=$(echo ${CXXFLAGS} | sed -e "s|-O3|-O2|") + CFLAGS+=" -I${PKG_BUILD}" + CXXFLAGS+=" -I${PKG_BUILD}" } post_makeinstall_target() { - rm -rf $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/bin - mkdir -p $INSTALL/etc/fonts/conf.d - cp $PKG_DIR/conf.d/*.conf $INSTALL/etc/fonts/conf.d + mkdir -p ${INSTALL}/etc/fonts/conf.d + cp ${PKG_DIR}/conf.d/*.conf ${INSTALL}/etc/fonts/conf.d } diff --git a/packages/x11/proto/xcb-proto/package.mk b/packages/x11/proto/xcb-proto/package.mk index a445306b70..4874f2ac9e 100644 --- a/packages/x11/proto/xcb-proto/package.mk +++ b/packages/x11/proto/xcb-proto/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.14" PKG_SHA256="186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xcb.freedesktop.org/dist/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_URL="http://xcb.freedesktop.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain util-macros Python3:host" PKG_LONGDESC="X C-language Bindings protocol headers." diff --git a/packages/x11/proto/xorgproto/package.mk b/packages/x11/proto/xorgproto/package.mk index 24c693ad42..e84f56a06e 100644 --- a/packages/x11/proto/xorgproto/package.mk +++ b/packages/x11/proto/xorgproto/package.mk @@ -6,7 +6,7 @@ PKG_VERSION="2020.1" PKG_SHA256="54a153f139035a376c075845dd058049177212da94d7a9707cf9468367b699d2" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="https://xorg.freedesktop.org/archive/individual/proto/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="https://xorg.freedesktop.org/archive/individual/proto/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="combined X.Org X11 Protocol headers" PKG_TOOLCHAIN="meson" diff --git a/packages/x11/util/util-macros/package.mk b/packages/x11/util/util-macros/package.mk index 37ebeb6276..138e3b0dc9 100644 --- a/packages/x11/util/util-macros/package.mk +++ b/packages/x11/util/util-macros/package.mk @@ -6,10 +6,10 @@ PKG_VERSION="1.19.2" PKG_SHA256="d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/util/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/util/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="X.org autoconf utilities such as M4 macros." post_makeinstall_target() { - rm -rf $INSTALL/usr + rm -rf ${INSTALL}/usr } diff --git a/packages/x11/util/xorg-launch-helper/package.mk b/packages/x11/util/xorg-launch-helper/package.mk index 34242dfc18..efa10705a4 100644 --- a/packages/x11/util/xorg-launch-helper/package.mk +++ b/packages/x11/util/xorg-launch-helper/package.mk @@ -17,7 +17,7 @@ pre_configure_target() { post_makeinstall_target() { # do not install systemd services - rm -rf $INSTALL/usr/lib - mkdir -p $INSTALL/usr/bin - cp -P $PKG_DIR/scripts/xorg-launch $INSTALL/usr/bin + rm -rf ${INSTALL}/usr/lib + mkdir -p ${INSTALL}/usr/bin + cp -P ${PKG_DIR}/scripts/xorg-launch ${INSTALL}/usr/bin } diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk index 8f0e62116d..840dadedb9 100644 --- a/packages/x11/xserver/xorg-server/package.mk +++ b/packages/x11/xserver/xorg-server/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="1.20.10" PKG_SHA256="977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2" +PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/${PKG_NAME}-${PKG_VERSION}.tar.bz2" PKG_DEPENDS_TARGET="toolchain util-macros font-util xorgproto libpciaccess libX11 libXfont2 libXinerama libxshmfence libxkbfile libdrm openssl freetype pixman systemd xorg-launch-helper" PKG_NEED_UNPACK="$(get_pkg_directory xf86-video-nvidia) $(get_pkg_directory xf86-video-nvidia-legacy)" PKG_LONGDESC="Xorg is a full featured X server running on Intel x86 hardware." @@ -15,15 +15,15 @@ PKG_TOOLCHAIN="autotools" get_graphicdrivers -if [ "$COMPOSITE_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libXcomposite" +if [ "${COMPOSITE_SUPPORT}" = "yes" ]; then + PKG_DEPENDS_TARGET+=" libXcomposite" XORG_COMPOSITE="--enable-composite" else XORG_COMPOSITE="--disable-composite" fi -if [ ! "$OPENGL" = "no" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL libepoxy" +if [ ! "${OPENGL}" = "no" ]; then + PKG_DEPENDS_TARGET+=" ${OPENGL} libepoxy" XORG_MESA="--enable-glx --enable-dri --enable-glamor" else XORG_MESA="--disable-glx --disable-dri --disable-glamor" @@ -37,7 +37,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-debug \ --disable-unit-tests \ --disable-sparkle \ --disable-xselinux \ - $XORG_COMPOSITE \ + ${XORG_COMPOSITE} \ --enable-mitshm \ --enable-xres \ --enable-record \ @@ -47,7 +47,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-debug \ --disable-screensaver \ --disable-xdmcp \ --disable-xdm-auth-1 \ - $XORG_MESA \ + ${XORG_MESA} \ --enable-dri2 \ --enable-dri3 \ --enable-present \ @@ -100,8 +100,8 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-debug \ --with-sha1=libcrypto \ --without-systemd-daemon \ --with-os-vendor=LibreELEC.tv \ - --with-module-dir=$XORG_PATH_MODULES \ - --with-xkb-path=$XORG_PATH_XKB \ + --with-module-dir=${XORG_PATH_MODULES} \ + --with-xkb-path=${XORG_PATH_XKB} \ --with-xkb-output=/var/cache/xkb \ --with-log-dir=/var/log \ --with-fontrootdir=/usr/share/fonts \ @@ -112,29 +112,29 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-debug \ pre_configure_target() { # hack to prevent a build error - CFLAGS=`echo $CFLAGS | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|"` - LDFLAGS=`echo $LDFLAGS | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|"` + CFLAGS=$(echo ${CFLAGS} | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|") + LDFLAGS=$(echo ${LDFLAGS} | sed -e "s|-O3|-O2|" -e "s|-Ofast|-O2|") } post_makeinstall_target() { - rm -rf $INSTALL/var/cache/xkb + rm -rf ${INSTALL}/var/cache/xkb - mkdir -p $INSTALL/usr/lib/xorg - cp -P $PKG_DIR/scripts/xorg-configure $INSTALL/usr/lib/xorg - sed -i -e "s|@NVIDIA_VERSION@|$(get_pkg_version xf86-video-nvidia)|g" $INSTALL/usr/lib/xorg/xorg-configure - sed -i -e "s|@NVIDIA_LEGACY_VERSION@|$(get_pkg_version xf86-video-nvidia-legacy)|g" $INSTALL/usr/lib/xorg/xorg-configure + mkdir -p ${INSTALL}/usr/lib/xorg + cp -P ${PKG_DIR}/scripts/xorg-configure ${INSTALL}/usr/lib/xorg + sed -i -e "s|@NVIDIA_VERSION@|$(get_pkg_version xf86-video-nvidia)|g" ${INSTALL}/usr/lib/xorg/xorg-configure + sed -i -e "s|@NVIDIA_LEGACY_VERSION@|$(get_pkg_version xf86-video-nvidia-legacy)|g" ${INSTALL}/usr/lib/xorg/xorg-configure - if [ ! "$OPENGL" = "no" ]; then - if [ -f $INSTALL/usr/lib/xorg/modules/extensions/libglx.so ]; then - mv $INSTALL/usr/lib/xorg/modules/extensions/libglx.so \ - $INSTALL/usr/lib/xorg/modules/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers - ln -sf /var/lib/libglx.so $INSTALL/usr/lib/xorg/modules/extensions/libglx.so + if [ ! "${OPENGL}" = "no" ]; then + if [ -f ${INSTALL}/usr/lib/xorg/modules/extensions/libglx.so ]; then + mv ${INSTALL}/usr/lib/xorg/modules/extensions/libglx.so \ + ${INSTALL}/usr/lib/xorg/modules/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers + ln -sf /var/lib/libglx.so ${INSTALL}/usr/lib/xorg/modules/extensions/libglx.so fi fi - mkdir -p $INSTALL/etc/X11 - if find_file_path config/xorg.conf ; then - cp $FOUND_PATH $INSTALL/etc/X11 + mkdir -p ${INSTALL}/etc/X11 + if find_file_path config/xorg.conf; then + cp ${FOUND_PATH} ${INSTALL}/etc/X11 fi }