jackett: fix package creation for ARMv7 (#5720)

- create one package for all ARMv7 archs depending on mono for DSM7
- create unique (version dependent) file names for digests validation

cross/jackett-mono/Makefile

@@ -3,13 +3,14 @@ PKG_VERS = 0.20.3990
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME).Binaries.Mono.$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/Jackett/Jackett/releases/download/v$(PKG_VERS)
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).Binaries.Mono.$(PKG_EXT)
 PKG_DIR = Jackett
 
 DEPENDS =
 
 HOMEPAGE = https://github.com/Jackett/Jackett
 COMMENT  = Jackett works as a proxy server: it translates queries from apps into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.
-LICENSE  = GNU GPL v2
+LICENSE  = GPLv2
 
 INSTALL_TARGET = jackett_install
 

cross/jackett-mono/digests

@@ -1,3 +1,3 @@
-Jackett.Binaries.Mono.tar.gz SHA1 8ebdf28028b9e691c4ad3842ab961e02dec11ef3
-Jackett.Binaries.Mono.tar.gz SHA256 8fe5dab5433581a50749d10783148f0055bf0eb99a0fe9de562db4b270de234b
-Jackett.Binaries.Mono.tar.gz MD5 78f00e140e67375545150bcf4e526213
+Jackett-0.20.3990.Binaries.Mono.tar.gz SHA1 8ebdf28028b9e691c4ad3842ab961e02dec11ef3
+Jackett-0.20.3990.Binaries.Mono.tar.gz SHA256 8fe5dab5433581a50749d10783148f0055bf0eb99a0fe9de562db4b270de234b
+Jackett-0.20.3990.Binaries.Mono.tar.gz MD5 78f00e140e67375545150bcf4e526213

cross/jackett/Makefile

@@ -3,18 +3,19 @@ PKG_VERS = 0.20.3990
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME).Binaries.Linux$(PKG_DIST_ARCH).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/Jackett/Jackett/releases/download/v$(PKG_VERS)
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).Binaries.Linux$(PKG_DIST_ARCH).$(PKG_EXT)
 PKG_DIR = Jackett
 
 DEPENDS =
 
 HOMEPAGE = https://github.com/Jackett/Jackett
 COMMENT  = Jackett works as a proxy server: it translates queries from apps into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software. Jackett is a single repository of maintained indexer scraping & translation logic - removing the burden from other apps.
-LICENSE  = GNU GPL v2
+LICENSE  = GPLv2
 
 INSTALL_TARGET = jackett_install
 
 # use digests with multiple files
-PKG_DIST_ARCH_LIST = x64 arm arm64
+PKG_DIST_ARCH_LIST = AMDx64 ARM32 ARM64
 
 include ../../mk/spksrc.archs.mk
 PKG_DIST_ARCH = AMDx64

cross/jackett/digests

@@ -1,9 +1,9 @@
-Jackett.Binaries.LinuxAMDx64.tar.gz SHA1 3a4b5776ad7a5d6612aa1f98c355c727c6d6cf88
-Jackett.Binaries.LinuxAMDx64.tar.gz SHA256 c31310eb688fc7dd3972f107deb5c489ee58aee9d02cd9a3b8cea709adb5e3bd
-Jackett.Binaries.LinuxAMDx64.tar.gz MD5 8939a8dbed9534488306a2faeeff1441
-Jackett.Binaries.LinuxARM32.tar.gz SHA1 3de2f1f58cebe54de2e6dbbf7b128faaee1765fe
-Jackett.Binaries.LinuxARM32.tar.gz SHA256 68dda39dc4fdb1b941f949c62011db3c7e54c86299a412fc1b7de062b9140c4d
-Jackett.Binaries.LinuxARM32.tar.gz MD5 6e1ecb33ec4e68726a93a687ed015ee9
-Jackett.Binaries.LinuxARM64.tar.gz SHA1 6d6189a53a5fef5ef499c0f0433e4db72fbda93f
-Jackett.Binaries.LinuxARM64.tar.gz SHA256 ab6760cf8d6189dd01e263a5821e3a798b45a85a0eafedfd978279c51c93c992
-Jackett.Binaries.LinuxARM64.tar.gz MD5 1974dfd733ec53f724e3a45858866496
+Jackett-0.20.3990.Binaries.LinuxAMDx64.tar.gz SHA1 3a4b5776ad7a5d6612aa1f98c355c727c6d6cf88
+Jackett-0.20.3990.Binaries.LinuxAMDx64.tar.gz SHA256 c31310eb688fc7dd3972f107deb5c489ee58aee9d02cd9a3b8cea709adb5e3bd
+Jackett-0.20.3990.Binaries.LinuxAMDx64.tar.gz MD5 8939a8dbed9534488306a2faeeff1441
+Jackett-0.20.3990.Binaries.LinuxARM32.tar.gz SHA1 3de2f1f58cebe54de2e6dbbf7b128faaee1765fe
+Jackett-0.20.3990.Binaries.LinuxARM32.tar.gz SHA256 68dda39dc4fdb1b941f949c62011db3c7e54c86299a412fc1b7de062b9140c4d
+Jackett-0.20.3990.Binaries.LinuxARM32.tar.gz MD5 6e1ecb33ec4e68726a93a687ed015ee9
+Jackett-0.20.3990.Binaries.LinuxARM64.tar.gz SHA1 6d6189a53a5fef5ef499c0f0433e4db72fbda93f
+Jackett-0.20.3990.Binaries.LinuxARM64.tar.gz SHA256 ab6760cf8d6189dd01e263a5821e3a798b45a85a0eafedfd978279c51c93c992
+Jackett-0.20.3990.Binaries.LinuxARM64.tar.gz MD5 1974dfd733ec53f724e3a45858866496

