Merge pull request #653 from mackerelio/pkg-arm

add arm64 RPM packages, and change deb architecture to be correct
mackerelio · Aug 21, 2020 · 6707b22 · 6707b22
2 parents 64cc0f4 + 5610ab3
commit 6707b22
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -81,7 +81,7 @@ cover: deps
 # We should be installed tools of native architecture.
 .PHONY: crossbuild-package
 crossbuild-package: deps
-	mkdir -p ./build-linux-386 ./build-linux-amd64 ./build-linux-arm64 ./build-linux-mips ./build-linux-armhf
+	mkdir -p ./build-linux-{386,amd64,arm64,mips,armhf}
 	GOOS=linux GOARCH=386 make build
 	mv build/$(MACKEREL_AGENT_NAME) build-linux-386/
 	GOOS=linux GOARCH=amd64 make build
@@ -109,25 +109,41 @@ rpm-v1: crossbuild-package
 	MACKEREL_AGENT_NAME=$(MACKEREL_AGENT_NAME) _tools/packaging/prepare-rpm-build.sh
 	docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:c7 \
 	--define "_sourcedir /workspace/packaging/rpm-build/src" --define "_builddir /workspace/build-linux-386" \
-	--define "_version ${VERSION}" --define "buildarch noarch" \
+	--define "_version ${VERSION}" --define "buildarch noarch" --target noarch \
 	-bb packaging/rpm-build/$(MACKEREL_AGENT_NAME).spec
 	MACKEREL_AGENT_NAME=$(MACKEREL_AGENT_NAME) _tools/packaging/prepare-rpm-build.sh
 	docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:c7 \
 	--define "_sourcedir /workspace/packaging/rpm-build/src" --define "_builddir /workspace/build-linux-amd64" \
-	--define "_version ${VERSION}" --define "buildarch x86_64" \
+	--define "_version ${VERSION}" --define "buildarch x86_64" --target x86_64 \
 	-bb packaging/rpm-build/$(MACKEREL_AGENT_NAME).spec
 
 .PHONY: rpm-v2
-rpm-v2: crossbuild-package
+rpm-v2: rpm-v2-x86 rpm-v2-arm
+
+.PHONY: rpm-v2-x86
+rpm-v2-x86: crossbuild-package
 	BUILD_SYSTEMD=1 MACKEREL_AGENT_NAME=$(MACKEREL_AGENT_NAME) _tools/packaging/prepare-rpm-build.sh
 	docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:c7 \
 	--define "_sourcedir /workspace/packaging/rpm-build/src" --define "_builddir /workspace/build-linux-amd64" \
-	--define "_version ${VERSION}" --define "buildarch x86_64" --define "dist .el7.centos" \
+	--define "_version ${VERSION}" --define "buildarch x86_64" --target x86_64  --define "dist .el7.centos" \
 	-bb packaging/rpm-build/$(MACKEREL_AGENT_NAME).spec
 	BUILD_SYSTEMD=1 MACKEREL_AGENT_NAME=$(MACKEREL_AGENT_NAME) _tools/packaging/prepare-rpm-build.sh
 	docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:c7 \
 	--define "_sourcedir /workspace/packaging/rpm-build/src" --define "_builddir /workspace/build-linux-amd64" \
-	--define "_version ${VERSION}" --define "buildarch x86_64" --define "dist .amzn2" \
+	--define "_version ${VERSION}" --define "buildarch x86_64" --target x86_64 --define "dist .amzn2" \
+	-bb packaging/rpm-build/$(MACKEREL_AGENT_NAME).spec
+
+.PHONY: rpm-v2-arm
+rpm-v2-arm: crossbuild-package
+	BUILD_SYSTEMD=1 MACKEREL_AGENT_NAME=$(MACKEREL_AGENT_NAME) _tools/packaging/prepare-rpm-build.sh
+	docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:c7 \
+	--define "_sourcedir /workspace/packaging/rpm-build/src" --define "_builddir /workspace/build-linux-arm64" \
+	--define "_version ${VERSION}" --define "buildarch aarch64" --target aarch64  --define "dist .el7.centos" \
+	-bb packaging/rpm-build/$(MACKEREL_AGENT_NAME).spec
+	BUILD_SYSTEMD=1 MACKEREL_AGENT_NAME=$(MACKEREL_AGENT_NAME) _tools/packaging/prepare-rpm-build.sh
+	docker run --rm -v "$(PWD)":/workspace -v "$(PWD)/rpmbuild":/rpmbuild mackerel/docker-mackerel-rpm-builder:c7 \
+	--define "_sourcedir /workspace/packaging/rpm-build/src" --define "_builddir /workspace/build-linux-arm64" \
+	--define "_version ${VERSION}" --define "buildarch aarch64" --target aarch64 --define "dist .amzn2" \
 	-bb packaging/rpm-build/$(MACKEREL_AGENT_NAME).spec
 
 .PHONY: deb

diff --git a/packaging/deb/debian/control b/packaging/deb/debian/control
@@ -9,7 +9,7 @@ Vcs-Git: https://github.com/mackerelio/mackerel-agent.git
 Homepage: https://mackerel.io
 
 Package: mackerel-agent
-Architecture: all
+Architecture: any
 Depends: ${misc:Depends}
 Description: mackerel.io agent
  Server monitoring agent for https://mackerel.io (Monitoring SaaS)
diff --git a/packaging/rpm/mackerel-agent-systemd.spec b/packaging/rpm/mackerel-agent-systemd.spec
@@ -14,7 +14,6 @@ Source0:   %{name}.sysconfig
 Source1:   %{name}.conf
 Source2:   %{name}.service
 Packager:  Hatena Co., Ltd.
-BuildArch: %{buildarch}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %{?systemd_requires}

diff --git a/packaging/rpm/mackerel-agent.spec b/packaging/rpm/mackerel-agent.spec
@@ -15,7 +15,6 @@ Source1:   %{name}.sysconfig
 Source2:   %{name}.logrotate
 Source3:   %{name}.conf
 Packager:  Hatena Co., Ltd.
-BuildArch: %{buildarch}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service