diff --git a/packages/addons/service/ttyd/package.mk b/packages/addons/service/ttyd/package.mk index 2e47acd469..f1139dd3d2 100644 --- a/packages/addons/service/ttyd/package.mk +++ b/packages/addons/service/ttyd/package.mk @@ -20,11 +20,11 @@ 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 + 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.19 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib - cp -p $(get_install_dir libwebsockets)/usr/lib/libwebsockets-evlib_uv.so ${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.private + cp -p $(get_install_dir json-c)/usr/lib/libjson-c.so.5 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private + cp -p $(get_install_dir libwebsockets)/usr/lib/libwebsockets.so.19 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private + cp -p $(get_install_dir libwebsockets)/usr/lib/libwebsockets-evlib_uv.so ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private + cp -p $(get_install_dir libuv)/usr/lib/libuv.so.1 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private } diff --git a/packages/addons/service/ttyd/source/bin/ttyd.start b/packages/addons/service/ttyd/source/bin/ttyd.start index 7387840cd1..86282af996 100755 --- a/packages/addons/service/ttyd/source/bin/ttyd.start +++ b/packages/addons/service/ttyd/source/bin/ttyd.start @@ -9,6 +9,8 @@ oe_setup_addon service.ttyd chmod a+x $ADDON_DIR/bin/* +LD_LIBRARY_PATH=$ADDON_DIR/lib.private:$LD_LIBRARY_PATH + if [ "$TTYD_NOLOGIN" = "true" ]; then TTYD_NOLOGIN="bash" elif [ "$TTYD_NOLOGIN" = "false" ]; then