Skip to content

Commit 9dc589a

Browse files
committed
add workaround for mono bug with armv5
- ref: mono/mono#12537
1 parent e62d5b4 commit 9dc589a

File tree

8 files changed

+34
-15
lines changed

8 files changed

+34
-15
lines changed

spk/jackett/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SPK_NAME = jackett
22
SPK_VERS = 0.11.43
3-
SPK_REV = 8
3+
SPK_REV = 9
44
SPK_ICON = src/jackett.png
55
DSM_UI_DIR = app
66

@@ -14,7 +14,7 @@ RELOAD_UI = yes
1414
DISPLAY_NAME = Jackett
1515
BETA = 1
1616
STARTABLE = yes
17-
CHANGELOG = "Update Jackett to version 0.11.43"
17+
CHANGELOG = "Add workaround for mono bug with armv5/88f6281"
1818
HOMEPAGE = https://github.com/Jackett/Jackett
1919
LICENSE = GPLv2
2020

spk/jackett/src/service-setup.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@
55
service_prestart ()
66
{
77
# Replace generic service startup
8-
98
MONO_PATH="${SYNOPKG_PKGDEST}/../mono/bin"
109
PATH="${SYNOPKG_PKGDEST}/bin:${MONO_PATH}:${PATH}"
1110
MONO="${MONO_PATH}/mono"
1211
JACKETT="${SYNOPKG_PKGDEST}/share/${SYNOPKG_PKGNAME}/JackettConsole.exe"
1312
HOME_DIR="${SYNOPKG_PKGDEST}/var"
1413

14+
# workaround for mono bug with armv5 (https://github.com/mono/mono/issues/12537)
15+
if [ "$SYNOPKG_DSM_ARCH" == "88f8621" -o "$SYNOPKG_DSM_ARCH" == "88f8622" ]; then
16+
MONO="MONO_ENV_OPTIONS='-O=-aot,-float32' ${MONO_PATH}/mono"
17+
fi
18+
1519
echo "Starting Jackett as user ${EFF_USER}" >> ${LOG_FILE}
1620
COMMAND="env HOME=${HOME_DIR} PATH=${PATH} LD_LIBRARY_PATH=${SYNOPKG_PKGDEST}/lib ${MONO} ${JACKETT} --PIDFile ${PID_FILE}"
1721

@@ -30,5 +34,5 @@ service_postinst ()
3034
$BIN/delgroup "${USER}" "users" >> ${INST_LOG}
3135
$BIN/deluser "${USER}" >> ${INST_LOG}
3236

33-
echo "service_postinst ${SYNOPKG_PKG_STATUS}" >> $INST_LOG
37+
echo "service_postinst ${SYNOPKG_PKG_STATUS}" >> ${INST_LOG}
3438
}

spk/lidarr/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SPK_NAME = lidarr
22
SPK_VERS = $(shell date +%Y%m%d)
3-
SPK_REV = 2
3+
SPK_REV = 3
44
SPK_ICON = src/lidarr.png
55

66
REQUIRED_DSM = 5.0
@@ -16,7 +16,7 @@ DESCRIPTION = Lidarr is a music collection manager for Usenet and BitTorrent us
1616
RELOAD_UI = yes
1717
STARTABLE = yes
1818
DISPLAY_NAME = Lidarr
19-
CHANGELOG = "Update Lidarr to v0.5.0.583"
19+
CHANGELOG = "Add workaround for mono bug with armv5/88f6281"
2020

2121
HOMEPAGE = http://lidarr.audio/
2222
LICENSE = GPLv3

spk/lidarr/src/service-setup.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PATH="${SYNOPKG_PKGDEST}/bin:${PATH}"
2-
MONO_PATH="/usr/local/mono/bin"
2+
MONO_PATH="${SYNOPKG_PKGDEST}/../mono/bin"
33
MONO="${MONO_PATH}/mono"
44

55
# Check versions during upgrade
@@ -14,6 +14,11 @@ PID_FILE="${CONFIG_DIR}/Lidarr/lidarr.pid"
1414
# Some have it stored in the root of package
1515
LEGACY_CONFIG_DIR="${SYNOPKG_PKGDEST}/.config"
1616

17+
# workaround for mono bug with armv5 (https://github.com/mono/mono/issues/12537)
18+
if [ "$SYNOPKG_DSM_ARCH" == "88f8621" -o "$SYNOPKG_DSM_ARCH" == "88f8622" ]; then
19+
MONO="MONO_ENV_OPTIONS='-O=-aot,-float32' ${MONO_PATH}/mono"
20+
fi
21+
1722
GROUP="sc-download"
1823

1924
SERVICE_COMMAND="env PATH=${MONO_PATH}:${PATH} HOME=${HOME_DIR} LD_LIBRARY_PATH=${SYNOPKG_PKGDEST}/lib ${MONO} ${LIDARR}"
@@ -46,7 +51,7 @@ service_preupgrade ()
4651

