Prioritize debian packages

.dockerignore

@@ -1,3 +1,4 @@
 /protomask-tun/target
 /target
-!/target/x86_64-unknown-linux-musl/release/protomask
+!/target/x86_64-unknown-linux-musl/release/protomask
+!/target/aarch64-unknown-linux-musl/release/protomask

.rpm/protomask.spec

@@ -1,32 +0,0 @@
-%define __spec_install_post %{nil}
-%define __os_install_post %{_dbpath}/brp-compress
-%define debug_package %{nil}
-
-Name: protomask
-Summary: A user space NAT64 implementation
-Version: @@VERSION@@
-Release: @@RELEASE@@%{?dist}
-License: GPL-3.0
-Group: Applications/System
-Source0: %{name}-%{version}.tar.gz
-URL: https://github.com/ewpratten/protomask
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-%description
-%{summary}
-
-%prep
-%setup -q
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
-cp -a * %{buildroot}
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%{_bindir}/*

Cargo.toml

@@ -43,11 +43,13 @@ lazy_static = "1.4.0"
 name = "protomask"
 path = "src/cli/main.rs"
 
-[package.metadata.rpm]
+[package.metadata.deb]
-package = "protomask"
+section = "network"
-
+assets = [
-[package.metadata.rpm.cargo]
+    ["target/release/protomask", "usr/local/bin/", "755"],
-buildflags = ["--release"]
+    ["etc/protomask.toml", "etc", "644"]
-
+]
-[package.metadata.rpm.targets]
+conf-files = ["/etc/protomask.toml"]
-protomask = { path = "/usr/bin/protomask" }
+depends = []
+maintainer-scripts = "debian/"
+systemd-units = { enable = false }

Makefile

@@ -2,27 +2,16 @@
 SRC = Cargo.toml $(shell find src/ -type f -name '*.rs') $(shell find protomask-tun/src/ -type f -name '*.rs')
 
 # Used to auto-version things
-GIT_HASH ?= $(shell git log --format="%h" -n 1)
+CRATE_VERSION = $(shell sed -n -r "s/^version = \"([0-9\.]+)\"/\1/p" Cargo.toml)
 
-# Release binary for x64
 target/x86_64-unknown-linux-musl/release/protomask: $(SRC)
 	cross build --target x86_64-unknown-linux-musl --release
 
-# Release binary for aarch64
 target/aarch64-unknown-linux-musl/release/protomask: $(SRC)
 	cross build --target aarch64-unknown-linux-musl --release
 
-# All tars
+target/x86_64-unknown-linux-musl/debian/protomask_${CRATE_VERSION}_amd64.deb: target/x86_64-unknown-linux-musl/release/protomask
-tars: tars/protomask-$(GIT_HASH)-x86_64.tar.gz tars/protomask-$(GIT_HASH)-aarch64.tar.gz
+	cargo deb --target x86_64-unknown-linux-musl --no-build
 
-# TAR file for x64
+target/aarch64-unknown-linux-musl/debian/protomask_${CRATE_VERSION}_arm64.deb: target/aarch64-unknown-linux-musl/release/protomask
-tars/protomask-$(GIT_HASH)-x86_64-linux-musl.tar.gz: target/x86_64-unknown-linux-musl/release/protomask protomask.toml
+	cargo deb --target aarch64-unknown-linux-musl --no-build
-	mkdir -p tars
-	cp protomask.toml target/x86_64-unknown-linux-musl/release/
-	tar -czf $@ -C target/x86_64-unknown-linux-musl/release/ protomask protomask.toml
-
-# TAR file for aarch64
-tars/protomask-$(GIT_HASH)-aarch64-linux-musl.tar.gz: target/aarch64-unknown-linux-musl/release/protomask protomask.toml
-	mkdir -p tars
-	cp protomask.toml target/aarch64-unknown-linux-musl/release/
-	tar -czf $@ -C target/aarch64-unknown-linux-musl/release/ protomask protomask.toml

debian/service

@@ -0,0 +1,9 @@
+[Unit]
+Description = Protomask
+After = network.target
+
+[Service]
+ExecStart = /usr/local/bin/protomask /etc/protomask.toml
+
+[Install]
+WantedBy=multi-user.target