From fe548dd0b053389829bbd385c64cd580fb378ae4 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Tue, 29 Nov 2022 10:44:22 +0100
Subject: [PATCH] linux: Add -linux suffix to podman-remote-static binaries

This is more consistent with the name of the other released files, and
makes identification of the binaries easier among the Windows/macOS
ones.

Related: https://github.com/containers/podman/issues/16612
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
---
 Makefile                                |  8 ++++----
 RELEASE_PROCESS.md                      | 12 ++++++------
 contrib/podmanremoteimage/Containerfile |  4 ++--
 contrib/podmanremoteimage/README.md     |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index b8d259ed78..e9daf0604c 100644
--- a/Makefile
+++ b/Makefile
@@ -335,7 +335,7 @@ $(SRCBINDIR)/podman$(BINSFX): $(SOURCES) go.mod go.sum | $(SRCBINDIR)
 		-tags "${REMOTETAGS}" \
 		-o $@ ./cmd/podman
 
-$(SRCBINDIR)/podman-remote-static_amd64 $(SRCBINDIR)/podman-remote-static_arm64: $(SRCBINDIR)/podman-remote-static_%: $(SRCBINDIR) $(SOURCES) go.mod go.sum
+$(SRCBINDIR)/podman-remote-static-linux_amd64 $(SRCBINDIR)/podman-remote-static-linux_arm64: $(SRCBINDIR)/podman-remote-static-linux_%: $(SRCBINDIR) $(SOURCES) go.mod go.sum
 	CGO_ENABLED=0 \
 	GOOS=linux \
 	GOARCH=$* \
@@ -362,9 +362,9 @@ $(SRCBINDIR)/quadlet: $(SOURCES) go.mod go.sum
 .PHONY: quadlet
 quadlet: bin/quadlet
 
-PHONY: podman-remote-static_amd64 podman-remote-static_arm64
-podman-remote-static_amd64: $(SRCBINDIR)/podman-remote-static_amd64
-podman-remote-static_arm64: $(SRCBINDIR)/podman-remote-static_arm64
+PHONY: podman-remote-static-linux_amd64 podman-remote-static-linux_arm64
+podman-remote-static-linux_amd64: $(SRCBINDIR)/podman-remote-static-linux_amd64
+podman-remote-static-linux_arm64: $(SRCBINDIR)/podman-remote-static-linux_arm64
 
 .PHONY: podman-winpath
 podman-winpath: $(SOURCES) go.mod go.sum
diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md
index a90e02e71d..9037b87f5d 100644
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -244,12 +244,12 @@ spelled with complete minutiae.
       $ make podman-remote-release-darwin_amd64.zip \
           podman-remote-release-darwin_arm64.zip \
           podman-remote-release-windows_amd64.zip \
-          podman-remote-static_amd64 \
-          podman-remote-static_arm64
+          podman-remote-static-linux_amd64 \
+          podman-remote-static-linux_arm64
       $ mv podman-* bin/
       $ cd bin/
-      $ tar -cvzf podman-remote-static_amd64.tar.gz podman-remote-static_amd64
-      $ tar -cvzf podman-remote-static_arm64.tar.gz podman-remote-static_arm64
+      $ tar -cvzf podman-remote-static-linux_amd64.tar.gz podman-remote-static-linux_amd64
+      $ tar -cvzf podman-remote-static-linux_arm64.tar.gz podman-remote-static-linux_arm64
       $ sha256sum *.zip *.tar.gz > shasums
       ```
 
@@ -272,8 +272,8 @@ spelled with complete minutiae.
       * podman-remote-release-darwin_arm64.zip
       * podman-remote-release-windows_amd64.zip
       * podman-vX.Y.Z.msi
-      * podman-remote-static_amd64.tar.gz
-      * podman-remote-static_arm64.tar.gz
+      * podman-remote-static-linux_amd64.tar.gz
+      * podman-remote-static-linux_arm64.tar.gz
       * shasums
    1. Click the Publish button to make the release (or pre-release)
       available.
diff --git a/contrib/podmanremoteimage/Containerfile b/contrib/podmanremoteimage/Containerfile
index 7914b1c260..7d19bf6b08 100644
--- a/contrib/podmanremoteimage/Containerfile
+++ b/contrib/podmanremoteimage/Containerfile
@@ -1,10 +1,10 @@
 FROM registry.access.redhat.com/ubi8/go-toolset:latest AS builder
 WORKDIR /opt/app-root/src
 COPY . .
-RUN make podman-remote-static_amd64
+RUN make podman-remote-static-linux_amd64
 RUN GOOS=windows make podman-remote
 RUN GOOS=darwin make podman-remote
 
 FROM scratch
 COPY --from=builder /opt/app-root/src/bin .
-ENTRYPOINT ["/podman-remote-static_amd64"]
+ENTRYPOINT ["/podman-remote-static-linux_amd64"]
diff --git a/contrib/podmanremoteimage/README.md b/contrib/podmanremoteimage/README.md
index 8589b0f1b8..ea4be3a865 100644
--- a/contrib/podmanremoteimage/README.md
+++ b/contrib/podmanremoteimage/README.md
@@ -16,7 +16,7 @@ $ podman cp $(podman create --name remote-temp quay.io/containers/podman-remote-
 
 - For Linux binary
 ```bash
-$ podman cp $(podman create --name remote-temp quay.io/containers/podman-remote-artifacts:latest):/podman-remote-static_amd64 . && podman rm remote-temp
+$ podman cp $(podman create --name remote-temp quay.io/containers/podman-remote-artifacts:latest):/podman-remote-static-linux_amd64 . && podman rm remote-temp
 ```
 
 - For Mac binary