cops, bicbucstriim: update to depend on DSM 7.2 (SynoCommunity#6340)

* cops: update to depend on DSM 7.2 (SynoCommunity#6339) - handle REQUIRED_MIN_DSM = 7.2 for noarch packages - source file was renamed * update build matrix for noarch-7.2 - add option to include noarch-7.2 packages in build workflow - use different name for noarch-7.2 to allow parallel 7.0 and 7.2 packages * bicbucstriim: update to depend on DSM 7.2 - fix source url - use REQUIRED_MIN_DSM = 7.2 for PHP8.2 - remove SERVICE_USER (required for DSM 6 only)
urosch · Dec 9, 2024 · d30eff8 · d30eff8
1 parent 3d47f98
commit d30eff8
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 24 deletions.
diff --git 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
@@ -93,6 +101,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 }}
@@ -132,7 +141,8 @@ jobs:
         id: set-defaults
         run: |
           echo "add_noarch_builds=${{ github.event.inputs.add_noarch_builds || steps.dependencies.outputs.has_noarch_packages }}" >> $GITHUB_OUTPUT
-          echo "add_dsm72_builds=${{ github.event.inputs.add_dsm72_builds || steps.dependencies.outputs.has_min_dsm72_packages }}" >> $GITHUB_OUTPUT
+          echo "add_noarch_dsm72_builds=${{ github.event.inputs.add_noarch_dsm72_builds || (steps.dependencies.outputs.has_noarch_packages && steps.dependencies.outputs.has_min_dsm72_packages) }}" >> $GITHUB_OUTPUT
+          echo "add_dsm72_builds=${{ github.event.inputs.add_dsm72_builds || (steps.dependencies.outputs.has_arch_packages && steps.dependencies.outputs.has_min_dsm72_packages) }}" >> $GITHUB_OUTPUT
           echo "add_dsm71_builds=${{ github.event.inputs.add_dsm71_builds || steps.dependencies.outputs.has_arch_packages }}" >> $GITHUB_OUTPUT
           echo "add_dsm62_builds=${{ github.event.inputs.add_dsm62_builds || steps.dependencies.outputs.has_arch_packages }}" >> $GITHUB_OUTPUT
           echo "add_dsm52_builds=${{ github.event.inputs.add_dsm52_builds || 'false' }}" >> $GITHUB_OUTPUT
@@ -163,6 +173,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 }}
@@ -178,6 +189,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/cross/bicbucstriim/Makefile b/cross/bicbucstriim/Makefile
@@ -1,9 +1,9 @@
-PKG_NAME = BicBucStriim
+PKG_NAME = bicbucstriim
 PKG_VERS = 3.5.2
 PKG_EXT = zip
-PKG_DIST_NAME = bicbucstriim-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/mikespub-org/rvolz-$(PKG_NAME)/releases/download/v$(PKG_VERS)
-PKG_DIR = bicbucstriim
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-php82.$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/mikespub-org/rvolz-BicBucStriim/releases/download/v$(PKG_VERS)
+PKG_DIR = $(PKG_NAME)
 EXTRACT_PATH = $(WORK_DIR)/$(PKG_DIR)
 
 DEPENDS =
@@ -18,5 +18,5 @@ include ../../mk/spksrc.install-resources.mk
 
 .PHONY: bicbucstriim_install
 bicbucstriim_install:
