From f18beaa1e4e31aa42f3125de5be06da057e5340f Mon Sep 17 00:00:00 2001
From: Aaron Klotz <aaron@tailscale.com>
Date: Wed, 1 Mar 2023 15:36:21 -0700
Subject: [PATCH] cmd/mkmanifest, cmd/tailscale, cmd/tailscaled: remove Windows
 arm32 resources from OSS

Given recent changes in corp, I originally thought we could remove all of the
syso files, but then I realized that we still need them so that binaries built
purely from OSS (without going through corp) will still receive a manifest.

We can remove the arm32 one though, since we don't support 32-bit ARM on Windows.

Updates https://github.com/tailscale/corp/issues/9576

Signed-off-by: Aaron Klotz <aaron@tailscale.com>
---
 cmd/mkmanifest/main.go                   |   2 +-
 cmd/tailscale/generate.go                |   1 -
 cmd/tailscale/manifest_windows_arm.syso  | Bin 812 -> 0 bytes
 cmd/tailscaled/generate.go               |   1 -
 cmd/tailscaled/manifest_windows_arm.syso | Bin 812 -> 0 bytes
 5 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 cmd/tailscale/manifest_windows_arm.syso
 delete mode 100644 cmd/tailscaled/manifest_windows_arm.syso

diff --git a/cmd/mkmanifest/main.go b/cmd/mkmanifest/main.go
index 7209fe3b7..fb3c729f1 100644
--- a/cmd/mkmanifest/main.go
+++ b/cmd/mkmanifest/main.go
@@ -19,7 +19,7 @@ func main() {
 
 	arch := winres.Arch(os.Args[1])
 	switch arch {
-	case winres.ArchAMD64, winres.ArchARM64, winres.ArchI386, winres.ArchARM:
+	case winres.ArchAMD64, winres.ArchARM64, winres.ArchI386:
 	default:
 		log.Fatalf("unsupported arch: %s", arch)
 	}
diff --git a/cmd/tailscale/generate.go b/cmd/tailscale/generate.go
index 377ccd5e9..5c2e9be91 100644
--- a/cmd/tailscale/generate.go
+++ b/cmd/tailscale/generate.go
@@ -6,4 +6,3 @@ package main
 //go:generate go run tailscale.com/cmd/mkmanifest amd64 windows-manifest.xml manifest_windows_amd64.syso
 //go:generate go run tailscale.com/cmd/mkmanifest 386 windows-manifest.xml manifest_windows_386.syso
 //go:generate go run tailscale.com/cmd/mkmanifest arm64 windows-manifest.xml manifest_windows_arm64.syso
-//go:generate go run tailscale.com/cmd/mkmanifest arm windows-manifest.xml manifest_windows_arm.syso
diff --git a/cmd/tailscale/manifest_windows_arm.syso b/cmd/tailscale/manifest_windows_arm.syso
deleted file mode 100644
index 1a92ede02c5e50bd5410ab14bffb0d27c08a9b87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 812
zcma)*&u*MB5XRZ0r&Z5YkFM{ti@|`2fb>+QrylzEI>vU31O{P}Hi|0s;ral1q}sb(
zDci1^eqzipeEckpho7re6!h#oiuPF)ZDu#OyXt<qKZ~Nur%$~nDEMCPuJClwDthiy
zA3qM2{e89b$0zFH{gsbTJ{G^nLDl8Ap(i(bcHL-e$~G}2+P0(W?B|-kfA<OmC2m2h
zuph0i>8*D3vRPN?oE~I<OZ@lN)%1F{7q0!H2XruW?L4~CEYOa_1-fB#!zdZhc1FA9
z!^6#*^_q~%+a_E(+4bG>AH*YjU^gBTRN*xBUF%V!J=At}cRfwxylD02EqSeKdY5J_
z6|zLgRG9-eQi0Hk0!%oMlO!``ir?wBA=L{2^0BjO{OU+S0RGM8n3zQ96tYy7z&U3i
zv1~!*rQ*mj*QxlMD<0)ClNWhg<RD_rfG24QWhNzvRK+G&vBKgMcf%ef3muyRSpw3?
z)OSJ)@O{aE3!}0aS%&3_PO$g^xZ3{F_iB4|ME;Py<@dle>o9v^7K6@?{(vy;=g||t
F{sJ&o!g&Ay

diff --git a/cmd/tailscaled/generate.go b/cmd/tailscaled/generate.go
index 377ccd5e9..5c2e9be91 100644
--- a/cmd/tailscaled/generate.go
+++ b/cmd/tailscaled/generate.go
@@ -6,4 +6,3 @@ package main
 //go:generate go run tailscale.com/cmd/mkmanifest amd64 windows-manifest.xml manifest_windows_amd64.syso
 //go:generate go run tailscale.com/cmd/mkmanifest 386 windows-manifest.xml manifest_windows_386.syso
 //go:generate go run tailscale.com/cmd/mkmanifest arm64 windows-manifest.xml manifest_windows_arm64.syso
-//go:generate go run tailscale.com/cmd/mkmanifest arm windows-manifest.xml manifest_windows_arm.syso
diff --git a/cmd/tailscaled/manifest_windows_arm.syso b/cmd/tailscaled/manifest_windows_arm.syso
deleted file mode 100644
index 1a92ede02c5e50bd5410ab14bffb0d27c08a9b87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 812
zcma)*&u*MB5XRZ0r&Z5YkFM{ti@|`2fb>+QrylzEI>vU31O{P}Hi|0s;ral1q}sb(
zDci1^eqzipeEckpho7re6!h#oiuPF)ZDu#OyXt<qKZ~Nur%$~nDEMCPuJClwDthiy
zA3qM2{e89b$0zFH{gsbTJ{G^nLDl8Ap(i(bcHL-e$~G}2+P0(W?B|-kfA<OmC2m2h
zuph0i>8*D3vRPN?oE~I<OZ@lN)%1F{7q0!H2XruW?L4~CEYOa_1-fB#!zdZhc1FA9
z!^6#*^_q~%+a_E(+4bG>AH*YjU^gBTRN*xBUF%V!J=At}cRfwxylD02EqSeKdY5J_
z6|zLgRG9-eQi0Hk0!%oMlO!``ir?wBA=L{2^0BjO{OU+S0RGM8n3zQ96tYy7z&U3i
zv1~!*rQ*mj*QxlMD<0)ClNWhg<RD_rfG24QWhNzvRK+G&vBKgMcf%ef3muyRSpw3?
z)OSJ)@O{aE3!}0aS%&3_PO$g^xZ3{F_iB4|ME;Py<@dle>o9v^7K6@?{(vy;=g||t
F{sJ&o!g&Ay