From 614c2b6168bf1634d65c99f2a57b42fe3cbbb18b Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Mon, 11 Aug 2025 08:57:34 +0200 Subject: [PATCH 1/3] scripts: synchronize with pve-ve-dockerfiles - support deps with repo url - add `clean-deps` - add `refresh-patches` - remove `experimental-cargo` --- scripts/build/apply-patches.bash | 2 +- scripts/build/experimental-cargo.bash | 22 ----------------- scripts/build/git-clone.bash | 5 ++-- scripts/build/make.bash | 9 ++++++- scripts/dev/clean-deps.bash | 9 +++++++ scripts/dev/refresh-patches.bash | 34 +++++++++++++++++++++++++++ scripts/update-version.bash | 20 ++++++++++------ 7 files changed, 68 insertions(+), 33 deletions(-) delete mode 100755 scripts/build/experimental-cargo.bash create mode 100755 scripts/dev/clean-deps.bash create mode 100755 scripts/dev/refresh-patches.bash diff --git a/scripts/build/apply-patches.bash b/scripts/build/apply-patches.bash index 22b6dd2..1069069 100755 --- a/scripts/build/apply-patches.bash +++ b/scripts/build/apply-patches.bash @@ -20,7 +20,7 @@ for dir; do continue fi - git -C "$repo_name" diff --cached > "$patch" + git -C "$repo_name" diff --cached | grep -v "^index " > "$patch" git -C "$repo_name" commit -m "$(basename $patch)" done < <(find "$dir" -name "*.patch" | sort) done diff --git a/scripts/build/experimental-cargo.bash b/scripts/build/experimental-cargo.bash deleted file mode 100755 index e58d061..0000000 --- a/scripts/build/experimental-cargo.bash +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -set -xeo pipefail - -for package; do - [[ ! -d "$package" ]] && continue - - ( - cd "$package/" - # # enable experimental features - # for cargo in $(find . -path './.build' -prune -o -name Cargo.toml); do - # echo "Changing $cargo..." - # sed -i '1s/^/cargo-features = ["workspace-inheritance"]\n\n/' "$cargo" - # git add "$cargo" || true - # done - - if ! git diff --cached --exit-code --quiet; then - git diff --cached | cat - git commit -m "experimental-cargo.bash" - fi - ) -done diff --git a/scripts/build/git-clone.bash b/scripts/build/git-clone.bash index 0ab1f92..48fa814 100755 --- a/scripts/build/git-clone.bash +++ b/scripts/build/git-clone.bash @@ -9,7 +9,7 @@ fi perform() { if [[ ! -d "$1" ]]; then - git clone "git://git.proxmox.com/git/$1.git" + git clone "git://git.proxmox.com/git/${3:-$1}.git" "$1" else git -C "$1" fetch fi @@ -26,5 +26,6 @@ perform() { while read REPO COMMIT_SHA REST; do [[ -n "$2" ]] && [[ "$REPO" != "$2" ]] && continue echo "$REPO $COMMIT_SHA..." 1>&2 - ( perform "$REPO" "$COMMIT_SHA" ) + REPO_URL=${REST%%#*} + ( perform "$REPO" "$COMMIT_SHA" $REPO_URL ) done < "$1" diff --git a/scripts/build/make.bash b/scripts/build/make.bash index 2aa160f..86d81f6 100755 --- a/scripts/build/make.bash +++ b/scripts/build/make.bash @@ -58,6 +58,14 @@ case "$CROSS_ARCH" in export ARCH=arm32 ;; + arm64) + export ARCH=arm64 + ;; + + amd64) + export ARCH=amd64 + ;; + *) ;; esac @@ -72,7 +80,6 @@ if [[ -z "$DEBUG" ]]; then ../scripts/build/strip-cargo.bash "$REPO" ../scripts/build/apply-patches.bash "../repos/patches/$REPO" "../repos/patches-$ARCH/$REPO" ../scripts/build/resolve-dependencies.bash "$REPO" - ../scripts/build/experimental-cargo.bash "$REPO" fi do_dpkg_build_dep() { diff --git a/scripts/dev/clean-deps.bash b/scripts/dev/clean-deps.bash new file mode 100755 index 0000000..1b99a1a --- /dev/null +++ b/scripts/dev/clean-deps.bash @@ -0,0 +1,9 @@ +#!/bin/bash + +while read REPO REST; do + if grep -q "./scripts/build/make.bash $REPO " dockerfiles/Dockerfile.build; then + echo "$REPO $REST" + fi +done < "repos/deps" > "repos/deps.tmp" + +mv repos/deps{.tmp,} diff --git a/scripts/dev/refresh-patches.bash b/scripts/dev/refresh-patches.bash new file mode 100755 index 0000000..336c16f --- /dev/null +++ b/scripts/dev/refresh-patches.bash @@ -0,0 +1,34 @@ +#!/bin/bash + +mkdir -p /steps + +set -eo pipefail + +refresh() { + echo ">> Refreshing $1..." + + while ! ./scripts/build/make.bash "$1"; do + [[ ! -t 0 ]] && return 1 + + read -p "Build failed for '$1'. Retry? [y/N] " choice + [[ "$choice" != "y" ]] && return 1 + done + + echo ">> Done refreshing $1." +} + +shopt -s nullglob + +for repo_path in repos/patches/*; do + repo_name=${repo_path##*/} + refresh "$repo_name" +done + +for arch in arm32 arm64 amd64; do + for repo_path in repos/patches-$arch/*; do + repo_name=${repo_path##*/} + CROSS_ARCH="$arch" refresh "$repo_name" + done +done + +echo ">> Done." diff --git a/scripts/update-version.bash b/scripts/update-version.bash index 6bcead5..8022068 100755 --- a/scripts/update-version.bash +++ b/scripts/update-version.bash @@ -26,11 +26,14 @@ SCRIPT_ROOT=$(realpath "$0") ROOT_REV="$2" ROOT_TS="" -tmp_dir=$(mktemp -d -t ci-XXXXXXXXXX) -trap 'cd ; rm -rf $tmp_dir' EXIT +if [[ -z "$TMP_DIR" ]]; then + export TMP_DIR=$(mktemp -d -t ci-XXXXXXXXXX) + trap 'cd ; rm -rf $TMP_DIR' EXIT + cd "$TMP_DIR/" +fi perform() { - git clone "git://git.proxmox.com/git/$1.git" 2>/dev/null + [[ -d "$1" ]] || git clone "git://git.proxmox.com/git/${3:-$1}.git" "$1" 2>/dev/null if [[ -z "$ROOT_REV" ]] || [[ -z "$ROOT_TS" ]]; then REPO_REV=$(git -C "$1" rev-parse "${ROOT_REV:-HEAD}") @@ -43,16 +46,19 @@ perform() { CHANGE_TIME=$(git -C "$1" log -1 --format="%cd" $REPO_REV) - echo "$1 $REPO_REV # $CHANGE_TIME" + if [[ -n "$3" ]]; then + echo "$1 $REPO_REV $3 # $CHANGE_TIME" + else + echo "$1 $REPO_REV # $CHANGE_TIME" + fi } -cd "$tmp_dir/" - while read REPO COMMIT_SHA REST; do echo "$REPO $COMMIT_SHA..." 1>&2 REPO_TS= REPO_REV= - perform "$REPO" "$COMMIT_SHA" + REPO_URL=${REST%%#*} + perform "$REPO" "$COMMIT_SHA" $REPO_URL REPO_DEPS_FILE="$(dirname "$DEPS_FILE")/$REPO.deps" From 36b3db42c5197d7314b2691d9f8f853d2d84cd75 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Mon, 11 Aug 2025 09:06:34 +0200 Subject: [PATCH 2/3] scripts: the repo name is first arg of `make.bash` --- dockerfiles/Dockerfile.build | 2 +- dockerfiles/Dockerfile.client | 2 +- scripts/build/make.bash | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dockerfiles/Dockerfile.build b/dockerfiles/Dockerfile.build index 1db3163..299740b 100644 --- a/dockerfiles/Dockerfile.build +++ b/dockerfiles/Dockerfile.build @@ -52,7 +52,7 @@ RUN ./scripts/build/make.bash proxmox-mini-journalreader make_deb RUN ./scripts/build/make.bash libjs-qrcodejs make_deb RUN ./scripts/build/make.bash proxmox-acme make_deb RUN ./scripts/build/make.bash pve-xtermjs "make_deb termproxy" "make_deb xterm.js" -RUN ./scripts/build/make.bash --rust 1.85 proxmox-backup make_deb +RUN ./scripts/build/make.bash proxmox-backup --rust 1.85 make_deb #================================= diff --git a/dockerfiles/Dockerfile.client b/dockerfiles/Dockerfile.client index 95f053a..6f27e23 100644 --- a/dockerfiles/Dockerfile.client +++ b/dockerfiles/Dockerfile.client @@ -34,7 +34,7 @@ ADD /repos /src/repos # Build ARG CROSS_ARCH= RUN ./scripts/build/cross-compile.bash "$CROSS_ARCH" -RUN ./scripts/build/make.bash --keep proxmox-backup "make . ignore proxmox-backup-client-static BUILD_MODE=release COMPILEDIR=target/static/release CARGO_STATIC_CONFIG=" +RUN ./scripts/build/make.bash proxmox-backup --keep "make . ignore proxmox-backup-client-static BUILD_MODE=release COMPILEDIR=target/static/release CARGO_STATIC_CONFIG=" # Bundle client ARG VERSION diff --git a/scripts/build/make.bash b/scripts/build/make.bash index 86d81f6..b62adef 100755 --- a/scripts/build/make.bash +++ b/scripts/build/make.bash @@ -1,10 +1,14 @@ #!/bin/bash if [[ $# -lt 1 ]]; then - echo "usage: $0 [operations...]" + echo "usage: $0 [options] [operations...]" exit 1 fi +REPO="$1" +DEPS= +shift + set -xeo pipefail export DEBIAN_FRONTEND=noninteractive export DEB_BUILD_OPTIONS=nocheck @@ -33,10 +37,6 @@ while [[ -n "$1" ]]; do shift done -REPO="$1" -DEPS= -shift - mkdir -p build cd build From b025cf7e9c921dd905c9e38f03e1c77622d1c63e Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Mon, 11 Aug 2025 09:07:08 +0200 Subject: [PATCH 3/3] repos: refresh patches - drops `index` --- .../proxmox-backup/platform.armhf.patch | 33 ++----------------- .../proxmox-fuse/platform.armhf.patch | 15 --------- .../proxmox/platform.armhf.patch | 27 --------------- .../proxmox-backup/0001-zstd-dynamic.patch | 3 +- .../proxmox-backup/debian-cargo-config.patch | 3 +- repos/patches/proxmox-backup/fix-cargo.patch | 1 - .../proxmox-backup/fix-kernel-version.patch | 1 - repos/patches/proxmox-backup/hide-shell.patch | 1 - repos/patches/proxmox-backup/multi-arch.patch | 7 ++-- repos/patches/proxmox-biome/any-arch.patch | 1 - repos/patches/proxmox-biome/config-toml.patch | 1 - .../patches/proxmox-biome/makefile-arch.patch | 1 - .../compile-error.patch | 1 - ...ignore-libproxmox-rs-perl-dependency.patch | 1 - repos/patches/proxmox-perl-rs/no-cargo.patch | 1 - repos/patches/pve-common/mknodat.patch | 2 -- .../remove-libproxmox-acme-perl.patch | 1 - repos/patches/pve-xtermjs/no-cargo.patch | 1 - repos/patches/pve-xtermjs/no-docs.patch | 1 - 19 files changed, 6 insertions(+), 96 deletions(-) diff --git a/repos/patches-arm32/proxmox-backup/platform.armhf.patch b/repos/patches-arm32/proxmox-backup/platform.armhf.patch index 73624f0..abe97f0 100644 --- a/repos/patches-arm32/proxmox-backup/platform.armhf.patch +++ b/repos/patches-arm32/proxmox-backup/platform.armhf.patch @@ -1,22 +1,4 @@ -From 08e19e66fab8280161495c81f688a330fc80e4f5 Mon Sep 17 00:00:00 2001 -From: Kamil Trzcinski -Date: Fri, 25 Jul 2025 22:04:22 +0200 -Subject: [PATCH] arm32 - ---- - pbs-client/src/pxar/create.rs | 10 +++++----- - pbs-client/src/pxar/extract.rs | 4 ++-- - pbs-client/src/pxar/metadata.rs | 4 ++-- - pbs-config/src/acl.rs | 7 +++---- - pbs-config/src/user.rs | 7 +++---- - pbs-datastore/src/chunk_store.rs | 4 ++-- - pbs-datastore/src/fixed_index.rs | 6 +++--- - pbs-fuse-loop/src/fuse_loop.rs | 4 ++-- - pbs-pxar-fuse/src/lib.rs | 12 ++++++------ - 9 files changed, 28 insertions(+), 30 deletions(-) - diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs -index 7f605a61..4a1a16be 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -79,7 +79,7 @@ fn detect_fs_type(fd: RawFd) -> Result { @@ -65,7 +47,6 @@ index 7f605a61..4a1a16be 100644 ..Default::default() }; diff --git a/pbs-client/src/pxar/extract.rs b/pbs-client/src/pxar/extract.rs -index c4d0085c..dad3cd2f 100644 --- a/pbs-client/src/pxar/extract.rs +++ b/pbs-client/src/pxar/extract.rs @@ -727,7 +727,7 @@ impl Extractor { @@ -87,7 +68,6 @@ index c4d0085c..dad3cd2f 100644 Err(nix::errno::Errno::EINTR) => true, Err(err) => return Err(err).context("error setting file size"), diff --git a/pbs-client/src/pxar/metadata.rs b/pbs-client/src/pxar/metadata.rs -index d03cf7e2..bf71679f 100644 --- a/pbs-client/src/pxar/metadata.rs +++ b/pbs-client/src/pxar/metadata.rs @@ -45,10 +45,10 @@ fn timestamp_to_update_timespec(mtime: &pxar::format::StatxTimestamp) -> [libc:: @@ -104,10 +84,9 @@ index d03cf7e2..bf71679f 100644 }, ] diff --git a/pbs-config/src/acl.rs b/pbs-config/src/acl.rs -index aca1f68f..671ca44c 100644 --- a/pbs-config/src/acl.rs +++ b/pbs-config/src/acl.rs -@@ -731,8 +731,7 @@ pub fn cached_config() -> Result, Error> { +@@ -737,8 +737,7 @@ pub fn cached_config() -> Result, Error> { let cache = CACHED_CONFIG.read().unwrap(); if let Some(ref config) = cache.data { if let Some(stat) = stat { @@ -117,7 +96,7 @@ index aca1f68f..671ca44c 100644 return Ok(config.clone()); } } else if cache.last_mtime == 0 && cache.last_mtime_nsec == 0 { -@@ -746,8 +745,8 @@ pub fn cached_config() -> Result, Error> { +@@ -752,8 +751,8 @@ pub fn cached_config() -> Result, Error> { let mut cache = CACHED_CONFIG.write().unwrap(); if let Some(stat) = stat { @@ -129,7 +108,6 @@ index aca1f68f..671ca44c 100644 cache.data = Some(config.clone()); diff --git a/pbs-config/src/user.rs b/pbs-config/src/user.rs -index 08d141e6..1bff3c4f 100644 --- a/pbs-config/src/user.rs +++ b/pbs-config/src/user.rs @@ -96,8 +96,7 @@ pub fn cached_config() -> Result, Error> { @@ -154,7 +132,6 @@ index 08d141e6..1bff3c4f 100644 cache.data = Some(config.clone()); diff --git a/pbs-datastore/src/chunk_store.rs b/pbs-datastore/src/chunk_store.rs -index 3c59612b..0340d7f1 100644 --- a/pbs-datastore/src/chunk_store.rs +++ b/pbs-datastore/src/chunk_store.rs @@ -408,7 +408,7 @@ impl ChunkStore { @@ -176,7 +153,6 @@ index 3c59612b..0340d7f1 100644 status.still_bad += 1; } else { diff --git a/pbs-datastore/src/fixed_index.rs b/pbs-datastore/src/fixed_index.rs -index 8d9173e8..ae79c045 100644 --- a/pbs-datastore/src/fixed_index.rs +++ b/pbs-datastore/src/fixed_index.rs @@ -111,7 +111,7 @@ impl FixedIndexReader { @@ -207,7 +183,6 @@ index 8d9173e8..ae79c045 100644 }? .as_ptr() diff --git a/pbs-fuse-loop/src/fuse_loop.rs b/pbs-fuse-loop/src/fuse_loop.rs -index d55be3b0..711354bc 100644 --- a/pbs-fuse-loop/src/fuse_loop.rs +++ b/pbs-fuse-loop/src/fuse_loop.rs @@ -177,7 +177,7 @@ impl FuseLoopSession { @@ -228,7 +203,6 @@ index d55be3b0..711354bc 100644 stat } diff --git a/pbs-pxar-fuse/src/lib.rs b/pbs-pxar-fuse/src/lib.rs -index 4322c06e..ccb0c17d 100644 --- a/pbs-pxar-fuse/src/lib.rs +++ b/pbs-pxar-fuse/src/lib.rs @@ -546,7 +546,7 @@ impl SessionImpl { @@ -265,6 +239,3 @@ index 4322c06e..ccb0c17d 100644 stat.st_ctime_nsec = metadata.stat.mtime.nanos as _; Ok(stat) } --- -2.39.2 - diff --git a/repos/patches-arm32/proxmox-backup/proxmox-fuse/platform.armhf.patch b/repos/patches-arm32/proxmox-backup/proxmox-fuse/platform.armhf.patch index cb1f0bc..6cd7b35 100644 --- a/repos/patches-arm32/proxmox-backup/proxmox-fuse/platform.armhf.patch +++ b/repos/patches-arm32/proxmox-backup/proxmox-fuse/platform.armhf.patch @@ -1,15 +1,4 @@ -From a3cfcb6489bd2bb8e991ede9fd7a935a4ce9f995 Mon Sep 17 00:00:00 2001 -From: Kamil Trzcinski -Date: Fri, 25 Jul 2025 22:04:36 +0200 -Subject: [PATCH] arm32 - ---- - src/requests.rs | 8 ++++---- - src/session.rs | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - diff --git a/src/requests.rs b/src/requests.rs -index 9bdab30..15fe804 100644 --- a/src/requests.rs +++ b/src/requests.rs @@ -362,7 +362,7 @@ impl ReaddirPlus { @@ -49,7 +38,6 @@ index 9bdab30..15fe804 100644 None } diff --git a/src/session.rs b/src/session.rs -index 427ce46..02048c0 100644 --- a/src/session.rs +++ b/src/session.rs @@ -109,7 +109,7 @@ impl FuseData { @@ -70,6 +58,3 @@ index 427ce46..02048c0 100644 ))); } --- -2.39.2 - diff --git a/repos/patches-arm32/proxmox-backup/proxmox/platform.armhf.patch b/repos/patches-arm32/proxmox-backup/proxmox/platform.armhf.patch index 6de25ab..c9dd2a5 100644 --- a/repos/patches-arm32/proxmox-backup/proxmox/platform.armhf.patch +++ b/repos/patches-arm32/proxmox-backup/proxmox/platform.armhf.patch @@ -1,21 +1,4 @@ -From 06fa463a208338ad397e9581759bb3c26f7f2ee2 Mon Sep 17 00:00:00 2001 -From: Kamil Trzcinski -Date: Fri, 25 Jul 2025 22:04:16 +0200 -Subject: [PATCH] arm32 - ---- - proxmox-access-control/src/acl.rs | 7 +++---- - proxmox-access-control/src/user.rs | 8 +++++--- - proxmox-shared-memory/src/lib.rs | 2 +- - proxmox-sys/src/crypt.rs | 2 +- - proxmox-sys/src/fs/mod.rs | 2 +- - proxmox-sys/src/linux/timer.rs | 4 ++-- - proxmox-sys/src/process_locker.rs | 2 +- - proxmox-time/src/posix.rs | 6 ++++-- - 8 files changed, 18 insertions(+), 15 deletions(-) - diff --git a/proxmox-access-control/src/acl.rs b/proxmox-access-control/src/acl.rs -index b8041688..f6b4f456 100644 --- a/proxmox-access-control/src/acl.rs +++ b/proxmox-access-control/src/acl.rs @@ -596,8 +596,7 @@ pub fn cached_config() -> Result, Error> { @@ -40,7 +23,6 @@ index b8041688..f6b4f456 100644 cache.data = Some(config.clone()); diff --git a/proxmox-access-control/src/user.rs b/proxmox-access-control/src/user.rs -index 95b70f25..bf0bb255 100644 --- a/proxmox-access-control/src/user.rs +++ b/proxmox-access-control/src/user.rs @@ -83,7 +83,9 @@ pub fn cached_config() -> Result, Error> { @@ -66,7 +48,6 @@ index 95b70f25..bf0bb255 100644 cache.data = Some(config.clone()); diff --git a/proxmox-shared-memory/src/lib.rs b/proxmox-shared-memory/src/lib.rs -index b067d1b9..e8a994a8 100644 --- a/proxmox-shared-memory/src/lib.rs +++ b/proxmox-shared-memory/src/lib.rs @@ -145,7 +145,7 @@ impl SharedMemory { @@ -79,7 +60,6 @@ index b067d1b9..e8a994a8 100644 // link the file into place: let proc_path = format!("/proc/self/fd/{}\0", file.as_raw_fd()); diff --git a/proxmox-sys/src/crypt.rs b/proxmox-sys/src/crypt.rs -index 508b9c15..3b7ee7eb 100644 --- a/proxmox-sys/src/crypt.rs +++ b/proxmox-sys/src/crypt.rs @@ -112,7 +112,7 @@ pub fn crypt_gensalt(prefix: &str, count: u64, rbytes: &[u8]) -> Result(path: &P) -> nix::Result) -> libc::timespec { @@ -120,7 +98,6 @@ index bb01dc81..0b0eccd1 100644 } } diff --git a/proxmox-sys/src/process_locker.rs b/proxmox-sys/src/process_locker.rs -index 65d2793a..d5a32ddb 100644 --- a/proxmox-sys/src/process_locker.rs +++ b/proxmox-sys/src/process_locker.rs @@ -160,7 +160,7 @@ impl ProcessLocker { @@ -133,7 +110,6 @@ index 65d2793a..d5a32ddb 100644 Ok(guard) } diff --git a/proxmox-time/src/posix.rs b/proxmox-time/src/posix.rs -index c2146c47..e89876ea 100644 --- a/proxmox-time/src/posix.rs +++ b/proxmox-time/src/posix.rs @@ -15,7 +15,7 @@ pub fn timelocal(t: &mut libc::tm) -> Result { @@ -170,6 +146,3 @@ index c2146c47..e89876ea 100644 if libc::gmtime_r(&epoch, &mut result).is_null() { bail!("libc::gmtime failed for '{epoch}'"); } --- -2.39.2 - diff --git a/repos/patches/proxmox-backup/0001-zstd-dynamic.patch b/repos/patches/proxmox-backup/0001-zstd-dynamic.patch index e231a1a..3ab428c 100644 --- a/repos/patches/proxmox-backup/0001-zstd-dynamic.patch +++ b/repos/patches/proxmox-backup/0001-zstd-dynamic.patch @@ -1,8 +1,7 @@ diff --git a/Cargo.toml b/Cargo.toml -index ea413328..b2980c73 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -160,7 +160,7 @@ udev = "0.9" +@@ -162,7 +162,7 @@ udev = "0.9" url = "2.1" walkdir = "2" xdg = "2.2" diff --git a/repos/patches/proxmox-backup/debian-cargo-config.patch b/repos/patches/proxmox-backup/debian-cargo-config.patch index 065ce7c..3b217c8 100644 --- a/repos/patches/proxmox-backup/debian-cargo-config.patch +++ b/repos/patches/proxmox-backup/debian-cargo-config.patch @@ -1,8 +1,7 @@ diff --git a/debian/rules b/debian/rules -index aa4571ff..0fbb29e7 100755 --- a/debian/rules +++ b/debian/rules -@@ -38,9 +38,9 @@ endif +@@ -37,9 +37,9 @@ endif override_dh_auto_configure: @perl -ne 'if (/^version\s*=\s*"(\d+(?:\.\d+)+)"/) { my $$v_cargo = $$1; my $$v_deb = "$(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 diff --git a/repos/patches/proxmox-backup/fix-cargo.patch b/repos/patches/proxmox-backup/fix-cargo.patch index abae759..612a43e 100644 --- a/repos/patches/proxmox-backup/fix-cargo.patch +++ b/repos/patches/proxmox-backup/fix-cargo.patch @@ -1,5 +1,4 @@ diff --git a/debian/rules b/debian/rules -index ab48cce1..0a540d4f 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ STATIC_COMPILEDIR := $(STATIC_TARGET_DIR)/$(DEB_HOST_RUST_TYPE)/debug diff --git a/repos/patches/proxmox-backup/fix-kernel-version.patch b/repos/patches/proxmox-backup/fix-kernel-version.patch index 4986723..fd8c6b5 100644 --- a/repos/patches/proxmox-backup/fix-kernel-version.patch +++ b/repos/patches/proxmox-backup/fix-kernel-version.patch @@ -1,5 +1,4 @@ diff --git a/www/panel/NodeInfo.js b/www/panel/NodeInfo.js -index a8673f6b..1ead89bd 100644 --- a/www/panel/NodeInfo.js +++ b/www/panel/NodeInfo.js @@ -150,7 +150,7 @@ Ext.define('PBS.NodeInfoPanel', { diff --git a/repos/patches/proxmox-backup/hide-shell.patch b/repos/patches/proxmox-backup/hide-shell.patch index 3b325ba..38cf7ac 100644 --- a/repos/patches/proxmox-backup/hide-shell.patch +++ b/repos/patches/proxmox-backup/hide-shell.patch @@ -1,5 +1,4 @@ diff --git a/www/NavigationTree.js b/www/NavigationTree.js -index 649692c8..cec8d5a9 100644 --- a/www/NavigationTree.js +++ b/www/NavigationTree.js @@ -95,12 +95,6 @@ Ext.define('PBS.store.NavigationStore', { diff --git a/repos/patches/proxmox-backup/multi-arch.patch b/repos/patches/proxmox-backup/multi-arch.patch index 79229f6..6901fe4 100644 --- a/repos/patches/proxmox-backup/multi-arch.patch +++ b/repos/patches/proxmox-backup/multi-arch.patch @@ -1,7 +1,6 @@ diff --git a/debian/proxmox-backup-file-restore.install b/debian/proxmox-backup-file-restore.install old mode 100644 new mode 100755 -index 409988a3..8b4034bd --- a/debian/proxmox-backup-file-restore.install +++ b/debian/proxmox-backup-file-restore.install @@ -1,4 +1,5 @@ @@ -14,15 +13,14 @@ index 409988a3..8b4034bd diff --git a/debian/proxmox-backup-server.install b/debian/proxmox-backup-server.install old mode 100644 new mode 100755 -index 40d8459f..466bd621 --- a/debian/proxmox-backup-server.install +++ b/debian/proxmox-backup-server.install @@ -1,3 +1,4 @@ +#! /usr/bin/dh-exec etc/pbs-enterprise.sources /etc/apt/sources.list.d/ + etc/pbs-network-config-commit.service /usr/lib/systemd/system/ etc/proxmox-backup-banner.service /usr/lib/systemd/system/ - etc/proxmox-backup-daily-update.service /usr/lib/systemd/system/ -@@ -8,11 +9,11 @@ etc/removable-device-attach@.service /usr/lib/systemd/system/ +@@ -9,11 +10,11 @@ etc/removable-device-attach@.service /usr/lib/systemd/system/ usr/bin/pmt usr/bin/pmtx usr/bin/proxmox-tape @@ -40,7 +38,6 @@ index 40d8459f..466bd621 usr/sbin/proxmox-backup-debug usr/sbin/proxmox-backup-manager diff --git a/debian/rules b/debian/rules -index 0a540d4f..aa4571ff 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,7 @@ diff --git a/repos/patches/proxmox-biome/any-arch.patch b/repos/patches/proxmox-biome/any-arch.patch index d12650c..1bb2ce4 100644 --- a/repos/patches/proxmox-biome/any-arch.patch +++ b/repos/patches/proxmox-biome/any-arch.patch @@ -1,5 +1,4 @@ diff --git a/debian/control b/debian/control -index bcfa86d0..83d2d6b4 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Homepage: https://biomejs.dev/ diff --git a/repos/patches/proxmox-biome/config-toml.patch b/repos/patches/proxmox-biome/config-toml.patch index 0e9e376..7c3394e 100644 --- a/repos/patches/proxmox-biome/config-toml.patch +++ b/repos/patches/proxmox-biome/config-toml.patch @@ -1,5 +1,4 @@ diff --git a/Makefile b/Makefile -index 18e5ce27..7caf87b0 100644 --- a/Makefile +++ b/Makefile @@ -39,8 +39,8 @@ $(BUILDDIR): diff --git a/repos/patches/proxmox-biome/makefile-arch.patch b/repos/patches/proxmox-biome/makefile-arch.patch index a856845..4213cac 100644 --- a/repos/patches/proxmox-biome/makefile-arch.patch +++ b/repos/patches/proxmox-biome/makefile-arch.patch @@ -1,5 +1,4 @@ diff --git a/Makefile b/Makefile -index 7caf87b0..7b398722 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,10 @@ diff --git a/repos/patches/proxmox-mini-journalreader/compile-error.patch b/repos/patches/proxmox-mini-journalreader/compile-error.patch index 95a9324..4389dcd 100644 --- a/repos/patches/proxmox-mini-journalreader/compile-error.patch +++ b/repos/patches/proxmox-mini-journalreader/compile-error.patch @@ -1,5 +1,4 @@ diff --git a/src/Makefile b/src/Makefile -index 6807b67..e64e066 100644 --- a/src/Makefile +++ b/src/Makefile @@ -6,7 +6,7 @@ MAN1_DIR ?= $(DESTDIR)/usr/share/man/man1 diff --git a/repos/patches/proxmox-perl-rs/0001-ignore-libproxmox-rs-perl-dependency.patch b/repos/patches/proxmox-perl-rs/0001-ignore-libproxmox-rs-perl-dependency.patch index 63a3956..8a3ae7e 100644 --- a/repos/patches/proxmox-perl-rs/0001-ignore-libproxmox-rs-perl-dependency.patch +++ b/repos/patches/proxmox-perl-rs/0001-ignore-libproxmox-rs-perl-dependency.patch @@ -1,5 +1,4 @@ diff --git a/pve-rs/debian/control b/pve-rs/debian/control -index bca3c1e..eedce80 100644 --- a/pve-rs/debian/control +++ b/pve-rs/debian/control @@ -4,7 +4,6 @@ Priority: optional diff --git a/repos/patches/proxmox-perl-rs/no-cargo.patch b/repos/patches/proxmox-perl-rs/no-cargo.patch index cd212ef..22fd4bf 100644 --- a/repos/patches/proxmox-perl-rs/no-cargo.patch +++ b/repos/patches/proxmox-perl-rs/no-cargo.patch @@ -1,5 +1,4 @@ diff --git a/pve-rs/debian/rules b/pve-rs/debian/rules -index bddb889..4e15f38 100755 --- a/pve-rs/debian/rules +++ b/pve-rs/debian/rules @@ -21,5 +21,5 @@ export DEB_CARGO_PACKAGE=pve-rs diff --git a/repos/patches/pve-common/mknodat.patch b/repos/patches/pve-common/mknodat.patch index c94eddb..320cf2b 100644 --- a/repos/patches/pve-common/mknodat.patch +++ b/repos/patches/pve-common/mknodat.patch @@ -1,5 +1,4 @@ diff --git a/src/PVE/Syscall.pm b/src/PVE/Syscall.pm -index 68e16fe..503d3fe 100644 --- a/src/PVE/Syscall.pm +++ b/src/PVE/Syscall.pm @@ -17,7 +17,7 @@ BEGIN { @@ -12,7 +11,6 @@ index 68e16fe..503d3fe 100644 setresuid => &SYS_setresuid, fallocate => &SYS_fallocate, diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm -index fe9616e..e9b7578 100644 --- a/src/PVE/Tools.pm +++ b/src/PVE/Tools.pm @@ -1817,7 +1817,7 @@ sub mkdirat($$$) { diff --git a/repos/patches/pve-common/remove-libproxmox-acme-perl.patch b/repos/patches/pve-common/remove-libproxmox-acme-perl.patch index 1b515c6..931a44a 100644 --- a/repos/patches/pve-common/remove-libproxmox-acme-perl.patch +++ b/repos/patches/pve-common/remove-libproxmox-acme-perl.patch @@ -1,5 +1,4 @@ diff --git a/debian/control b/debian/control -index ac4cd66..136839b 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,6 @@ Depends: libanyevent-perl, diff --git a/repos/patches/pve-xtermjs/no-cargo.patch b/repos/patches/pve-xtermjs/no-cargo.patch index cbeae4f..1c19646 100644 --- a/repos/patches/pve-xtermjs/no-cargo.patch +++ b/repos/patches/pve-xtermjs/no-cargo.patch @@ -1,5 +1,4 @@ diff --git a/termproxy/debian/rules b/termproxy/debian/rules -index add090b..f25093f 100755 --- a/termproxy/debian/rules +++ b/termproxy/debian/rules @@ -23,7 +23,7 @@ export DEB_CARGO_PACKAGE=proxmox-termproxy diff --git a/repos/patches/pve-xtermjs/no-docs.patch b/repos/patches/pve-xtermjs/no-docs.patch index dd5dbbf..8641a46 100644 --- a/repos/patches/pve-xtermjs/no-docs.patch +++ b/repos/patches/pve-xtermjs/no-docs.patch @@ -1,6 +1,5 @@ diff --git a/termproxy/debian/docs b/termproxy/debian/docs deleted file mode 100644 -index 8696672..0000000 --- a/termproxy/debian/docs +++ /dev/null @@ -1 +0,0 @@