Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sickchill DSM 6, 7 #4901

Closed
wants to merge 10 commits into from
Closed

Sickchill DSM 6, 7 #4901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ab474d4
15 & 16 plus dumbtest
BKSteve Oct 5, 2021
0bef770
cleanup
BKSteve Oct 5, 2021
0625c31
clean2
BKSteve Oct 5, 2021
c68a56a
Merge branch 'SynoCommunity:master' into SickChillOld
BKSteve Oct 7, 2021
55da4aa
Revert "Merge branch 'SynoCommunity:master' into SickChillOld"
BKSteve Oct 7, 2021
a896aff
return to 16
BKSteve Oct 7, 2021
5e071c5
Commit 17 to the hub for safety.
BKSteve Oct 7, 2021
bc6e5df
Make file and compile SickChill 20210729
BKSteve Oct 8, 2021
5990263
gone
BKSteve Oct 8, 2021
c0db947
SickChill rebuilt and tested for many architectures and both DSM 6 an…
BKSteve Oct 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions cross/dante-sockd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = dante
PKG_VERS = 1.4.3
PKG_VERS = 1.4.2
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://www.inet.no/dante/files
Expand All @@ -14,10 +14,4 @@ LICENSE = BSD/CMU
GNU_CONFIGURE = 1
CONFIGURE_ARGS = --disable-client --without-libwrap --without-bsdauth --without-gssapi --without-krb5 --without-upnp --without-pam

PRE_CONFIGURE_TARGET = dante_pre_configure

include ../../mk/spksrc.cross-cc.mk

.PHONY: dante_pre_configure
dante_pre_configure:
$(RUN) autoreconf -i -f -v
Comment on lines -17 to -23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This addition along with the patch allows it to build on DSM7. Otherwise it does the following:

$ make arch-armv7-7.0
...
checking getaddrinfo() error symbols... configure: error: in `/home/spksrc/BKSteve/spksrc/cross/dante-sockd/work-armv7-7.0/dante-1.4.2':
configure: error: error: getaddrinfo() error value count too low
See `config.log' for more details
make[2]: *** [../../mk/spksrc.configure.mk:50: configure_target] Error 1

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's very interesting and somewhat odd.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed but it's the only workaround I was able to find online... Feel free to figure a better option, at least on master it now build ok with it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm open to any solutions, I'm still at the bottom of the S curve with this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't have the patch for dante-sockd and I can't get that error message when building armv7-7.0 like you show.
If make armv7 then I get the cffi error and second build after spkclean is good.
I'm a little confused now.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My guess is that your tree wasn't rebased against master as this update to version 1.4.3 is the last commit I pushed in and therefore your tree is removing this last commit on master.

The error I'm referring to is happening on all DSM7 builds and was caught on github-action from #4797.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So you could just discard all the dante changes and use what's on master.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please all dante related changes as this is most probably due to your branch not being rebased against master as this was merged part of PR #4898 and yours removes it entirely and it isn't related to Sickchill at all.

