Skip to content

Commit

Permalink
cops: update to depend on DSM 7.2 (SynoCommunity#6339)
Browse files Browse the repository at this point in the history
- handle REQUIRED_MIN_DSM = 7.2 for noarch packages
- add option to include noarch-7.2 packages in build workflow
  • Loading branch information
hgy59 committed Nov 30, 2024
1 parent a3cbcd3 commit 7a058cc
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand All @@ -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"},'
Expand Down
4 changes: 4 additions & 0 deletions mk/spksrc.spk.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions spk/cops/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 7a058cc

Please sign in to comment.