Merge pull request #355 from lrusak/addons-libreelec-7.0

backport of #354
LibreELEC · May 16, 2016 · f51b881 · f51b881
2 parents 5076f68 + 002d032
commit f51b881
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
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
@@ -19,7 +19,7 @@
 PKG_NAME="lm_sensors"
 PKG_VERSION="3.4.0"
 PKG_REV="1"
-PKG_ARCH="any"
+PKG_ARCH="arm x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="http://secure.netroedge.com/~lm78/"
 PKG_URL="http://ftp.gwdg.de/pub/linux/misc/lm-sensors/$PKG_NAME-$PKG_VERSION.tar.bz2"

diff --git a/packages/addons/service/syncthing/package.mk b/packages/addons/service/syncthing/package.mk
@@ -43,6 +43,9 @@ configure_target() {
     x86_64)
       export GOARCH=amd64
       ;;
+    aarch64)
+      export GOARCH=arm64
+      ;;
     arm)
       export GOARCH=arm
       case $TARGET_CPU in

diff --git a/packages/addons/tools/system-tools/package.mk b/packages/addons/tools/system-tools/package.mk
@@ -115,7 +115,7 @@ addon() {
     cp -P $(get_build_dir jq)/.$TARGET_NAME/jq $ADDON_BUILD/$PKG_ADDON_ID/bin
 
     # lm_sensors
-    cp -P $(get_build_dir lm_sensors)/prog/sensors/sensors $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_build_dir lm_sensors)/prog/sensors/sensors $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
 
     # lshw
     cp -P $(get_build_dir lshw)/src/lshw $ADDON_BUILD/$PKG_ADDON_ID/bin