-	mkdir -p $(STAGING_INSTALL_PREFIX)/share/bbs
-	tar -cf - -C $(WORK_DIR)/$(PKG_DIR) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/bbs
+	@mkdir -p $(STAGING_INSTALL_PREFIX)/share/bbs
+	@tar -cf - -C $(WORK_DIR)/$(PKG_DIR) . | tar -xf - -C $(STAGING_INSTALL_PREFIX)/share/bbs
diff --git a/cross/bicbucstriim/digests b/cross/bicbucstriim/digests
@@ -1,3 +1,3 @@
-bicbucstriim-3.5.2.zip SHA1 b1dee2639c258d4f7d4afa0cc41b3ac7f5cd1dc5
-bicbucstriim-3.5.2.zip SHA256 1a6670edbd56043dc6a4e16ab779ebbc8aada9489eaec9630cbc6b7eef769906
-bicbucstriim-3.5.2.zip MD5 264ff78755e269be4b06e6e97fa8e731
+bicbucstriim-3.5.2-php82.zip SHA1 b1dee2639c258d4f7d4afa0cc41b3ac7f5cd1dc5
+bicbucstriim-3.5.2-php82.zip SHA256 1a6670edbd56043dc6a4e16ab779ebbc8aada9489eaec9630cbc6b7eef769906
+bicbucstriim-3.5.2-php82.zip MD5 264ff78755e269be4b06e6e97fa8e731
diff --git a/cross/cops/Makefile b/cross/cops/Makefile
@@ -1,7 +1,7 @@
 PKG_NAME = cops
 PKG_VERS = 3.2.2
 PKG_EXT = zip
-PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-php82.$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/mikespub-org/seblucas-cops/releases/download/$(PKG_VERS)
 PKG_DIR = cops
 EXTRACT_PATH = $(WORK_DIR)/$(PKG_DIR)

diff --git a/cross/cops/digests b/cross/cops/digests
@@ -1,3 +1,3 @@
-cops-3.2.2.zip SHA1 530c525cdfdb72040d089d031e8d48053d68437c
-cops-3.2.2.zip SHA256 c3dbb1a310d846364e7a1c3f1453098a2273b45a80655a57fadc5a393868797b
-cops-3.2.2.zip MD5 1e89e57e7862df462a1f6b397858bd4b
+cops-3.2.2-php82.zip SHA1 530c525cdfdb72040d089d031e8d48053d68437c
+cops-3.2.2-php82.zip SHA256 c3dbb1a310d846364e7a1c3f1453098a2273b45a80655a57fadc5a393868797b
+cops-3.2.2-php82.zip MD5 1e89e57e7862df462a1f6b397858bd4b
diff --git a/mk/spksrc.spk.mk b/mk/spksrc.spk.mk
@@ -60,8 +60,13 @@ ifneq ($(strip $(TCVERSION)),)
 SPK_ARCH = noarch
 SPK_NAME_ARCH = noarch
 ifeq ($(call version_ge, $(TCVERSION), 7.0),1)
+ifeq ($(call version_ge, $(TCVERSION), 7.2),1)
+SPK_TCVERS = dsm72
+TC_OS_MIN_VER = 7.2-63134
+else
 SPK_TCVERS = dsm7
 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/bicbucstriim/Makefile b/spk/bicbucstriim/Makefile
@@ -1,19 +1,19 @@
 SPK_NAME = bicbucstriim
 SPK_VERS = 3.5.2
-SPK_REV = 8
+SPK_REV = 9
 SPK_ICON = src/bicbucstriim.png
 
 DEPENDS = cross/bicbucstriim
 # 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 = BicBucStriim streams books, digital books. It fills a gap in the functionality of current NAS devices, which provide access to your collection of music, videos and photos -- but not books. BicBucStriim covers that area and provides web-based access to your e-book collection.
 DISPLAY_NAME = BicBucStriim
-CHANGELOG = Update to v3.5.2 \(Requires PHP 8.2\)
+CHANGELOG = "Update to v3.5.2 (Requires PHP 8.2 and DSM 7.2)"
 
 HOMEPAGE = https://github.com/mikespub-org/rvolz-BicBucStriim/
 LICENSE = MIT
@@ -28,8 +28,6 @@ DSM_UI_DIR = app
 DSM_UI_CONFIG = src/app/config
 CONF_DIR = src/conf/
 
-# Set user as 'auto' for DSM 6 privilege
-SERVICE_USER = auto
 SERVICE_SETUP = src/service-setup.sh
 STARTABLE = no
 

diff --git 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
-SPK_DEPENDS=WebStation:PHP8.2:Apache2.4
+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
@@ -30,7 +30,6 @@ DSM_UI_DIR = app
 DSM_UI_CONFIG = src/app/config
 CONF_DIR = src/conf/
 
-SERVICE_USER = auto
 SERVICE_SETUP = src/service-setup.sh
 STARTABLE = no