From 075e6038c523bedcde90ae707ddcbbf4998bc941 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Mon, 20 Jul 2020 23:33:28 +0200
Subject: [PATCH] deCONZ 6.1.1; Fix VNC on arm & Ledvance downloader (#1483)

* Fix issue with looping OSRAM/Ledvance OTA downloader

* Fix issue with VNC not starting on armhf, armv7 & aarch64 based systems

* Bump version to 6.1.1

* Fix typo aarch64 -> armv7
---
 deconz/CHANGELOG.md                            |  5 +++++
 deconz/config.json                             |  6 ++----
 deconz/rootfs/etc/services.d/deconz/run        | 11 +++++++++++
 deconz/rootfs/etc/services.d/otau-ledvance/run |  2 +-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/deconz/CHANGELOG.md b/deconz/CHANGELOG.md
index 2c3753c..65ce64e 100644
--- a/deconz/CHANGELOG.md
+++ b/deconz/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 6.1.1
+
+- Fix LEDVANCE / OSRAM otau firmware downloader to restart each 65 seconds
+- Fix issue with VNC not starting on armhf, armv7 & aarch64 based systems
+
 ## 6.1.0
 
 - Fix issue with armhf / move back to raspbian
diff --git a/deconz/config.json b/deconz/config.json
index b1a67da..faa8122 100644
--- a/deconz/config.json
+++ b/deconz/config.json
@@ -1,6 +1,6 @@
 {
   "name": "deCONZ",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "slug": "deconz",
   "description": "Control a Zigbee network with ConBee or RaspBee by Dresden Elektronik",
   "arch": ["amd64", "armhf", "aarch64"],
@@ -29,9 +29,7 @@
   "apparmor": false,
   "privileged": ["SYS_MODULE", "SYS_RAWIO"],
   "devices": ["/dev/bus/usb:/dev/bus/usb:rwm", "/dev/mem:/dev/mem:rw"],
-  "snapshot_exclude": [
-    "/data/otau/*"
-  ],
+  "snapshot_exclude": ["/data/otau/*"],
   "options": {
     "device": null,
     "vnc_password": ""
diff --git a/deconz/rootfs/etc/services.d/deconz/run b/deconz/rootfs/etc/services.d/deconz/run
index a4a5893..63e1ce1 100644
--- a/deconz/rootfs/etc/services.d/deconz/run
+++ b/deconz/rootfs/etc/services.d/deconz/run
@@ -42,11 +42,22 @@ bashio::config.has_value 'dbg_zdp' \
 PLATFORM="minimal"
 VNC_PORT="$(bashio::addon.port 5900)"
 if bashio::var.has_value "${VNC_PORT}"; then
+    ARCH="$(bashio::info.arch)"
     TMP_FOLDER=$(mktemp -d)
     export XDG_RUNTIME_DIR="${TMP_FOLDER}"
     export DISPLAY=":0"
     PLATFORM="xcb"
 
+    # Fix tigervnc for 32 bits ARM
+    if [[ "armhf armv7" = *"${ARCH}"* ]]; then
+        export LD_PRELOAD=/lib/arm-linux-gnueabihf/libgcc_s.so.1
+    fi
+
+    # Fix tigervnc for 64 bits ARM
+    if [[ "aarch64" = "${ARCH}" ]]; then
+        export LD_PRELOAD=/lib/aarch64-linux-gnu/libgcc_s.so.1
+    fi
+
     bashio::log.info "Starting VNC server..."
     tigervncserver \
         -name "Home Assistant - deCONZ" \
diff --git a/deconz/rootfs/etc/services.d/otau-ledvance/run b/deconz/rootfs/etc/services.d/otau-ledvance/run
index d2d7a38..eae37f9 100644
--- a/deconz/rootfs/etc/services.d/otau-ledvance/run
+++ b/deconz/rootfs/etc/services.d/otau-ledvance/run
@@ -32,7 +32,7 @@ for (( i=0; i < "${OSRAM_DATA_SIZE}"; i++ )); do
     if [ "$((DL_DONE % 10))" == "0" ]; then
         # LEDVANCE/OSRAM API RateLimits : The rate limit 10 calls per 60 seconds or quota 100 MB per month.
         DL_DONE=0
-        exec sleep 65
+        sleep 65
     fi
 done