From 4f3e57aea2eee0793ab7cf75012ea73d40fa6bff Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Sun, 17 Mar 2024 11:36:07 +0100 Subject: [PATCH] add FreeBSD/arm64 to packaging targets --- CHANGELOG.md | 2 ++ tools/make/packaging.mk | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3021ebe446b..dea244b27b63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,8 @@ Main (unreleased) - Add ability to convert static mode positions file to `loki.source.file` compatible via `legacy_positions_file` argument. (@mattdurham) +- Add support for FreeBSD/arm64. (@evgeni) + - Added support for `otelcol` configuration conversion in `grafana-agent convert` and `grafana-agent run` commands. (@rfratto, @erikbaranowski, @tpaschalis, @hainenber) - Added support for `static` configuration conversion of the `traces` subsystem. (@erikbaranowski, @wildum) diff --git a/tools/make/packaging.mk b/tools/make/packaging.mk index 47dbd80b7973..ccc70de8a253 100644 --- a/tools/make/packaging.mk +++ b/tools/make/packaging.mk @@ -29,6 +29,7 @@ dist-agent-binaries: dist/grafana-agent-linux-amd64 \ dist/grafana-agent-windows-amd64.exe \ dist/grafana-agent-windows-boringcrypto-amd64.exe \ dist/grafana-agent-freebsd-amd64 \ + dist/grafana-agent-freebsd-arm64 \ dist/grafana-agent-linux-arm64-boringcrypto dist/grafana-agent-linux-amd64: GO_TAGS += netgo builtinassets promtail_journal_enabled @@ -97,6 +98,13 @@ dist/grafana-agent-freebsd-amd64: generate-ui $(PACKAGING_VARS) AGENT_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) agent +dist/grafana-agent-freebsd-arm64: GO_TAGS += netgo builtinassets +dist/grafana-agent-freebsd-arm64: GOOS := freebsd +dist/grafana-agent-freebsd-arm64: GOARCH := arm64 +dist/grafana-agent-freebsd-arm64: generate-ui + $(PACKAGING_VARS) AGENT_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) agent + + dist/grafana-agent-linux-amd64-boringcrypto: GO_TAGS += netgo builtinassets promtail_journal_enabled dist/grafana-agent-linux-amd64-boringcrypto: GOOS := linux dist/grafana-agent-linux-amd64-boringcrypto: GOARCH := amd64 @@ -122,7 +130,8 @@ dist-agentctl-binaries: dist/grafana-agentctl-linux-amd64 \ dist/grafana-agentctl-darwin-amd64 \ dist/grafana-agentctl-darwin-arm64 \ dist/grafana-agentctl-windows-amd64.exe \ - dist/grafana-agentctl-freebsd-amd64 + dist/grafana-agentctl-freebsd-amd64 \ + dist/grafana-agentctl-freebsd-arm64 dist/grafana-agentctl-linux-amd64: GO_TAGS += netgo promtail_journal_enabled dist/grafana-agentctl-linux-amd64: GOOS := linux @@ -171,6 +180,12 @@ dist/grafana-agentctl-freebsd-amd64: GOARCH := amd64 dist/grafana-agentctl-freebsd-amd64: $(PACKAGING_VARS) AGENTCTL_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) agentctl +dist/grafana-agentctl-freebsd-arm64: GO_TAGS += netgo +dist/grafana-agentctl-freebsd-arm64: GOOS := freebsd +dist/grafana-agentctl-freebsd-arm64: GOARCH := arm64 +dist/grafana-agentctl-freebsd-arm64: + $(PACKAGING_VARS) AGENTCTL_BINARY=$@ "$(MAKE)" -f $(PARENT_MAKEFILE) agentctl + # # agent-flow release binaries #