From 7eb0c9ab0f91787c20522e5a98c6872692d6946f Mon Sep 17 00:00:00 2001 From: Guillaume Winter Date: Wed, 1 Nov 2023 15:16:44 +0100 Subject: [PATCH 1/2] Add support for QTS4 installations on x19 packages only The x19 architecture cannot run QTS5 anyway, but can run Tailscale perfectly. Updates #72 --- Tailscale/.DS_Store | Bin 6148 -> 0 bytes Tailscale/qpkg-QTS4.cfg.in | 99 +++++++++++++++++++++++++++++++++++++ build/build-qpkg.sh | 6 ++- 3 files changed, 104 insertions(+), 1 deletion(-) delete mode 100644 Tailscale/.DS_Store create mode 100755 Tailscale/qpkg-QTS4.cfg.in diff --git a/Tailscale/.DS_Store b/Tailscale/.DS_Store deleted file mode 100644 index 3ba64d3532b1a253043b08f524a9986617845e35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5Z>*NHi+1RP>*}@)9U6Gve)_BlgmG zP8G6RPkTP7@u6G#>(r$V8L`I1lM1!$P4*UUx+*}2bFVnW1M1HK+arA`Rs9UZ~ zr>$mHG!GlIs+b-%YE{uXXw7C;sj^=`KI`2-K24uzFRz+d4!=MpI|k?Q2FB6}{kR`` z@QxV1})4Q3i)288QWK%L4>i@|j|_=SnH4Q3j3I^(AK;AUrTIux#U zhxLUDXWZ6EBQZb>d}RQ8Kaeuk|I?rQe-%UnF+dEgCj-3DaXM`{o2jiUr^H$-KzpDl p7?){Wq=2DHF~nji-UC$vet`y{Z7|aa9uWE?plG0h82D2LJ^>GvR(Jpa diff --git a/Tailscale/qpkg-QTS4.cfg.in b/Tailscale/qpkg-QTS4.cfg.in new file mode 100755 index 0000000..d68a08f --- /dev/null +++ b/Tailscale/qpkg-QTS4.cfg.in @@ -0,0 +1,99 @@ +# Name of the packaged application. +QPKG_NAME="Tailscale" +# Name of the display application. +#QPKG_DISPLAY_NAME="" +# Version of the packaged application. +QPKG_VER="$QPKG_VER" +# Author or maintainer of the package +QPKG_AUTHOR="Tailscale Inc." +# License for the packaged application +#QPKG_LICENSE="" +# One-line description of the packaged application +#QPKG_SUMMARY="Connect all your devices using WireGuard, without the hassle." + +# Preferred number in start/stop sequence. +QPKG_RC_NUM="101" +# Init-script used to control the start and stop of the installed application. +QPKG_SERVICE_PROGRAM="Tailscale.sh" + +# Optional 1 is enable. Path of starting/ stopping shall script. (no start/stop on App Center) +#QPKG_DISABLE_APPCENTER_UI_SERVICE=1 + +# On QTS4, the QVPN package is required to create the proper interface for Tailscale to work. +QPKG_REQUIRE="QVPN" +# Specifies what packages cannot be installed if the current package +# is to operate properly. +#QPKG_CONFLICT="Python" +# Name of configuration file (multiple definitions are allowed). +#QPKG_CONFIG="Tailscale.cfg" +#QPKG_CONFIG="/etc/config/myApp.conf" +# Port number used by service program. +QPKG_SERVICE_PORT="41641" +# Location of file with running service's PID +#QPKG_SERVICE_PIDFILE="" +# Relative path to web interface +QPKG_WEBUI="/cgi-bin/qpkg/Tailscale/index.cgi" +# Port number for the web interface. +#QPKG_WEB_PORT="" +# Port number for the SSL web interface. +#QPKG_WEB_SSL_PORT="" + +# Use QTS HTTP Proxy and set Proxy_Path in the qpkg.conf. +# When the QPKG has its own HTTP service port, and want clients to connect via QTS HTTP port (default 8080). +# Usually use this option when the QPKG need to connect via myQNAPcloud service. +QPKG_USE_PROXY="1" +#QPKG_PROXY_PATH="/qpkg_name" + +#Desktop Application (since 4.1) +# Set value to 1 means to open the QPKG's Web UI inside QTS desktop instead of new window. +#QPKG_DESKTOP_APP="1" +# Desktop Application Window default inner width (since 4.1) (not over 1178) +#QPKG_DESKTOP_APP_WIN_WIDTH="" +# Desktop Application Window default inner height (since 4.1) (not over 600) +#QPKG_DESKTOP_APP_WIN_HEIGHT="" + +# Minimum QTS version requirement +QTS_MINI_VERSION="4.0.0" +# Maximum QTS version requirement +#QTS_MAX_VERSION="5.0.0" + +# Select volume +# 1: support installation +# 2: support migration +# 3 (1+2): support both installation and migration +QPKG_VOLUME_SELECT="1" + +# Set timeout for QPKG enable and QPKG disable (since 4.1.0) +# Format in seconds (enable, disable) +#QPKG_TIMEOUT="10,30" + +# Visible setting for the QPKG that has web UI, show this QPKG on the Main menu of +# 1(default): administrators, 2: all NAS users. +QPKG_VISIBLE="1" + +# Location of icons for the packaged application. +QDK_DATA_DIR_ICONS="icons" +# Location of files specific to arm-x19 packages. +#QDK_DATA_DIR_X19="arm-x19" +# Location of files specific to arm-x31 packages. +#QDK_DATA_DIR_X31="arm-x31" +# Location of files specific to arm-x41 packages. +#QDK_DATA_DIR_X41="arm_al" +# Location of files specific to x86 packages. +#QDK_DATA_DIR_X86="x86" +# Location of files specific to x86 (64-bit) packages. +#QDK_DATA_DIR_X86_64="x86_64" +# Location of files common to all architectures. +QDK_DATA_DIR_SHARED="shared" +# Location of configuration files. +#QDK_DATA_DIR_CONFIG="config" +# Name of local data package. +#QDK_DATA_FILE="" +# Name of extra package (multiple definitions are allowed). +#QDK_EXTRA_FILE="" +# For QNAP code signing (currently can be done only inside QNAP) +# Uncomment the following four options if you want to enable code signing for this QPKG +#QNAP_CODE_SIGNING="0" +#QNAP_CODE_SIGNING_SERVER_IP="codesigning.qnap.com.tw" +#QNAP_CODE_SIGNING_SERVER_PORT="5001" +#QNAP_CODE_SIGNING_CSV="build_sign.csv" diff --git a/build/build-qpkg.sh b/build/build-qpkg.sh index 0d692a4..88a7644 100755 --- a/build/build-qpkg.sh +++ b/build/build-qpkg.sh @@ -33,7 +33,11 @@ sed "s/\$QPKG_VER/$TSTAG-$QNAPTAG/g" /Tailscale/qpkg.cfg.in > /Tailscale/qpkg.cf qbuild --root /Tailscale --build-arch x86 --build-dir /out/pkg qbuild --root /Tailscale --build-arch x86_ce53xx --build-dir /out/pkg qbuild --root /Tailscale --build-arch x86_64 --build-dir /out/pkg -qbuild --root /Tailscale --build-arch arm-x19 --build-dir /out/pkg qbuild --root /Tailscale --build-arch arm-x31 --build-dir /out/pkg qbuild --root /Tailscale --build-arch arm-x41 --build-dir /out/pkg qbuild --root /Tailscale --build-arch arm_64 --build-dir /out/pkg + +# arm-x19 NAS don't support QTS5 anyway, so let's downgrade the requirements +# and build this one with QTS 4 support. +sed "s/\$QPKG_VER/$TSTAG-$QNAPTAG/g" /Tailscale/qpkg-QTS4.cfg.in >/Tailscale/qpkg.cfg +qbuild --root /Tailscale --build-arch arm-x19 --build-dir /out/pkg From 9623c4346c208af63df8257b16ac72303e36c2e8 Mon Sep 17 00:00:00 2001 From: Denton Gentry Date: Wed, 15 Nov 2023 13:55:16 -0800 Subject: [PATCH 2/2] Makefile: update to 1.54.0 Signed-off-by: Denton Gentry --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cd76c75..d5bfc66 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ TRACK ?= stable # QNAP has a upper limit of 10 characters for the version. # For unstable builds we might have 1.X.YYYY-Z -TSTAG ?= 1.52.0 +TSTAG ?= 1.54.0 QNAPTAG ?= 1 .PHONY: fetch