diff --git a/build.sh b/build.sh index 25f691c..be8f78f 100755 --- a/build.sh +++ b/build.sh @@ -148,8 +148,8 @@ ${SUDO} apt install -y "${packages_install[@]}" cd "${SOURCES}" -PROXMOX_BACKUP_VER="2.4.0-2" -PROXMOX_BACKUP_GIT="743f83bc5a79e69e246d3a4ece57984270ee7869" +PROXMOX_BACKUP_VER="2.4.1-1" +PROXMOX_BACKUP_GIT="3da94f2e7429ea1653ed5e61a0f83e67ff02b8be" PATHPATTERNS_GIT="8a0dce93d535ef04bfa9c8317edc0ef0216e9042" # 0.1.3-1 PROXMOX_ACME_RS_GIT="abc0bdd09d5c3501534510d49da0ae8fa5c05c05" # 0.4.0 PROXMOX_APT_GIT="8a7a719aec23ad98a00bb452f0ced4cbf88ba591" # 0.9.3-1 @@ -179,6 +179,8 @@ if [ ! -e "${PACKAGES}/proxmox-backup-server_${PROXMOX_BACKUP_VER}_arm64.deb" ]; cd proxmox-backup/ cargo vendor ${SUDO} apt -y build-dep . + export DEB_VERSION=$(dpkg-parsechangelog -SVersion) + export DEB_VERSION_UPSTREAM=$(dpkg-parsechangelog -SVersion | cut -d- -f1) dpkg-buildpackage -b -us -uc cd .. cp -a proxmox-backup-client{,-dbgsym}_${PROXMOX_BACKUP_VER}_arm64.deb \ diff --git a/patches/proxmox-backup-arm.patch b/patches/proxmox-backup-arm.patch index 3651370..f7fdc27 100644 --- a/patches/proxmox-backup-arm.patch +++ b/patches/proxmox-backup-arm.patch @@ -269,7 +269,7 @@ index 76f50cd0..528a3cc5 100644 usr/sbin/proxmox-backup-manager usr/bin/pmtx diff --git a/debian/rules b/debian/rules -index b13ba334..323da5ed 100755 +index cf94692e..0f6bb703 100755 --- a/debian/rules +++ b/debian/rules @@ -4,12 +4,9 @@ @@ -285,10 +285,10 @@ index b13ba334..323da5ed 100755 export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS export DEB_HOST_RUST_TYPE DEB_HOST_GNU_TYPE export CARGO_HOME = $(CURDIR)/debian/cargo_home -@@ -21,7 +18,6 @@ export DEB_CARGO_PACKAGE=proxmox-backup - dh $@ --with=bash-completion +@@ -22,7 +19,6 @@ export DEB_CARGO_PACKAGE=proxmox-backup override_dh_auto_configure: + @perl -ne 'if (/^version\s*=\s*"(\d+(?:\.\d+)+)"/) { my $$v_cargo = $$1; my $$v_deb = $$ENV{DEB_VERSION_UPSTREAM}; die "ERROR: d/changelog <-> Cargo.toml version mismatch: $$v_cargo != $$v_deb\n" if $$v_cargo ne $$v_deb; exit(0); }' Cargo.toml - $(CARGO) prepare-debian $(CURDIR)/debian/cargo_registry --link-from-system dh_auto_configure