jgaunt/proxmox-backup-arm64
1
0
Fork 0
mirror of https://github.com/wofferl/proxmox-backup-arm64 synced 2025-12-06 00:13:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove building unnecessary dependencies, move building libproxmox-acme-plugins after the main build

Browse Source
This commit is contained in:
Wolfgang
2022-12-01 22:25:45 +01:00
parent df939dfea5
commit cf47ef7ec3
3 changed files with 19 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

212
patches/proxmox-perl-rs-dependencies.patch
View File

@@ -1,212 +0,0 @@
diff --git a/.cargo/config b/.cargo/config
index 3b5b6e4..93c8be0 100644
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,5 +1,6 @@
[source]
-[source.debian-packages]
-directory = "/usr/share/cargo/registry"
+[source.vendor]
+directory = "vendor"
[source.crates-io]
-replace-with = "debian-packages"
+replace-with = "vendor"
+
diff --git a/Makefile b/Makefile
index 0836c9d..011b9bc 100644
--- a/Makefile
+++ b/Makefile
@@ -67,12 +67,17 @@ gen:
build:
rm -rf build
mkdir build
- echo system >build/rust-toolchain
+ #echo system >build/rust-toolchain
cp -a ./scripts ./build
cp -a ./common ./build
cp -a ./pve-rs ./build
cp -a ./pmg-rs ./build
cp -a ./Proxmox ./build
+ ln -s ../perlmod ./build/perlmod
+ ln -s ../proxmox ./build/proxmox
+ ln -s ../proxmox-apt ./build/proxmox-apt
+ ln -s ../proxmox-acme-rs ./build/proxmox-acme-rs
+ ln -s ../proxmox-openid-rs ./build/proxmox-openid-rs
$(MAKE) BUILD_MODE=release -C build -f ../Makefile gen
mkdir -p ./build/pve-rs/Proxmox/Lib
mv ./build/Proxmox/Lib/PVE.pm ./build/pve-rs/Proxmox/Lib/PVE.pm
diff --git a/pmg-rs/Cargo.toml b/pmg-rs/Cargo.toml
index 903ed3b..165b377 100644
--- a/pmg-rs/Cargo.toml
+++ b/pmg-rs/Cargo.toml
@@ -30,12 +30,21 @@ serde_bytes = "0.11.3"
serde_json = "1.0"
url = "2"
-perlmod = { version = "0.13", features = [ "exporter" ] }
+#perlmod = { version = "0.13", features = [ "exporter" ] }
-proxmox-acme-rs = { version = "0.4", features = ["client"] }
-proxmox-apt = "0.9"
-proxmox-http = { version = "0.7", features = ["client-sync", "client-trait"] }
-proxmox-subscription = "0.3"
-proxmox-sys = "0.4"
-proxmox-tfa = { version = "2.1", features = ["api"] }
-proxmox-time = "1.1.3"
+#proxmox-acme-rs = { version = "0.4", features = ["client"] }
+#proxmox-apt = "0.9"
+#proxmox-http = { version = "0.7", features = ["client-sync", "client-trait"] }
+#proxmox-subscription = "0.3"
+#proxmox-sys = "0.4"
+#proxmox-tfa = { version = "2.1", features = ["api"] }
+#proxmox-time = "1.1.3"
+
+perlmod = { path = "../perlmod/perlmod" }
+proxmox-acme-rs = { features = ["client"], path = "../proxmox-acme-rs" }
+proxmox-apt = { path = "../proxmox-apt" }
+proxmox-http = { features = ["client-sync", "client-trait"], path = "../proxmox/proxmox-http" }
+proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
+proxmox-sys = { path = "../proxmox/proxmox-sys" }
+proxmox-tfa = { features = ["api"], path = "../proxmox/proxmox-tfa" }
+proxmox-time = { path = "../proxmox/proxmox-time" }
diff --git a/pmg-rs/debian/control b/pmg-rs/debian/control
index 5af088b..6a18690 100644
--- a/pmg-rs/debian/control
+++ b/pmg-rs/debian/control
@@ -2,35 +2,6 @@ Source: libpmg-rs-perl
Section: perl
Priority: optional
Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends:
- debhelper (>= 12),
- dh-cargo (>= 24),
- cargo:native <!nocheck>,
- rustc:native <!nocheck>,
- libstd-rust-dev <!nocheck>,
- librust-anyhow-1+default-dev,
- librust-hex-0.4+default-dev,
- librust-http-0.2+default-dev (>= 0.2.7-~~),
- librust-libc-0.2+default-dev,
- librust-nix-0.24+default-dev,
- librust-openssl-0.10+default-dev (>= 0.10.40-~~),
- librust-perlmod-0.13+default-dev,
- librust-perlmod-0.13+exporter-dev,
- librust-proxmox-acme-rs-0.4+client-dev,
- librust-proxmox-acme-rs-0.4+default-dev,
- librust-proxmox-apt-0.9+default-dev,
- librust-proxmox-http-0.7+client-sync-dev,
- librust-proxmox-http-0.7+client-trait-dev,
- librust-proxmox-http-0.7+default-dev,
- librust-proxmox-subscription-0.3+default-dev,
- librust-proxmox-sys-0.4+default-dev,
- librust-proxmox-tfa-2+api-dev (>= 2.1-~~),
- librust-proxmox-tfa-2+default-dev (>= 2.1-~~),
- librust-proxmox-time-1+default-dev (>= 1.1.3-~~),
- librust-serde-1+default-dev,
- librust-serde-bytes-0.11+default-dev (>= 0.11.3-~~),
- librust-serde-json-1+default-dev,
- librust-url-2+default-dev,
Standards-Version: 4.3.0
Homepage: https://www.proxmox.com
diff --git a/pve-rs/Cargo.toml b/pve-rs/Cargo.toml
index 855c72d..1a982df 100644
--- a/pve-rs/Cargo.toml
+++ b/pve-rs/Cargo.toml
@@ -28,12 +28,22 @@ serde_bytes = "0.11"
serde_json = "1.0"
url = "2"
-perlmod = { version = "0.13", features = [ "exporter" ] }
+#perlmod = { version = "0.13", features = [ "exporter" ] }
+
+#proxmox-apt = "0.9"
+#proxmox-http = { version = "0.7", features = ["client-sync", "client-trait"] }
+#proxmox-openid = "0.9.5"
+#proxmox-subscription = "0.3"
+#proxmox-sys = "0.4"
+#proxmox-tfa = { version = "2.1", features = ["api"] }
+#proxmox-time = "1.1.3"
+
+perlmod = { path = "../perlmod/perlmod" }
+proxmox-apt = { path = "../proxmox-apt" }
+proxmox-http = { features = ["client-sync", "client-trait"], path = "../proxmox/proxmox-http" }
+proxmox-openid = { path = "../proxmox-openid-rs" }
+proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
+proxmox-sys = { path = "../proxmox/proxmox-sys" }
+proxmox-tfa = { features = [ "api" ], path = "../proxmox/proxmox-tfa" }
+proxmox-time = { path = "../proxmox/proxmox-time" }
-proxmox-apt = "0.9"
-proxmox-http = { version = "0.7", features = ["client-sync", "client-trait"] }
-proxmox-openid = "0.9.5"
-proxmox-subscription = "0.3"
-proxmox-sys = "0.4"
-proxmox-tfa = { version = "2.1", features = ["api"] }
-proxmox-time = "1.1.3"
diff --git a/pve-rs/debian/control b/pve-rs/debian/control
index a0c785b..4ca09ea 100644
--- a/pve-rs/debian/control
+++ b/pve-rs/debian/control
@@ -1,36 +1,6 @@
Source: libpve-rs-perl
Section: perl
Priority: optional
-Build-Depends:
- debhelper (>= 12),
- dh-cargo (>= 24),
- cargo:native <!nocheck>,
- rustc:native <!nocheck>,
- libstd-rust-dev <!nocheck>,
- librust-anyhow-1+default-dev,
- librust-base32-0.4+default-dev,
- librust-base64-0.13+default-dev,
- librust-hex-0.4+default-dev,
- librust-http-0.2+default-dev (>= 0.2.7-~~),
- librust-libc-0.2+default-dev,
- librust-nix-0.24+default-dev,
- librust-openssl-0.10+default-dev (>= 0.10.40-~~),
- librust-perlmod-0.13+default-dev,
- librust-perlmod-0.13+exporter-dev,
- librust-proxmox-apt-0.9+default-dev,
- librust-proxmox-http-0.7+client-sync-dev,
- librust-proxmox-http-0.7+client-trait-dev,
- librust-proxmox-http-0.7+default-dev,
- librust-proxmox-openid-0.9+default-dev (>= 0.9.5-~~),
- librust-proxmox-subscription-0.3+default-dev,
- librust-proxmox-sys-0.4+default-dev,
- librust-proxmox-tfa-2+api-dev (>= 2.1-~~),
- librust-proxmox-tfa-2+default-dev (>= 2.1-~~),
- librust-proxmox-time-1+default-dev (>= 1.1.3-~~),
- librust-serde-1+default-dev,
- librust-serde-bytes-0.11+default-dev,
- librust-serde-json-1+default-dev,
- librust-url-2+default-dev,
Maintainer: Proxmox Support Team <support@proxmox.com>
Standards-Version: 4.5.1
Vcs-Git: git://git.proxmox.com/git/proxmox-perl-rs.git
diff --git a/proxmox-apt/Cargo.toml b/proxmox-apt/Cargo.toml
index 1045070..a6e2834 100644
--- a/proxmox-apt/Cargo.toml
+++ b/proxmox-apt/Cargo.toml
@@ -25,4 +25,5 @@ rfc822-like = "0.2.1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.41"
-proxmox-schema = { version = "1", features = [ "api-macro" ] }
+#proxmox-schema = { version = "1", features = [ "api-macro" ] }
+proxmox-schema = { features = [ "api-macro" ], path = "../proxmox/proxmox-schema" }
diff --git a/proxmox-openid-rs/Cargo.toml b/proxmox-openid-rs/Cargo.toml
index e42f495..c6dbef7 100644
--- a/proxmox-openid-rs/Cargo.toml
+++ b/proxmox-openid-rs/Cargo.toml
@@ -25,5 +25,7 @@ ureq = { version = "2.4", default-features = false, features = ["native-tls", "g
native-tls = "0.2"
url = "2.1"
-proxmox-time = "1"
-proxmox-sys = { version = "0.4", features = ["timer"] }
+#proxmox-time = "1"
+#proxmox-sys = { version = "0.4", features = ["timer"] }
+proxmox-time = { path = "../proxmox/proxmox-time" }
+proxmox-sys = { features = ["timer"], path = "../proxmox/proxmox-sys" }