build in subdir, add d/control, add upload target

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/Makefile b/Makefile
index cd348641f2172c7c2f9ce47aebfbe1c81a23212f..4c0190753a7fd0757d971b2957035d4cd9be7d02 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,26 +3,41 @@ all: check
 
 .PHONY: check
 check:
-       cargo test
+       cargo test --all-features
 
 .PHONY: dinstall
 dinstall: deb
+       sudo -k dpkg -i build/librust-*.deb
 
-.PHONY: deb
-deb:
+.PHONY: build
+build:
        rm -rf build
+       mkdir build
        debcargo package \
            --config "$(PWD)/debian/debcargo.toml" \
            --changelog-ready \
            --no-overlay-write-back \
-           --directory "$(PWD)/build" \
+           --directory "$(PWD)/build/proxmox-fuse" \
            "proxmox-fuse" \
            "$$(dpkg-parsechangelog -l "debian/changelog" -SVersion | sed -e 's/-.*//')"
        echo system >build/rust-toolchain
-       (cd build && CARGO=/usr/bin/cargo RUSTC=/usr/bin/rustc dpkg-buildpackage -b -uc -us)
-       lintian *.deb
+       rm -f build/proxmox-fuse/Cargo.lock
+       find build/proxmox-fuse/debian -name '*.hint' -delete
+       cp build/proxmox-fuse/debian/control debian/control
+
+.PHONY: deb
+deb: build
+       (cd build/proxmox-fuse && CARGO=/usr/bin/cargo RUSTC=/usr/bin/rustc dpkg-buildpackage -b -uc -us)
+       lintian build/*.deb
 
 .PHONY: clean
 clean:
        rm -rf build *.deb *.buildinfo *.changes *.orig.tar.gz
        cargo clean
+
+upload: deb
+       cd build; \
+           dcmd --deb rust-proxmox-fuse_*.changes \
+           | grep -v '.changes$$' \
+           | tar -cf- -T- \
+           | ssh -X repoman@repo.proxmox.com upload --product devel --dist buster

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..59cc379
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,47 @@
+Source: rust-proxmox-fuse
+Section: rust
+Priority: optional
+Build-Depends: debhelper (>= 11),
+ dh-cargo (>= 18),
+ cargo:native <!nocheck>,
+ rustc:native <!nocheck>,
+ libstd-rust-dev <!nocheck>,
+ librust-anyhow-1+default-dev <!nocheck>,
+ librust-futures-0.3+default-dev <!nocheck>,
+ librust-libc-0.2+default-dev <!nocheck>,
+ librust-mio-0.6+default-dev (>= 0.6.21-~~) <!nocheck>,
+ librust-tokio-0.2+default-dev <!nocheck>,
+ librust-tokio-0.2+io-driver-dev <!nocheck>,
+ librust-tokio-0.2+macros-dev <!nocheck>,
+ librust-tokio-0.2+signal-dev <!nocheck>,
+ librust-tokio-0.2+stream-dev <!nocheck>
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Standards-Version: 4.4.1
+Vcs-Git: 
+Vcs-Browser: 
+
+Package: librust-proxmox-fuse-dev
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+ librust-anyhow-1+default-dev,
+ librust-futures-0.3+default-dev,
+ librust-libc-0.2+default-dev,
+ librust-mio-0.6+default-dev (>= 0.6.21-~~),
+ librust-tokio-0.2+default-dev,
+ librust-tokio-0.2+io-driver-dev,
+ librust-tokio-0.2+macros-dev,
+ librust-tokio-0.2+signal-dev,
+ librust-tokio-0.2+stream-dev
+Provides:
+ librust-proxmox-fuse+default-dev (= ${binary:Version}),
+ librust-proxmox-fuse-0-dev (= ${binary:Version}),
+ librust-proxmox-fuse-0+default-dev (= ${binary:Version}),
+ librust-proxmox-fuse-0.1-dev (= ${binary:Version}),
+ librust-proxmox-fuse-0.1+default-dev (= ${binary:Version}),
+ librust-proxmox-fuse-0.1.0-dev (= ${binary:Version}),
+ librust-proxmox-fuse-0.1.0+default-dev (= ${binary:Version})
+Description: Expose fuse requests as async streams - Rust source code
+ This package contains the source for the Rust proxmox-fuse crate, packaged by
+ debcargo for use with cargo and dh-cargo.