From 0ada42684b51cebc890493103910574df6fa7d45 Mon Sep 17 00:00:00 2001 From: Maisem Ali Date: Fri, 21 Jan 2022 12:05:48 -0800 Subject: [PATCH] Makefile: update make spk target to use the new go spk builder Signed-off-by: Maisem Ali --- .gitignore | 1 + Makefile | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 39a4e8702..00a5ea16e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ *.dll *.so *.dylib +*.spk cmd/tailscale/tailscale cmd/tailscaled/tailscaled diff --git a/Makefile b/Makefile index bd270cd24..8d2e3a1a9 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,6 @@ IMAGE_REPO ?= tailscale/tailscale +SYNO_ARCH ?= "amd64" +SYNO_DSM ?= "7" usage: echo "See Makefile" @@ -32,9 +34,13 @@ staticcheck: go run honnef.co/go/tools/cmd/staticcheck -- $$(go list ./... | grep -v tempfork) spk: - go run github.com/tailscale/tailscale-synology@main --version=build -o tailscale.spk --source=. + PATH="${PWD}/tool:${PATH}" ./tool/go run github.com/tailscale/tailscale-synology@main -o tailscale.spk --source=. --goarch=${SYNO_ARCH} --dsm-version=${SYNO_DSM} + +spkall: + mkdir -p spks + PATH="${PWD}/tool:${PATH}" ./tool/go run github.com/tailscale/tailscale-synology@main -o spks --source=. --goarch=all --dsm-version=all pushspk: spk - echo "Pushing SPKG to root@${SYNOHOST} (env var SYNOHOST) ..." - scp tailscale.spk root@${SYNOHOST}: - ssh root@${SYNOHOST} /usr/syno/bin/synopkg install tailscale.spk + echo "Pushing SPK to root@${SYNO_HOST} (env var SYNO_HOST) ..." + scp tailscale.spk root@${SYNO_HOST}: + ssh root@${SYNO_HOST} /usr/syno/bin/synopkg install tailscale.spk