Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add FreeBSD/arm64 to packaging targets #6751

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add FreeBSD/arm64 to packaging targets #6751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
17 changes: 16 additions & 1 deletion tools/make/packaging.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
#
Expand Down