diff --git a/build.sh b/build.sh index 6ba17e8..27a24dc 100755 --- a/build.sh +++ b/build.sh @@ -289,8 +289,11 @@ if [ ! -e "${PACKAGES}/proxmox-backup-${BUILD_PACKAGE}_${PROXMOX_BACKUP_VER}_${P patch -p1 -d proxmox-backup/ < "${PATCHES}/proxmox-backup-build.patch" [ "${BUILD_PACKAGE}" = "client" ] && \ patch -p1 -d proxmox-backup/ < "${PATCHES}/proxmox-backup-client.patch" - [ "${PACKAGE_ARCH}" = "arm64" ] && \ - patch -p1 -d proxmox-backup/ < "${PATCHES}/proxmox-backup-arm.patch" + if [ "${PACKAGE_ARCH}" = "arm64" ]; then + sed -i "s/x86_64-linux-gnu/aarch64-linux-gnu/" proxmox-backup/debian/proxmox-backup-file-restore.install + sed -i "s/x86_64-linux-gnu/aarch64-linux-gnu/" proxmox-backup/debian/proxmox-backup-file-restore.postinst + sed -i "s/x86_64-linux-gnu/aarch64-linux-gnu/" proxmox-backup/debian/proxmox-backup-server.install + fi [[ "${BUILD_PROFILES}" =~ cross ]] && \ patch -p1 -d proxmox-backup/ < "${PATCHES}/proxmox-backup-cross.patch" cd proxmox-backup/ diff --git a/patches/proxmox-backup-arm.patch b/patches/proxmox-backup-arm.patch deleted file mode 100644 index 9348710..0000000 --- a/patches/proxmox-backup-arm.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/debian/proxmox-backup-file-restore.install b/debian/proxmox-backup-file-restore.install -index d952836e..7e1bf2dd 100644 ---- a/debian/proxmox-backup-file-restore.install -+++ b/debian/proxmox-backup-file-restore.install -@@ -1,4 +1,4 @@ - usr/bin/proxmox-file-restore - usr/share/man/man1/proxmox-file-restore.1 - usr/share/zsh/vendor-completions/_proxmox-file-restore --usr/lib/x86_64-linux-gnu/proxmox-backup/file-restore/proxmox-restore-daemon -+usr/lib/aarch64-linux-gnu/proxmox-backup/file-restore/proxmox-restore-daemon -diff --git a/debian/proxmox-backup-file-restore.postinst b/debian/proxmox-backup-file-restore.postinst -index feb0557b..9501d29b 100755 ---- a/debian/proxmox-backup-file-restore.postinst -+++ b/debian/proxmox-backup-file-restore.postinst -@@ -4,7 +4,7 @@ set -e - - update_initramfs() { - # regenerate initramfs for single file restore VM -- INST_PATH="/usr/lib/x86_64-linux-gnu/proxmox-backup/file-restore" -+ INST_PATH="/usr/lib/aarch64-linux-gnu/proxmox-backup/file-restore" - CACHE_PATH="/var/cache/proxmox-backup/file-restore-initramfs.img" - CACHE_PATH_DBG="/var/cache/proxmox-backup/file-restore-initramfs-debug.img" - -diff --git a/debian/proxmox-backup-server.install b/debian/proxmox-backup-server.install -index 76f50cd0..528a3cc5 100644 ---- a/debian/proxmox-backup-server.install -+++ b/debian/proxmox-backup-server.install -@@ -4,11 +4,11 @@ etc/proxmox-backup-banner.service /lib/systemd/system/ - etc/proxmox-backup-daily-update.service /lib/systemd/system/ - etc/proxmox-backup-daily-update.timer /lib/systemd/system/ - etc/pbs-enterprise.list /etc/apt/sources.list.d/ --usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-api --usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-proxy --usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-banner --usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-daily-update --usr/lib/x86_64-linux-gnu/proxmox-backup/sg-tape-cmd -+usr/lib/aarch64-linux-gnu/proxmox-backup/proxmox-backup-api -+usr/lib/aarch64-linux-gnu/proxmox-backup/proxmox-backup-proxy -+usr/lib/aarch64-linux-gnu/proxmox-backup/proxmox-backup-banner -+usr/lib/aarch64-linux-gnu/proxmox-backup/proxmox-daily-update -+usr/lib/aarch64-linux-gnu/proxmox-backup/sg-tape-cmd - usr/sbin/proxmox-backup-debug - usr/sbin/proxmox-backup-manager - usr/bin/pmtx