Skip to content

Commit be25a7b

Browse files
authored
Merge pull request #68 from dokku/raspberry-pi
Build universal debian package
2 parents 7662892 + b9e8e48 commit be25a7b

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

Makefile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ targets = $(addsuffix -in-docker, $(LIST))
4949
build: pre-build
5050
@$(MAKE) build/darwin/$(NAME)
5151
@$(MAKE) build/linux/$(NAME)
52-
@$(MAKE) build/deb/$(NAME)_$(VERSION)_amd64.deb
52+
@$(MAKE) build/deb/$(NAME)_$(VERSION)_all.deb
5353
@$(MAKE) build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm
5454

5555
build-docker-image:
@@ -75,20 +75,20 @@ build/linux/$(NAME):
7575
mkdir -p build/linux
7676
cp -f sshcommand build/linux/sshcommand
7777

78-
build/deb/$(NAME)_$(VERSION)_amd64.deb: build/linux/$(NAME)
78+
build/deb/$(NAME)_$(VERSION)_all.deb: build/linux/$(NAME)
7979
chmod 644 LICENSE
8080
export SOURCE_DATE_EPOCH=$(shell git log -1 --format=%ct) \
8181
&& mkdir -p build/deb \
8282
&& fpm \
83-
--architecture amd64 \
83+
--architecture all \
8484
--category admin \
8585
--description "$$PACKAGE_DESCRIPTION" \
8686
--input-type dir \
8787
--license 'MIT License' \
8888
--maintainer "$(MAINTAINER_NAME) <$(EMAIL)>" \
8989
--name $(NAME) \
9090
--output-type deb \
91-
--package build/deb/$(NAME)_$(VERSION)_amd64.deb \
91+
--package build/deb/$(NAME)_$(VERSION)_all.deb \
9292
--url "https://github.com/$(MAINTAINER)/$(REPOSITORY)" \
9393
--vendor "" \
9494
--version $(VERSION) \
@@ -135,33 +135,33 @@ release: bin/gh-release
135135
rm -rf release && mkdir release
136136
tar -zcf release/$(NAME)_$(VERSION)_linux_$(HARDWARE).tgz -C build/linux $(NAME)
137137
tar -zcf release/$(NAME)_$(VERSION)_darwin_$(HARDWARE).tgz -C build/darwin $(NAME)
138-
cp build/deb/$(NAME)_$(VERSION)_amd64.deb release/$(NAME)_$(VERSION)_amd64.deb
138+
cp build/deb/$(NAME)_$(VERSION)_all.deb release/$(NAME)_$(VERSION)_all.deb
139139
cp build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm release/$(NAME)-$(VERSION)-1.x86_64.rpm
140140
bin/gh-release create $(MAINTAINER)/$(REPOSITORY) $(VERSION) $(shell git rev-parse --abbrev-ref HEAD)
141141

142142
release-packagecloud:
143143
@$(MAKE) release-packagecloud-deb
144144
@$(MAKE) release-packagecloud-rpm
145145

146-
release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_amd64.deb
147-
package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic build/deb/$(NAME)_$(VERSION)_amd64.deb
148-
package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_amd64.deb
149-
package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_amd64.deb
150-
package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster build/deb/$(NAME)_$(VERSION)_amd64.deb
151-
package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_amd64.deb
146+
release-packagecloud-deb: build/deb/$(NAME)_$(VERSION)_all.deb
147+
package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic build/deb/$(NAME)_$(VERSION)_all.deb
148+
package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_all.deb
149+
package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_all.deb
150+
package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster build/deb/$(NAME)_$(VERSION)_all.deb
151+
package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_all.deb
152152

153153
release-packagecloud-rpm: build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm
154154
package_cloud push $(PACKAGECLOUD_REPOSITORY)/el/7 build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm
155155

156156
validate: test
157157
mkdir -p validation
158-
lintian build/deb/$(NAME)_$(VERSION)_amd64.deb || true
159-
dpkg-deb --info build/deb/$(NAME)_$(VERSION)_amd64.deb
160-
dpkg -c build/deb/$(NAME)_$(VERSION)_amd64.deb
161-
cd validation && ar -x ../build/deb/$(NAME)_$(VERSION)_amd64.deb
158+
lintian build/deb/$(NAME)_$(VERSION)_all.deb || true
159+
dpkg-deb --info build/deb/$(NAME)_$(VERSION)_all.deb
160+
dpkg -c build/deb/$(NAME)_$(VERSION)_all.deb
161+
cd validation && ar -x ../build/deb/$(NAME)_$(VERSION)_all.deb
162162
cd validation && rpm2cpio ../build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm > $(NAME)-$(VERSION)-1.x86_64.cpio
163163
ls -lah build/deb build/rpm validation
164-
sha1sum build/deb/$(NAME)_$(VERSION)_amd64.deb
164+
sha1sum build/deb/$(NAME)_$(VERSION)_all.deb
165165
sha1sum build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm
166166

167167
test: lint unit-tests

0 commit comments

Comments
 (0)