Update OctoPrint to 1.3.1 for DSM5.2

SynoCommunity · Mar 2, 2017 · f5bd7a9 · f5bd7a9
1 parent 7a45b96
commit f5bd7a9
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 71 deletions.
diff --git a/cross/octoprint/Makefile b/cross/octoprint/Makefile
diff --git a/cross/octoprint/PLIST b/cross/octoprint/PLIST
diff --git a/cross/octoprint/digests b/cross/octoprint/digests
diff --git a/cross/octoprint/patches/octoprint.patch b/cross/octoprint/patches/octoprint.patch
diff --git a/spk/octoprint/Makefile b/spk/octoprint/Makefile
@@ -1,13 +1,12 @@
 SPK_NAME   = octoprint
 SPK_VERS   = $(shell date +%Y%m%d)
-SPK_REV    = 4
+SPK_REV    = 5
 SPK_ICON   = src/octoprint.png
 DSM_UI_DIR = app
 
 BETA = 1
 
 BUILD_DEPENDS = cross/python cross/setuptools cross/pip cross/wheel
-DEPENDS = cross/$(SPK_NAME)
 WHEELS  = src/requirements.txt
 
 SPK_DEPENDS = "python>=2.7.11-15"

diff --git a/spk/octoprint/src/dsm-control.sh b/spk/octoprint/src/dsm-control.sh
@@ -10,8 +10,7 @@ PYTHON_DIR="/usr/local/python"
 GIT_DIR="/usr/local/git"
 PATH="${INSTALL_DIR}/bin:${INSTALL_DIR}/env/bin:${PYTHON_DIR}/bin:${GIT_DIR}/bin:${PATH}"
 USER="octoprint"
-PYTHON="${INSTALL_DIR}/env/bin/python"
-OCTOPRINT="${INSTALL_DIR}/share/OctoPrint/run"
+OCTOPRINT="octoprint"
 PID_FILE="${INSTALL_DIR}/var/octoprint.pid"
 LOG_FILE="${INSTALL_DIR}/var/.octoprint/logs/octoprint.log"
 PORT="8088"
@@ -27,7 +26,7 @@ start_daemon ()
     test -e /dev/ttyACM0 || mknod /dev/ttyACM0 c 166 0
     chmod 777 /dev/ttyACM0
 
-    su - ${USER} -c "PATH=${PATH} ${PYTHON} ${OCTOPRINT} --daemon start --port=${PORT} --pid ${PID_FILE}"
+    su - ${USER} -c "PATH=${PATH} ${OCTOPRINT} --daemon start --port=${PORT} --pid ${PID_FILE}"
 }
 
 stop_daemon ()

diff --git a/spk/octoprint/src/installer.sh b/spk/octoprint/src/installer.sh
@@ -33,14 +33,11 @@ postinst ()
     # Install the wheels
     ${INSTALL_DIR}/env/bin/pip install --no-deps --no-index -U --force-reinstall -f ${INSTALL_DIR}/share/wheelhouse ${INSTALL_DIR}/share/wheelhouse/*.whl > /dev/null 2>&1
 
-    # Install OctoPrint
-    cd ${INSTALL_DIR}/share/OctoPrint && ${INSTALL_DIR}/env/bin/python setup.py install > /dev/null 2>&1
-
     # Create user
     adduser -h ${INSTALL_DIR}/var -g "${DNAME} User" -G ${GROUP} -s /bin/sh -S -D ${USER}
 
     # Correct the files ownership
-    chown -R ${USER}:root ${SYNOPKG_PKGDEST}
+    chown -R ${USER}:${GROUP} ${SYNOPKG_PKGDEST}
 
     # Add firewall config
     ${SERVICETOOL} --install-configure-file --package ${FWPORTS} >> /dev/null

diff --git a/spk/octoprint/src/requirements.txt b/spk/octoprint/src/requirements.txt
@@ -1,35 +1,48 @@
-argh==0.26.1
+appdirs==1.4.0
+argh==0.26.2
 awesome-slugify==1.6.5
-Babel==2.0
-backports.ssl-match-hostname==3.4.0.2
+Babel==2.3.4
+backports.ssl-match-hostname==3.5.0.1
 blinker==1.4
-certifi==2015.9.6.2
+certifi==2017.1.23
+chainmap==1.0.2
+click==6.2
+feedparser==5.2.1
 Flask==0.10.1
 Flask-Assets==0.10
 Flask-Babel==0.9
-Flask-Login==0.2.2
-Flask-Markdown==0.3
+Flask-Login==0.2.11
 Flask-Principal==0.3.5
+future==0.15.2
 itsdangerous==0.24
-Jinja2==2.8
-Markdown==2.6.2
-netaddr==0.7.17
+Jinja2==2.8.1
+Markdown==2.6.8
+MarkupSafe==0.23
+netaddr==0.7.19
 netifaces==0.10.4
+https://github.com/foosel/OctoPrint/archive/1.3.1.tar.gz
+packaging==16.8
 pathtools==0.1.2
 pkginfo==1.2.1
-pyasn1==0.1.8
+psutil==3.2.2
+pyasn1==0.2.2
 pylru==1.0.9
+pyparsing==2.1.10
 pyserial==2.7
-pytz==2015.6
-regex==2016.03.02
+pytz==2016.10
+PyYAML==3.10
+regex==2017.2.8
 requests==2.7.0
-rsa==3.2
+rsa==3.2.3
 sarge==0.1.4
+scandir==1.3
 semantic-version==2.4.2
-sockjs-tornado==1.0.1
+six==1.10.0
+sockjs-tornado==1.0.3
 speaklater==1.3
-tornado==4.0.1
-unidecode==0.04.19
+tornado==4.0.2
+Unidecode==0.4.20
 watchdog==0.8.3
-webassets==0.11.1
+webassets==0.12.1
+websocket-client==0.40.0
 Werkzeug==0.8.3