Remove dependencies for dh-cargo and native rustc/cargo to make sure the rustc/cargo versions from rustup installation are used

This commit is contained in:
Wolfgang
2022-08-31 00:14:26 +02:00
parent 5d11d42aea
commit 6cc1da324c
2 changed files with 56 additions and 10 deletions

View File

@@ -77,12 +77,16 @@ index e946b9bb..908d5919 100644
[features]
default = []
diff --git a/debian/control b/debian/control
index 3f513cdf..f3298cbe 100644
index 3f513cdf..dcafaf1e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,112 +6,6 @@ Build-Depends: debhelper (>= 12),
cargo:native,
rustc:native,
@@ -2,116 +2,7 @@ Source: rust-proxmox-backup
Section: admin
Priority: optional
Build-Depends: debhelper (>= 12),
- dh-cargo (>= 24),
- cargo:native,
- rustc:native,
libstd-rust-dev,
- librust-anyhow-1+default-dev,
- librust-apt-pkg-native-0.3+default-dev (>= 0.3.2-~~),
@@ -237,3 +241,24 @@ index 6e2219b4..82954cdd 100644
usr/sbin/proxmox-backup-debug
usr/sbin/proxmox-backup-manager
usr/bin/pmtx
diff --git a/debian/rules b/debian/rules
index b13ba334..271c1670 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,6 @@ include /usr/share/rustc/architecture.mk
export BUILD_MODE=release
-CARGO=/usr/share/cargo/bin/cargo
-
export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
export DEB_HOST_RUST_TYPE DEB_HOST_GNU_TYPE
export CARGO_HOME = $(CURDIR)/debian/cargo_home
@@ -21,7 +19,6 @@ export DEB_CARGO_PACKAGE=proxmox-backup
dh $@ --with=bash-completion
override_dh_auto_configure:
- $(CARGO) prepare-debian $(CURDIR)/debian/cargo_registry --link-from-system
dh_auto_configure
override_dh_auto_build:

View File

@@ -15,12 +15,11 @@ diff --git a/Cargo.toml b/Cargo.toml
index 60c3ae0..8464181 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,3 +16,9 @@ curl = "0.4"
@@ -16,3 +16,8 @@ curl = "0.4"
clap = "2.33"
proxmox-io = "1"
proxmox-sys = "0.2"
+zstd-sys = { features = [ "pkg-config" ] }
+bumpalo = "3.10.*"
+
+[patch.crates-io]
+proxmox-io = { path = "../proxmox/proxmox-io" }
@@ -73,14 +72,11 @@ new file mode 100644
index 0000000..d59a66c
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,33 @@
@@ -0,0 +1,30 @@
+Source: rust-termproxy
+Section: admin
+Priority: optional
+Build-Depends: debhelper (>= 12),
+ dh-cargo (>= 24),
+ cargo:native,
+ rustc:native,
+ libzstd-dev
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Standards-Version: 4.5.1
@@ -107,3 +103,28 @@ index 0000000..d59a66c
+Description: HTML/JS Shell client for Proxmox projects
+ This package provides an xterm.js client/proxy for Proxmoxprojects' Hosts,
+ Proxmox VE containers or Proxmox VE VM's serial-terminals.
diff --git a/debian/rules b/debian/rules
index 2b62edd..436684e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@ --buildsystem cargo
+ dh $@
override_dh_auto_build:
dh_auto_build
diff --git a/debian/rules.debcargo.hint b/debian/rules.debcargo.hint
index 92c239b..4aaf62a 100755
--- a/debian/rules.debcargo.hint
+++ b/debian/rules.debcargo.hint
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
%:
- dh $@ --buildsystem cargo
+ dh $@
override_dh_auto_test:
dh_auto_test -- test --all