From d20c8eeb786c6573a4151c7df01a68482202154d Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Sat, 3 Apr 2021 09:48:11 +1100 Subject: [PATCH] SickChill fixes --- cross/sickchill/Makefile | 23 +++++++++++++++++++++++ cross/sickchill/PLIST | 1 + cross/sickchill/digests | 3 +++ spk/sickchill/Makefile | 12 ++++++------ spk/sickchill/src/service-setup.sh | 16 ++-------------- 5 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 cross/sickchill/Makefile create mode 100644 cross/sickchill/PLIST create mode 100644 cross/sickchill/digests diff --git a/cross/sickchill/Makefile b/cross/sickchill/Makefile new file mode 100644 index 00000000000..149a58cbd15 --- /dev/null +++ b/cross/sickchill/Makefile @@ -0,0 +1,23 @@ +PKG_NAME = SickChill +PKG_VERS = 2021.03.28-3 +PKG_EXT = tar.gz +PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) +PKG_DIST_SITE = https://github.com/SickChill/SickChill/archive/refs/tags/ +PKG_DIR = $(PKG_NAME)-$(PKG_VERS) + +DEPENDS = + +HOMEPAGE = https://sickchill.github.io/ +COMMENT = 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. +LICENSE = GPL + +CONFIGURE_TARGET = nop +COMPILE_TARGET = nop +INSTALL_TARGET = sickchill_install + +include ../../mk/spksrc.cross-cc.mk + +.PHONY: sickchill_install +sickchill_install: + mkdir -p $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME) + tar -cf - -C $(WORK_DIR)/$(PKG_DIR) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/$(PKG_NAME) diff --git a/cross/sickchill/PLIST b/cross/sickchill/PLIST new file mode 100644 index 00000000000..ce12ebdec2d --- /dev/null +++ b/cross/sickchill/PLIST @@ -0,0 +1 @@ +rsc:share/SickChill diff --git a/cross/sickchill/digests b/cross/sickchill/digests new file mode 100644 index 00000000000..1f4acc64cac --- /dev/null +++ b/cross/sickchill/digests @@ -0,0 +1,3 @@ +v2021.03.28-3.tar.gz SHA1 2040eb4d80ba4902b94dcbacf738460e281bc606 +v2021.03.28-3.tar.gz SHA256 4ea64ac390621ffbfb0021574e502a2f5834b9768b2d2053144743f467407891 +v2021.03.28-3.tar.gz MD5 c37bbd799617e30389e4eec3c4bc26af diff --git a/spk/sickchill/Makefile b/spk/sickchill/Makefile index 4deaead4310..ba75f712df3 100644 --- a/spk/sickchill/Makefile +++ b/spk/sickchill/Makefile @@ -1,11 +1,11 @@ SPK_NAME = sickchill - -# Set specific date so it is not rebuilt every time they compile all packages. -SPK_VERS = 20210402 -SPK_REV = 1 +SPK_VERS = 20210403 +SPK_REV = 2 SPK_ICON = src/sickchill.png -SPK_DEPENDS = "python3>=3.6:git" +BUILD_DEPENDS = cross/python38 cross/setuptools cross/pip cross/wheel +DEPENDS = cross/$(SPK_NAME) +SPK_DEPENDS = "python38:git" PIP=pip3 WHEELS = src/requirements.txt @@ -15,7 +15,7 @@ DESCRIPTION = Automatic Video Library Manager for TV Shows. It watches for new e 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 version" +CHANGELOG = "Fix package migration and update to python 3.8" HOMEPAGE = https://sickchill.github.io/ LICENSE = GPL diff --git a/spk/sickchill/src/service-setup.sh b/spk/sickchill/src/service-setup.sh index 7d3ed1932ac..e84b19eafe0 100644 --- a/spk/sickchill/src/service-setup.sh +++ b/spk/sickchill/src/service-setup.sh @@ -1,5 +1,5 @@ -PYTHON_DIR="/usr/local/python3" -PIP=${SYNOPKG_PKGDEST}/env/bin/pip3 +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" @@ -33,22 +33,12 @@ set_config() { [General] web_username = ${wizard_username} web_password = ${wizard_password} -branch = ${SC_GIT_BRANCH} web_port = 8081 update_frequency = 24 EOF fi } -service_preinst () -{ - # Avoid ssl errors in git - SSL_CRT="/etc/ssl/certs/ca-certificates.crt" - if [ -f ${SSL_CRT} ]; then - ${GIT} config --system http.sslCAInfo ${SSL_CRT} > /dev/null 2>&1 - fi -} - service_postinst() { # Create a Python virtualenv ${VIRTUALENV} --system-site-packages ${SYNOPKG_PKGDEST}/env >>${INST_LOG} @@ -62,7 +52,5 @@ service_postinst() { } service_postupgrade() { - # Do we need to do this? - # chown -R sc-download:sc-download ${SC_DATA_DIR} set_config }