spk/jackett/Makefile

@@ -4,8 +4,7 @@ SPK_REV = 17
 SPK_ICON = src/jackett.png
 DSM_UI_DIR = app
 
-OPTIONAL_DEPENDS = cross/libstdc++ cross/curl cross/$(SPK_NAME)-mono
-DEPENDS = cross/$(SPK_NAME)
+OPTIONAL_DEPENDS = cross/jackett cross/jackett-mono cross/libstdc++ cross/curl 
 
 MAINTAINER = SynoCommunity
 MAINTAINER_URL = https://synocommunity.com/
@@ -23,30 +22,37 @@ SERVICE_USER = auto
 SERVICE_SETUP = src/service-setup.sh
 # Service configuration
 SERVICE_PORT = 9117
-SERVICE_PORT_TITLE = Jackett(HTTP)
+SERVICE_PORT_TITLE = Jackett (HTTP)
 
 # Admin link
 ADMIN_PORT = $(SERVICE_PORT)
 
 UNSUPPORTED_ARCHS = $(PPC_ARCHS)
+DSM7_ARMv7_ARCHS_DEPENDING_ON_MONO = armada370 alpine alpine4k
 
-# Mono build for unsupported .NET archs
+# Use Mono for unsupported .NET archs
 include ../../mk/spksrc.common.mk
 ifeq ($(call version_lt, ${TCVERSION}, 7.0),1)
-# dotnet requires libstdc++ version >= 6.0.22
-DEPENDS += cross/libstdc++
 ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(i686_ARCHS) $(ARMv7L_ARCHS) $(ARMv7_ARCHS)),$(ARCH))
-DEPENDS = cross/curl cross/$(SPK_NAME)-mono
+DEPENDS = cross/curl cross/jackett-mono
 SERVICE_SETUP = src/service-setup-mono.sh
 SPK_DEPENDS = "mono>=5.8"
+else
+DEPENDS = cross/jackett
+# dotnet requires libstdc++ version >= 6.0.22
+DEPENDS += cross/libstdc++
 endif
 else
-ifeq ($(findstring $(ARCH),$(i686_ARCHS) armada370 alpine alpine4k),$(ARCH))
-DEPENDS = cross/curl cross/$(SPK_NAME)-mono
+ifeq ($(findstring $(ARCH),$(i686_ARCHS) $(DSM7_ARMv7_ARCHS_DEPENDING_ON_MONO)),$(ARCH))
+DEPENDS = cross/curl cross/jackett-mono
 SERVICE_SETUP = src/service-setup-mono.sh
 SPK_DEPENDS = "mono>=5.8"
+# create one package for all ARMv7 archs that depend on mono
+SPK_PACKAGE_ARCHS = $(DSM7_ARMv7_ARCHS_DEPENDING_ON_MONO)
 else
-UNSUPPORTED_ARCHS += armada370 alpine alpine4k
+DEPENDS = cross/jackett
+# exclude archs that depend on mono from generic package for ARMv7
+UNSUPPORTED_ARCHS += $(DSM7_ARMv7_ARCHS_DEPENDING_ON_MONO)
 endif
 endif