update how additional binaries are found on macOS

so far to force macadam to use its own "installed" gvproxy/vfkit/libkrun we forced podman to look at their paths by setting the variable config.additionalHelperBinariesDir.

With our own findBinary implementation this is not needed anymore as we search directly the path /opt/macadam/bin as first option

Signed-off-by: Luca Stocchi <lstocchi@redhat.com>

Author: lstocchi

Makefile

@@ -2,9 +2,6 @@
 
 GIT_VERSION ?= $(shell git describe --always --dirty)
 VERSION_LDFLAGS=-X github.com/crc-org/macadam/pkg/cmdline.gitVersion=$(GIT_VERSION)
-MACADAM_LDFLAGS = \
-    $(VERSION_LDFLAGS) \
-    -X github.com/containers/common/pkg/config.additionalHelperBinariesDir=$(HELPER_BINARIES_DIR)
 # opengpg and btrfs support are used by github.com/containers/image and
 # github.com/containers/storage when container images are fetched.
 # These require external C libraries and their headers, it's simpler to disable
@@ -38,15 +35,13 @@ clean:
 
 bin/macadam-darwin-amd64: GOOS=darwin
 bin/macadam-darwin-amd64: GOARCH=amd64
-bin/macadam-darwin-amd64: HELPER_BINARIES_DIR=/opt/macadam/bin
 bin/macadam-darwin-amd64: force-build
-	GOARCH=$(GOARCH) GOOS=$(GOOS) go build -tags "$(BUILDTAGS)" -ldflags "$(MACADAM_LDFLAGS)" -o bin/macadam-$(GOOS)-$(GOARCH) ./cmd/macadam
+	GOARCH=$(GOARCH) GOOS=$(GOOS) go build -tags "$(BUILDTAGS)" -ldflags "$(VERSION_LDFLAGS)" -o bin/macadam-$(GOOS)-$(GOARCH) ./cmd/macadam
 
 bin/macadam-darwin-arm64: GOOS=darwin
 bin/macadam-darwin-arm64: GOARCH=arm64
-bin/macadam-darwin-arm64: HELPER_BINARIES_DIR=/opt/macadam/bin
 bin/macadam-darwin-arm64: force-build
-	GOARCH=$(GOARCH) GOOS=$(GOOS) go build -tags "$(BUILDTAGS)" -ldflags "$(MACADAM_LDFLAGS)" -o bin/macadam-$(GOOS)-$(GOARCH) ./cmd/macadam
+	GOARCH=$(GOARCH) GOOS=$(GOOS) go build -tags "$(BUILDTAGS)" -ldflags "$(VERSION_LDFLAGS)" -o bin/macadam-$(GOOS)-$(GOARCH) ./cmd/macadam
 
 bin/macadam-linux-amd64: GOOS=linux
 bin/macadam-linux-amd64: GOARCH=amd64

pkg/preflights/preflights_darwin.go

@@ -44,8 +44,9 @@ func checkKrunKitAvailability(provider vmconfigs.VMProvider) error {
 func getBinariesDirs() []string {
 	// On Mac, Podman helper binaries dirs can be found at
 	// https://github.com/containers/common/blob/main/pkg/config/config_darwin.go#L15-L28
-	// We use the same to detect the binaries
+	// We use the same to detect the binaries and add /opt/macadam/bin to the list
 	return []string{
+		"/opt/macadam/bin",
 		// Relative to the binary directory
 		"$BINDIR/../libexec/podman",
 		// Homebrew install paths