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

tools/make: fix dependencies for package targets #56

Merged
merged 1 commit into from
Mar 21, 2024
Merged

tools/make: fix dependencies for package targets #56

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
12 changes: 6 additions & 6 deletions tools/make/packaging.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ define generate_agent_fpm =
--config-files $(AGENT_ENVIRONMENT_FILE_$(1)) \
--rpm-rpmbuild-define "_build_id_links none" \
--package $(4) \
dist.temp/grafana-agent-linux-$(3)=/usr/bin/grafana-agent \
dist/grafana-agent-linux-$(3)=/usr/bin/grafana-agent \
packaging/grafana-agent-/grafana-agent.river=/etc/grafana-agent.river \
packaging/grafana-agent-/environment-file=$(AGENT_ENVIRONMENT_FILE_$(1)) \
packaging/grafana-agent-/$(1)/grafana-agent.service=/usr/lib/systemd/system/grafana-agent.service
Expand All @@ -167,7 +167,7 @@ dist-agent-packages: dist-agent-packages-amd64 \
dist-agent-packages-s390x

.PHONY: dist-agent-packages-amd64
dist-agent-packages-amd64: dist.temp/grafana-agent-linux-amd64
dist-agent-packages-amd64: dist/grafana-agent-linux-amd64
ifeq ($(USE_CONTAINER),1)
$(RERUN_IN_CONTAINER)
else
Expand All @@ -176,7 +176,7 @@ else
endif

.PHONY: dist-agent-packages-arm64
dist-agent-packages-arm64: dist.temp/grafana-agent-linux-arm64
dist-agent-packages-arm64: dist/grafana-agent-linux-arm64
ifeq ($(USE_CONTAINER),1)
$(RERUN_IN_CONTAINER)
else
Expand All @@ -185,7 +185,7 @@ else
endif

.PHONY: dist-agent-packages-ppc64le
dist-agent-packages-ppc64le: dist.temp/grafana-agent-linux-ppc64le
dist-agent-packages-ppc64le: dist/grafana-agent-linux-ppc64le
ifeq ($(USE_CONTAINER),1)
$(RERUN_IN_CONTAINER)
else
Expand All @@ -194,7 +194,7 @@ else
endif

.PHONY: dist-agent-packages-s390x
dist-agent-packages-s390x: dist.temp/grafana-agent-linux-s390x
dist-agent-packages-s390x: dist/grafana-agent-linux-s390x
ifeq ($(USE_CONTAINER),1)
$(RERUN_IN_CONTAINER)
else
Expand All @@ -207,7 +207,7 @@ endif
#

.PHONY: dist-agent-installer
dist-agent-installer: dist.temp/grafana-agent-windows-amd64.exe dist.temp/grafana-agent-service-windows-amd64.exe
dist-agent-installer: dist/grafana-agent-windows-amd64.exe dist.temp/grafana-agent-service-windows-amd64.exe
ifeq ($(USE_CONTAINER),1)
$(RERUN_IN_CONTAINER)
else
Expand Down
Loading