Merge pull request #673 from mackerelio/add-arm

add arm64 architecture packages, and fix Architecture field of deb
mackerelio · Sep 15, 2020 · f1efdf4 · f1efdf4
2 parents 1db4d56 + 6cf0f70
commit f1efdf4
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ env:
   - secure: "V0XY5XWhVQuGsE35J5QqIKa77tgfIYIa6z6k1qgRjW+Wy7DDFhIsPRdziayZZJOhwBqQBsVikIP4rXgkByEVhkUv8oIfL/V0BLkHsuNUjJVtloOqe9mpDlWzeMyi3KUfBTb9IW0nrwcEwZF8/dtQEmSW62RbupO3F/lpVEbrxXY="
 install:
 - sudo apt-get update
-- DEBIAN_FRONTEND=noninteractive sudo apt-get install -y rpm devscripts debhelper fakeroot
+- DEBIAN_FRONTEND=noninteractive sudo apt-get install -y rpm devscripts debhelper fakeroot crossbuild-essential-arm64
 - mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
 script:
 - make all

diff --git a/Makefile b/Makefile
@@ -22,11 +22,15 @@ build:
 	  $(MAKE) $(BINDIR)/$$i; \
 	done
 
-build/mackerel-plugin:
+build/mackerel-plugin: $(patsubst %,depends_on,$(GOOS)$(GOARCH))
 	mkdir -p build
 	go build -ldflags="-s -w -X main.gitcommit=$(CURRENT_REVISION)" \
 	  -o build/mackerel-plugin
 
+.PHONY: depends_on
+depends_on:
+	@:
+
 .PHONY: test
 test: testgo lint testconvention
 
@@ -75,21 +79,34 @@ rpm-v1:
 	$(MAKE) build GOOS=linux GOARCH=386
 	rpmbuild --define "_sourcedir `pwd`" --define "_bindir build/linux/386" \
 	  --define "_version ${VERSION}" --define "buildarch noarch" \
-	  -bb packaging/rpm/mackerel-agent-plugins.spec
+	  --target noarch -bb packaging/rpm/mackerel-agent-plugins.spec
 	$(MAKE) build GOOS=linux GOARCH=amd64
 	rpmbuild --define "_sourcedir `pwd`" --define "_bindir build/linux/amd64" \
 	  --define "_version ${VERSION}" --define "buildarch x86_64" \
-	  -bb packaging/rpm/mackerel-agent-plugins.spec
+	  --target x86_64 -bb packaging/rpm/mackerel-agent-plugins.spec
 
 .PHONY: rpm-v2
-rpm-v2:
+rpm-v2: rpm-v2-x86 rpm-v2-arm
+
+.PHONY: rpm-v2-x86
+rpm-v2-x86:
 	$(MAKE) build/mackerel-plugin GOOS=linux GOARCH=amd64
 	rpmbuild --define "_sourcedir `pwd`"  --define "_version ${VERSION}" \
 	  --define "buildarch x86_64" --define "dist .el7.centos" \
-	  -bb packaging/rpm/mackerel-agent-plugins-v2.spec
+	  --target x86_64 -bb packaging/rpm/mackerel-agent-plugins-v2.spec
 	rpmbuild --define "_sourcedir `pwd`"  --define "_version ${VERSION}" \
 	  --define "buildarch x86_64" --define "dist .amzn2" \
-	  -bb packaging/rpm/mackerel-agent-plugins-v2.spec
+	  --target x86_64 -bb packaging/rpm/mackerel-agent-plugins-v2.spec
+
+.PHONY: rpm-v2-arm
+rpm-v2-arm:
+	$(MAKE) build/mackerel-plugin GOOS=linux GOARCH=amd64
+	rpmbuild --define "_sourcedir `pwd`"  --define "_version ${VERSION}" \
+	  --define "buildarch aarch64" --define "dist .el7.centos" \
+	  --target aarch64 -bb packaging/rpm/mackerel-agent-plugins-v2.spec
+	rpmbuild --define "_sourcedir `pwd`"  --define "_version ${VERSION}" \
+	  --define "buildarch aarch64" --define "dist .amzn2" \
+	  --target aarch64 -bb packaging/rpm/mackerel-agent-plugins-v2.spec
 
 .PHONY: deb
 deb: deb-v1 deb-v2
@@ -103,11 +120,20 @@ deb-v1:
 	cd packaging/deb && debuild --no-tgz-check -rfakeroot -uc -us
 
 .PHONY: deb-v2
-deb-v2:
+deb-v2: deb-v2-x86 deb-v2-arm
+
+.PHONY: deb-v2-x86
+deb-v2-x86:
 	$(MAKE) build/mackerel-plugin GOOS=linux GOARCH=amd64
 	cp build/mackerel-plugin packaging/deb-v2/debian/
 	cd packaging/deb-v2 && debuild --no-tgz-check -rfakeroot -uc -us
 
+.PHONY: deb-v2-arm
+deb-v2-arm:
+	$(MAKE) build/mackerel-plugin GOOS=linux GOARCH=arm64
+	cp build/mackerel-plugin packaging/deb-v2/debian/
+	cd packaging/deb-v2 && debuild --no-tgz-check -rfakeroot -uc -us -aarm64
+
 .PHONY: release
 release: check-release-deps
 	(cd tool && cpanm -qn --installdeps .)

diff --git a/packaging/deb-v2/debian/control b/packaging/deb-v2/debian/control
@@ -7,6 +7,6 @@ Standards-Version: 3.9.3
 
 Package: mackerel-agent-plugins
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Architecture: amd64
+Architecture: any
 Description: metric plugins for mackerel-agent
  metric plugins for https://mackerel.io (Monitoring SaaS)
diff --git a/packaging/rpm/mackerel-agent-plugins-v2.spec b/packaging/rpm/mackerel-agent-plugins-v2.spec
@@ -13,7 +13,6 @@ URL: https://mackerel.io/
 
 Source0: README.md
 Packager:  Hatena
-BuildArch: %{buildarch}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description

diff --git a/packaging/rpm/mackerel-agent-plugins.spec b/packaging/rpm/mackerel-agent-plugins.spec
@@ -17,7 +17,6 @@ URL: https://mackerel.io/
 
 Source0: README.md
 Packager:  Hatena
-BuildArch: %{buildarch}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description