diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f393f7ff44..d6d3e3d9894 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,6 +23,14 @@ on: options: - 'true' - 'false' + add_noarch_dsm72_builds: + description: 'Include noarch DSM 7.2 packages' + required: false + default: 'false' + type: choice + options: + - 'true' + - 'false' add_dsm72_builds: description: 'Include DSM 7.2 archs' required: false @@ -85,6 +93,7 @@ jobs: arch_packages: ${{ steps.dependencies.outputs.arch_packages }} noarch_packages: ${{ steps.dependencies.outputs.noarch_packages }} add_noarch_builds: ${{ steps.set-defaults.outputs.add_noarch_builds }} + add_noarch_dsm72_builds: ${{ steps.set-defaults.outputs.add_noarch_dsm72_builds }} add_dsm72_builds: ${{ steps.set-defaults.outputs.add_dsm72_builds }} add_dsm71_builds: ${{ steps.set-defaults.outputs.add_dsm71_builds }} add_dsm62_builds: ${{ steps.set-defaults.outputs.add_dsm62_builds }} @@ -154,6 +163,7 @@ jobs: run: | # Use the default values passed from the prepare step add_noarch_builds=${{ needs.prepare.outputs.add_noarch_builds }} + add_noarch_dsm72_builds=${{ needs.prepare.outputs.add_noarch_dsm72_builds }} add_dsm72_builds=${{ needs.prepare.outputs.add_dsm72_builds }} add_dsm71_builds=${{ needs.prepare.outputs.add_dsm71_builds }} add_dsm62_builds=${{ needs.prepare.outputs.add_dsm62_builds }} @@ -168,6 +178,9 @@ jobs: matrix+='{"arch": "noarch-3.1"},' matrix+='{"arch": "noarch-6.1"},' matrix+='{"arch": "noarch-7.0"},' + if [ "$add_noarch_dsm72_builds" == "true" ]; then + matrix+='{"arch": "noarch-7.2"},' + fi fi if [ "$add_dsm72_builds" == "true" ]; then matrix+='{"arch": "x64-7.2"},' diff --git a/mk/spksrc.spk.mk b/mk/spksrc.spk.mk index d827325fc0a..8566f2c54ef 100644 --- a/mk/spksrc.spk.mk +++ b/mk/spksrc.spk.mk @@ -61,7 +61,11 @@ SPK_ARCH = noarch SPK_NAME_ARCH = noarch ifeq ($(call version_ge, $(TCVERSION), 7.0),1) SPK_TCVERS = dsm7 +ifeq ($(call version_ge, $(TCVERSION), 7.2),1) +TC_OS_MIN_VER = 7.2-63134 +else TC_OS_MIN_VER = 7.0-40000 +endif else ifeq ($(call version_ge, $(TCVERSION), 6.1),1) SPK_TCVERS = dsm6 TC_OS_MIN_VER = 6.1-15047 diff --git a/spk/cops/Makefile b/spk/cops/Makefile index d36bce9d6d1..6aac5f8bb7f 100644 --- a/spk/cops/Makefile +++ b/spk/cops/Makefile @@ -1,20 +1,20 @@ SPK_NAME = cops SPK_VERS = 3.2.2 -SPK_REV = 11 +SPK_REV = 12 SPK_ICON = src/cops.png DEPENDS = cross/cops # Pure PHP package, make sure ARCH is noarch override ARCH=noarch -REQUIRED_MIN_DSM = 7.0 +REQUIRED_MIN_DSM = 7.2 SPK_DEPENDS=WebStation:PHP8.2:Apache2.4 MAINTAINER = SynoCommunity DESCRIPTION = Calibre OPDS and HTML PHP Server : light alternative to Calibre content server / Calibre2OPDS. DESCRIPTION_FRE = Calibre OPDS et HTML PHP Serveur : alternative légère au serveur de contenu de Calibre et à Calibre2OPDS. DISPLAY_NAME = COPS -CHANGELOG = "1. Update to v3.2.2. (Requires PHP 8.2)" +CHANGELOG = "1. Update to v3.2.2. (Requires PHP 8.2 and DSM 7.2)" HOMEPAGE = https://blog.slucas.fr/en/oss/calibre-opds-php-server LICENSE = GPLv2