4752
service_postupgrade ()
4853
{
49-
# Restore Current Lidarr Binary If Current Ver. >= SPK Ver.
54+
# Restore Current Lidarr Binary if Current Ver. >= SPK Ver.
5055
. ${CONFIG_DIR}/KEEP_VAR
5156
if [ "$KEEP_CUR" == "yes" ]; then
5257
echo "Restoring Lidarr version from before upgrade" >> ${INST_LOG}

spk/radarr/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SPK_NAME = radarr
22
SPK_VERS = $(shell date +%Y%m%d)
3-
SPK_REV = 8
3+
SPK_REV = 9
44
SPK_ICON = src/radarr.png
55

66
REQUIRED_DSM = 5.0
@@ -16,7 +16,7 @@ DESCRIPTION = Radarr is a movie manager like Couchpotato, but based on the Sona
1616
RELOAD_UI = yes
1717
STARTABLE = yes
1818
DISPLAY_NAME = Radarr
19-
CHANGELOG = "Update Radarr to v0.2.0.1293."
19+
CHANGELOG = "Add workaround for mono bug with armv5/88f6281"
2020

2121
HOMEPAGE = https://radarr.video/
2222
LICENSE = GPLv3

spk/radarr/src/service-setup.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PATH="${SYNOPKG_PKGDEST}/bin:${PATH}"
2-
MONO_PATH="/usr/local/mono/bin"
2+
MONO_PATH="${SYNOPKG_PKGDEST}/../mono/bin"
33
MONO="${MONO_PATH}/mono"
44

55
# Check versions during upgrade
@@ -14,6 +14,11 @@ PID_FILE="${CONFIG_DIR}/Radarr/nzbdrone.pid"
1414
# Some have it stored in the root of package
1515
LEGACY_CONFIG_DIR="${SYNOPKG_PKGDEST}/.config"
1616

17+
# workaround for mono bug with armv5 (https://github.com/mono/mono/issues/12537)
18+
if [ "$SYNOPKG_DSM_ARCH" == "88f8621" -o "$SYNOPKG_DSM_ARCH" == "88f8622" ]; then
19+
MONO="MONO_ENV_OPTIONS='-O=-aot,-float32' ${MONO_PATH}/mono"
20+
fi
21+
1722
GROUP="sc-download"
1823
LEGACY_GROUP="sc-media"
1924

@@ -68,7 +73,7 @@ service_preupgrade ()
6873

6974
service_postupgrade ()
7075
{
71-
# Restore Current Radarr Binary If Current Ver. >= SPK Ver.
76+
# Restore Current Radarr Binary if Current Ver. >= SPK Ver.
7277
. ${CONFIG_DIR}/KEEP_VAR
7378
if [ "$KEEP_CUR" == "yes" ]; then
7479
echo "Restoring Radarr version from before upgrade" >> ${INST_LOG}

spk/sonarr/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SPK_NAME = nzbdrone
22
SPK_VERS = $(shell date +%Y%m%d)
3-
SPK_REV = 15
3+
SPK_REV = 16
44
SPK_ICON = src/sonarr.png
55

66
REQUIRED_DSM = 5.0
@@ -18,7 +18,7 @@ DESCRIPTION_SPN = Sonarr es un PVR para los usuarios de grupos de noticias y tor
1818
RELOAD_UI = yes
1919
DISPLAY_NAME = Sonarr
2020
STARTABLE = yes
21-
CHANGELOG = "Update Sonarr to v2.0.0.5301."
21+
CHANGELOG = "Add workaround for mono bug with armv5/88f6281"
2222

2323
HOMEPAGE = https://sonarr.tv
2424
LICENSE = GPLv3

spk/sonarr/src/service-setup.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PATH="${SYNOPKG_PKGDEST}/bin:${PATH}"
2-
MONO_PATH="/usr/local/mono/bin"
2+
MONO_PATH="${SYNOPKG_PKGDEST}/../mono/bin"
33
MONO="${MONO_PATH}/mono"
44

55
# Sonarr uses the home directory to store it's ".config"
@@ -29,6 +29,11 @@ fi
2929
# Some have it stored in the root of package
3030
LEGACY_CONFIG_DIR="${SYNOPKG_PKGDEST}/.config"
3131

32+
# workaround for mono bug with armv5 (https://github.com/mono/mono/issues/12537)
33+
if [ "$SYNOPKG_DSM_ARCH" == "88f8621" -o "$SYNOPKG_DSM_ARCH" == "88f8622" ]; then
34+
MONO="MONO_ENV_OPTIONS='-O=-aot,-float32' ${MONO_PATH}/mono"
35+
fi
36+
3237
GROUP="sc-download"
3338
LEGACY_GROUP="sc-media"
3439

0 commit comments

Comments
 (0)