6 changes: 3 additions & 3 deletions cross/dante-sockd/digests
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dante-1.4.3.tar.gz SHA1 1e264ec532774324b5508ba5f2ad226d479b4977
dante-1.4.3.tar.gz SHA256 418a065fe1a4b8ace8fbf77c2da269a98f376e7115902e76cda7e741e4846a5d
dante-1.4.3.tar.gz MD5 28ae15fb9e4f5ce7fe17307d01edc075
dante-1.4.2.tar.gz SHA1 542bf2579b0f63670310aff230b0f5162f6e33c9
dante-1.4.2.tar.gz SHA256 4c97cff23e5c9b00ca1ec8a95ab22972813921d7fbf60fc453e3e06382fc38a7
dante-1.4.2.tar.gz MD5 77551576d3e80bfaa941055a2959da81
35 changes: 0 additions & 35 deletions cross/dante-sockd/patches/0002-osdep-m4-Remove-getaddrinfo-too-low-checks.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions cross/python38/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ python38_post_install: $(WORK_DIR)/python-cc.mk
@$(RUN) $(PYTHON_NATIVE) -m crossenv $(STAGING_INSTALL_PREFIX)/bin/python$(PKG_VERS_MAJOR_MINOR) $(WORK_DIR)/crossenv/
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget https://bootstrap.pypa.io/get-pip.py -O - | build-python
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget https://bootstrap.pypa.io/get-pip.py -O - | python
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools==44.1.0" "wheel==0.36.2" "cffi==1.14.5"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I were you I would really avoid using >= mechanisms. It would make the build non repeatables.
Similarly it would be worth updating all cross/* equivalents to the same versions to be on the safe side.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, this is superseeded by #4902 and should be removed from your PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the >= was an ugly work around during the testing and the errors being thrown that's why I mentioned in first post.

Now 3.8.12 is in master I'll update and rebase instead of using the combination of clone of th0ma7 3.8.12 branch from his repo along with my sickchill copied to that clone.

. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools==44.1.0" "wheel==0.36.2" "cffi==1.14.5"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools>=58.0.0" "wheel>=0.36.2" "cffi>=1.14.5"
. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools>=58.0.0" "wheel>=0.36.2" "cffi>=1.14.5"
ifneq ($(PYTHON_LIB_NATIVE),$(PYTHON_LIB_CROSS))
cp $(PYTHON_LIB_CROSS)/_sysconfigdata_*.py $(PYTHON_LIB_NATIVE)/_sysconfigdata.py
endif
Expand Down
6 changes: 4 additions & 2 deletions spk/dante-sockd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
SPK_NAME = dante-sockd
SPK_VERS = 1.4.3
SPK_VERS = 1.4.2
SPK_REV = 1
SPK_ICON = src/dante.png

REQUIRED_DSM = 5.0

DEPENDS = cross/$(SPK_NAME)

MAINTAINER = Anonym-tsk
Expand All @@ -12,7 +14,7 @@ DESCRIPTION_FRE = Dante fournit le service socks et peut servir de firewall entr
RELOAD_UI = yes
STARTABLE = yes
DISPLAY_NAME = Dante SOCKS-server
CHANGELOG = Update to version 1.4.3 and fix build on DSM7
CHANGELOG =

HOMEPAGE = https://www.inet.no/dante/
LICENSE = BSD/CMU
Expand Down
17 changes: 7 additions & 10 deletions spk/sickchill/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
SPK_NAME = sickchill
SPK_VERS = 20210729
SPK_REV = 2
SPK_REV = 3
SPK_ICON = src/sickchill.png

DEPENDS = cross/$(SPK_NAME)
SPK_DEPENDS = "python38:git"
PIP=pip3
BUILD_DEPENDS = cross/python38 cross/poetry cross/lxml cross/cryptography
# cross/cffi cross/setuptools
DEPENDS = cross/PyNaCl cross/$(SPK_NAME)
SPK_DEPENDS = "python38"

WHEELS = src/requirements.txt

MAINTAINER = miigotu
DESCRIPTION = Automatic Video Library Manager for TV Shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic.
DESCRIPTION_SPN = Gestor automático para bibliotecas de series. Busca nuevos episodios de tus series favoritas, y cuando son publicados hace su magia.
STARTABLE = yes
DISPLAY_NAME = SickChill
CHANGELOG = "Initial SickChill env fix and move to Python 3.8"
CHANGELOG = "Initial SickChill env fix and move to Python 3.8 without git"

HOMEPAGE = https://sickchill.github.io/
LICENSE = GPL
LICENSE = GPLv3+

SERVICE_USER = auto
SERVICE_SETUP = src/service-setup.sh
Expand All @@ -31,9 +31,6 @@ WIZARDS_DIR = src/wizard/

POST_STRIP_TARGET = sickchill_extra_install

# Pure Python package, make sure ARCH is not defined
override ARCH=

include ../../mk/spksrc.spk.mk

.PHONY: sickchill_extra_install
Expand Down
105 changes: 51 additions & 54 deletions spk/sickchill/src/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,88 +1,85 @@
appdirs==1.4.4
attrdict==2.0.1
babelfish==0.5.5
beautifulsoup4==4.9.3
###beekeeper==0.9.2
babelfish==0.6.0
beautifulsoup4==4.10.0
beekeeper-alt==2021.7.16
bencode.py==4.0.0
CacheControl==0.12.6
certifi==2020.11.8
###cffi==1.14.3
chardet==3.0.4
click==7.1.2
cloudscraper==1.2.48
cachecontrol==0.12.6
certifi==2021.5.30
cffi==1.14.6
chardet==4.0.0
charset-normalizer==2.0.3
click==8.0.1
cloudscraper==1.2.58
configobj==5.0.6
###cryptography==3.2.1
decorator==4.4.2
decorator==5.0.9
deluge-client==1.9.0
Deprecated==1.2.10
dogpile.cache==1.0.2
deprecated==1.2.12
dogpile.cache==1.1.3
enzyme==0.4.1
feedparser==6.0.2
feedparser==6.0.8
future==0.18.2
gntp==1.0.3
guessit==3.1.1
greenlet==1.1.0
guessit==3.3.1
html5lib==1.1
httplib2==0.18.1
idna==2.10
httplib2==0.19.1
ifaddr==0.1.7
imagesize==1.2.0
IMDbPY==2020.9.25
ipaddress==1.0.23
Js2Py==0.70
IMDbPY==2021.4.18
Js2Py==0.71
jsonrpclib-pelix==0.4.2
###kodipydent==0.3.1
###lxml==4.6.1
Mako==1.1.3
markdown2==2.3.10
MarkupSafe==1.1.1
msgpack==1.0.0
kodipydent-alt==2021.7.16
lxml==4.6.3
Mako==1.1.4
markdown2==2.4.0
MarkupSafe==2.0.1
msgpack==1.0.2
new-rtorrent-python==1.0.1a0
oauthlib==3.1.0
packaging==20.4
pbr==5.5.1
oauthlib==3.1.1
packaging==20.9
pbr==5.6.0
profilehooks==1.12.0
putio.py==8.7.0
pyaes==1.6.1
pycparser==2.20
PyGithub==1.53
pygithub==1.55
pyjsparser==2.7.1
PyJWT==1.7.1
pymediainfo==4.3
PyNMA==1.0
pyOpenSSL==19.1.0
pyjwt==2.1.0
pymediainfo==5.1.0
###PyNaCl==1.4.0
pynma==1.0
pyparsing==2.4.7
PySocks==1.7.1
pysocks==1.7.1
pysrt==1.1.2
python-dateutil==2.8.1
python-slugify==4.0.1
###python-dateutil==2.8.2
python-slugify==5.0.2
python-twitter==3.5
python3-fanart==2.0.0
pytz==2020.4
qbittorrent-api==2020.10.11
pytz==2021.1
qbittorrent-api==2021.5.22
rarfile==4.0
rebulk==2.0.1
requests==2.24.0
rebulk==3.0.1
requests==2.26.0
requests-oauthlib==1.3.0
requests-toolbelt==0.9.1
Send2Trash==1.5.0
send2trash==1.7.1
sgmllib3k==1.0.0
six==1.15.0
soupsieve==2.0.1
SQLAlchemy==1.3.20
stevedore==3.2.2
six==1.16.0
soupsieve==2.2.1
SQLAlchemy==1.4.25
stevedore==3.3.0
subliminal==2.1.0
text-unidecode==1.3
timeago==1.0.14
tmdbsimple==2.6.6
timeago==1.0.15
tmdbsimple==2.8.0
tornado==6.1
tus.py==1.3.4
tvdbsimple==1.0.6
twilio==6.47.0
tzlocal==2.1
Unidecode==1.1.1
urllib3==1.26.0
validators==0.18.1
unidecode==1.2.0
urllib3==1.26.6
validators==0.18.2
webencodings==0.5.1
win-inet-pton==1.1.0
wrapt==1.12.1
xmltodict==0.10.1
xmltodict==0.12.0
22 changes: 15 additions & 7 deletions spk/sickchill/src/service-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
PYTHON_DIR="/var/packages/python38/target"
PIP=${SYNOPKG_PKGDEST}/env/bin/pip3
PATH="${SYNOPKG_PKGDEST}/bin:${SYNOPKG_PKGDEST}/env/bin:${PYTHON_DIR}/bin:${PATH}"
HOME="${SYNOPKG_PKGDEST}/var"
VIRTUALENV="${PYTHON_DIR}/bin/virtualenv"
HOME="${SYNOPKG_PKGVAR}"
VIRTUALENV="${PYTHON_DIR}/bin/python3 -m venv"
BKSteve marked this conversation as resolved.
Show resolved Hide resolved
PYTHON="${SYNOPKG_PKGDEST}/env/bin/python3"
SC_INSTALL_DIR="${SYNOPKG_PKGDEST}/share/SickChill"
SC_BINARY="${SC_INSTALL_DIR}/SickChill.py"
SC_DATA_DIR="${SYNOPKG_PKGDEST}/var/data"
SC_DATA_DIR="${SYNOPKG_PKGVAR}/data"
SC_CFG_FILE="${SC_DATA_DIR}/config.ini"


Expand Down Expand Up @@ -44,18 +44,26 @@ service_postinst() {
${VIRTUALENV} --system-site-packages ${SYNOPKG_PKGDEST}/env

# Install the wheels
${PIP} install --no-deps --no-index -U --force-reinstall -f ${SYNOPKG_PKGDEST}/share/wheelhouse ${SYNOPKG_PKGDEST}/share/wheelhouse/*.whl

# ${PIP} install -U --force-reinstall -f ${SYNOPKG_PKGDEST}/share/wheelhouse ${SYNOPKG_PKGDEST}/share/wheelhouse/*.whl
# ${PIP} install --extra-index-url https://wheel-index.linuxserver.io/ubuntu/ -U --force-reinstall -f ${SYNOPKG_PKGDEST}/share/wheelhouse ${SYNOPKG_PKGDEST}/share/wheelhouse/*.whl
# ${PIP} install --no-deps --no-index --upgrade --force-reinstall --find-links ${wheelhouse} ${wheelhouse}/*.whl
wheelhouse=${SYNOPKG_PKGDEST}/share/wheelhouse
${PIP} install --extra-index-url https://wheel-index.linuxserver.io/ubuntu/ --upgrade --force-reinstall --find-links ${wheelhouse} ${wheelhouse}/*.whl

if [ "${SYNOPKG_PKG_STATUS}" == "INSTALL" ]; then
set_config
fi

set_unix_permissions "${SYNOPKG_PKGDEST}"
if [ $SYNOPKG_DSM_VERSION_MAJOR -lt 7 ]; then
set_unix_permissions "${SYNOPKG_PKGDEST}"
fi
}

service_postupgrade() {
set_config
set_unix_permissions "${SYNOPKG_PKGDEST}"
if [ $SYNOPKG_DSM_VERSION_MAJOR -lt 7 ]; then
set_unix_permissions "${SYNOPKG_PKGDEST}"
fi
}

service_preupgrade ()
Expand Down