Add DSM 7 Support

.github/actions/build.sh

@@ -91,7 +91,7 @@ echo "===> ARCH   packages: ${arch_packages}"
 echo "===> NOARCH packages: ${noarch_packages}"
 echo "::endgroup::"
 
-if [ "${GH_ARCH}" = "noarch" ]; then
+if [ "${GH_ARCH%%-*}" = "noarch" ]; then
     build_packages=${noarch_packages}
 else
     build_packages=${arch_packages}
@@ -112,11 +112,16 @@ for package in ${build_packages}
 do
     echo "::group:: ---- build ${package}"
 
-    if [ "${GH_ARCH}" != "noarch" ]; then
+    if [ "${GH_ARCH%%-*}" != "noarch" ]; then
         # use TCVERSION and ARCH to get real exit codes.
         make TCVERSION=${GH_ARCH##*-} ARCH=${GH_ARCH%%-*} -C ./spk/${package}
     else
-        make -C ./spk/${package}
+        if [ "${GH_ARCH}" = "noarch" ]; then
+            TCVERSION=
+        else
+            TCVERSION=${GH_ARCH##*-}
+        fi
+        make TCVERSION=${TCVERSION} ARCH= -C ./spk/${package}
     fi
     result=$?
 

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
       matrix:
         # x64=x86_64, evansport=i686, aarch64=armv8, armv7, hi3535=armv7l, 88f6281=armv5, qoriq=ppc
         # https://github.com/SynoCommunity/spksrc/wiki/Synology-and-SynoCommunity-Package-Architectures
-        arch: [noarch, x64-6.1, evansport-6.1, aarch64-6.1, armv7-6.1, hi3535-6.1, 88f6281-6.1, qoriq-6.1]
+        arch: [noarch, noarch-7.0, x64-6.1, x64-7.0, evansport-6.1, evansport-7.0, aarch64-6.1, aarch64-7.0, armv7-6.1, armv7-7.0, hi3535-6.1, 88f6281-6.1, qoriq-6.1]
 
     steps:
       - name: Cache toolchains

mk/spksrc.common.mk

@@ -70,6 +70,11 @@ COMPILE_MAKE_OPTIONS += -j$(NCPUS)
 endif
 endif
 
+# Terminal colors
+RED=`tput setaf 1`
+GREEN=`tput setaf 2`
+NC=`tput sgr0`
+
 # Version Comparison
 version_le = $(shell if printf '%s\n' "$(1)" "$(2)" | sort -VC ; then echo 1; fi)
 version_ge = $(shell if printf '%s\n' "$(1)" "$(2)" | sort -VCr ; then echo 1; fi)

mk/spksrc.directories.mk

@@ -1,4 +1,4 @@
-# * all goes in $(WORK_DIR) : work-arch, or simple work, in the current directory
+# * all goes in $(WORK_DIR) : work-arch (for noarch: work-all or work-dsm7), in the current directory
 # * it will be installed in $(INSTALL_PREFIX) on the target system (/usr/local/transmission)
 # * each source package is unpacked in $(WORK_DIR)
 # * the install target installs files in $(WORK_DIR)/install/, known as $(INSTALL_DIR)

mk/spksrc.service.installer

@@ -8,6 +8,7 @@ INST_LOG="/tmp/${SYNOPKG_PKGNAME}_install.log"
 INST_ETC="/var/packages/${SYNOPKG_PKGNAME}/etc"
 INST_VARIABLES="${INST_ETC}/installer-variables"
 INST_VAR="${SYNOPKG_PKGDEST}/var"
+SYNOPKG_PKGVAR="${SYNOPKG_PKGDEST}/var" # backwards compatibility
 
 # Optional FWPORTS file
 FWPORTS_FILE="/var/packages/${SYNOPKG_PKGNAME}/conf/${SYNOPKG_PKGNAME}.sc"

mk/spksrc.service.installer.dsm7

@@ -0,0 +1,229 @@
+#!/bin/sh
+
+# DSM 5 -> 7 upgrade path:
+# Not supported
+# DSM 6 -> 7 upgrade path:
+# files are migrated from ${SYNOPKG_PKGDEST}/var to ${SYNOPKG_PKGVAR}
+# Not supported (yet)
+
+INST_ETC="/var/packages/${SYNOPKG_PKGNAME}/etc"
+INST_VARIABLES="${INST_ETC}/installer-variables"
+INST_VAR="${SYNOPKG_PKGVAR}"
+
+# Optional FWPORTS file
+FWPORTS_FILE="/var/packages/${SYNOPKG_PKGNAME}/conf/${SYNOPKG_PKGNAME}.sc"
+
+TMP_DIR="${SYNOPKG_TEMP_UPGRADE_FOLDER}/var"
+
+# Source package specific variable and functions
+SVC_SETUP=`dirname $0`"/service-setup"
+if [ -r "${SVC_SETUP}" ]; then
+    . "${SVC_SETUP}"
+fi
+
+# Reload wizard variables stored by postinst
+if [ -r "${INST_VARIABLES}" ]; then
+    . "${INST_VARIABLES}"
+fi
+
+# Expect user to be set from package specific variables
+if [ -n "${USER}" -a -z "${USER_DESC}" ]; then
+    USER_DESC="User running $SYNOPKG_PKGNAME"
+fi
+
+# Default description if group name provided by UI
+if [ -n "${GROUP}" -a -z "${GROUP_DESC}" ]; then
+    GROUP_DESC="SynoCommunity Package Group"
+fi
+
+# Extract share volume and share name from download location if provided
+if [ -n "${SHARE_PATH}" ]; then
+    SHARE_VOLUME=$(echo "${SHARE_PATH}" | awk -F/ '{print "/"$2}')
+    SHARE_NAME=$(echo "${SHARE_PATH}" | awk -F/ '{print $3}')
+fi
+
+# Tools shortcuts
+MV="/bin/mv -f"
+RM="/bin/rm -rf"
+CP="/bin/cp -rfp"
+MKDIR="/bin/mkdir -p"
+LN="/bin/ln -nsf"
+TEE="/usr/bin/tee -a"
+
+### Functions library
+
+log ()
+{
+    echo "$1" 1>&2 # /var/log/packages/{package}.log
+}
+
+
+log_step ()
+{
+    log $(date)
+    log "===> Step $1. USER=$USER GROUP=$GROUP SHARE_PATH=${SHARE_PATH}"
+}
+
+save_wizard_variables ()
+{
+    if [ -e "${INST_VARIABLES}" ]; then
+        $RM "${INST_VARIABLES}"
+    fi
+    if [ -n "${GROUP}" ]; then
+        echo "GROUP=${GROUP}" >> ${INST_VARIABLES}
+    fi
+    if [ -n "${SHARE_PATH}" ]; then
+        echo "SHARE_PATH=${SHARE_PATH}" >> ${INST_VARIABLES}
+    fi
+}
+
+set_unix_permissions ()
+{
+    log "${SYNOPKG_PKGNAME} has not been updated to DSM7 yet. set_unix_permissions() is no longer supported."
+}
+
+syno_remove_user ()
+{
+    log "${SYNOPKG_PKGNAME} has not been updated to DSM7 yet. syno_remove_user() is no longer supported."
+}
+
+syno_group_create ()
+{
+    log "${SYNOPKG_PKGNAME} has not been updated to DSM7 yet. syno_group_create() is no longer supported."
+}
+
+syno_group_remove ()
+{
+    log "${SYNOPKG_PKGNAME} has not been updated to DSM7 yet. syno_group_remove() is no longer supported."
+}
+
+syno_user_add_to_group ()
+{
+    log "${SYNOPKG_PKGNAME} has not been updated to DSM7 yet. syno_user_add_to_group() is no longer supported."
+}
+
+set_syno_permissions ()
+{
+    log "${SYNOPKG_PKGNAME} has not been updated to DSM7 yet. set_syno_permissions() is no longer supported."
+}
+
+syno_user_add_to_legacy_group () {
+    log "${SYNOPKG_PKGNAME} has not been updated to DSM7 yet. syno_user_add_to_legacy_group() is no longer supported."
+}
+
+
+### Generic package behaviors
+
+preinst ()
+{
+    log_step "preinst"
+    call_func "service_preinst"
+
+    # Check volume exists
+    if [ -n "${SHARE_PATH}" ]; then
+        if [ ! -d "${SHARE_VOLUME}" ]; then
+            echo "Volume ${SHARE_VOLUME} does not exist." | $TEE 1>&2
+            exit 1
+        fi
+    fi
+
+    exit 0
+}
+
+postinst ()
+{
+    log_step "postinst"
+    save_wizard_variables
+
+    # copy target/var data to permanent storage
+    # and don't override old configurations
+    if [ -d ${SYNOPKG_PKGDEST}/var ] && [ "$(find ${SYNOPKG_PKGVAR} -mindepth 1 -not -name '*.log' -print)" = "" ]; then
+        $CP -RT ${SYNOPKG_PKGDEST}/var/. ${SYNOPKG_PKGVAR}
+    fi
+
+    if [ "${SYNOPKG_PKG_STATUS}" == "INSTALL" ]; then
+        # Add firewall config
+        if [ -r "${FWPORTS_FILE}" ]; then
+            echo "Installing service configuration ${FWPORTS_FILE}" >> ${INST_LOG}
+            servicetool --install-configure-file --package "${FWPORTS_FILE}" >> ${INST_LOG} 2>&1
+        fi
+    fi
+
+    call_func "service_postinst"
+    call_func "service_create_links"
+
+    exit 0
+}
+
+preuninst ()
+{
+    log_step "preuninst"
+
+    if [ "${SYNOPKG_PKG_STATUS}" == "UNINSTALL" ]; then
+        # Remove firewall config
+        if [ -r "${FWPORTS_FILE}" ]; then
+            echo "Removing service configuration ${SYNOPKG_PKGNAME}.sc" >> ${INST_LOG}
+            servicetool --remove-configure-file --package "${SYNOPKG_PKGNAME}.sc" >> ${INST_LOG} 2>&1
+        fi
+    fi
+
+    call_func "service_preuninst"
+    exit 0
+}
+
+postuninst ()
+{
+    log_step "postuninst"
+
+    call_func "service_postuninst"
+    call_func "service_remove_links"
+
+    if [ "$wizard_delete_data" = "true" ]; then
+
+        if [ "$(ls -A ${SYNOPKG_PKGHOME})" != "" ]; then
+            rm -rf ${SYNOPKG_PKGHOME}/
+        fi
+
+        if [ "$(ls -A ${SYNOPKG_PKGVAR})" != "" ]; then
+            rm -rf ${SYNOPKG_PKGVAR}/
+        fi
+
+        if [ "$(ls -A /var/packages/${SYNOPKG_PKGNAME}/etc)" != "" ]; then
+            rm -rf /var/packages/${SYNOPKG_PKGNAME}/etc/
+        fi
+
+        if ["$(ls -A ${SYNOPKG_PKGTMP})" != "" ]; then
+            rm -rf ${SYNOPKG_PKGTMP}/
+        fi
+    fi
+    exit 0
+}
+
+preupgrade ()
+{
+    log_step "preupgrade"
+
+    # dsm6 -> dsm7
+    # Migrate data to permanent storage
+    if [ ! "$(ls -A ${SYNOPKG_PKGVAR})" ]; then
+        # only migrate when destination is empty
+        $CP -RT ${SYNOPKG_PKGDEST}/var/. ${SYNOPKG_PKGVAR}
+    fi
+
+    call_func "service_preupgrade"
+
+    call_func "service_save"
+
+    exit 0
+}
+
+postupgrade ()
+{
+    log_step "postupgrade"
+
+    call_func "service_restore"
+
+    call_func "service_postupgrade"
+
+    exit 0
+}