From 1217f655c0dac6ebd17c70a52b8f4b6366079c23 Mon Sep 17 00:00:00 2001 From: Sonia Appasamy Date: Thu, 8 Feb 2024 14:01:23 -0500 Subject: [PATCH] cmd/dist: update logs for synology builds Update logs for synology builds to more clearly callout which variant is being built. The two existing variants are: 1. Sideloaded (can be manual installed on a device by anyone) 2. Package center distribution (by the tailscale team) Updates #cleanup Signed-off-by: Sonia Appasamy --- cmd/dist/dist.go | 3 +++ release/dist/synology/pkgs.go | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cmd/dist/dist.go b/cmd/dist/dist.go index 31c3fc872..1d57de98d 100644 --- a/cmd/dist/dist.go +++ b/cmd/dist/dist.go @@ -33,6 +33,9 @@ func getTargets() ([]dist.Target, error) { // Since only we can provide packages to Synology for // distribution, we default to building the "sideload" variant of // packages that we distribute on pkgs.tailscale.com. + // + // To build for package center, run + // ./tool/go run ./cmd/dist build --synology-package-center synology ret = append(ret, synology.Targets(synologyPackageCenter, nil)...) return ret, nil } diff --git a/release/dist/synology/pkgs.go b/release/dist/synology/pkgs.go index b1c5c3886..a079b980e 100644 --- a/release/dist/synology/pkgs.go +++ b/release/dist/synology/pkgs.go @@ -44,7 +44,11 @@ func (t *target) Build(b *dist.Build) ([]string, error) { func (t *target) buildSPK(b *dist.Build, inner *innerPkg) ([]string, error) { filename := fmt.Sprintf("tailscale-%s-%s-%d-dsm%d.spk", t.filenameArch, b.Version.Short, b.Version.Synology[t.dsmMajorVersion], t.dsmMajorVersion) out := filepath.Join(b.Out, filename) - log.Printf("Building %s", filename) + if t.packageCenter { + log.Printf("Building %s (for package center)", filename) + } else { + log.Printf("Building %s (for sideloading)", filename) + } privFile := fmt.Sprintf("privilege-dsm%d", t.dsmMajorVersion) if t.packageCenter && t.dsmMajorVersion == 7 {