From 11b1bd5bc0cf3f3bff5b868167f4dba020197a2f Mon Sep 17 00:00:00 2001 From: Christian Ebner Date: Mon, 14 Jul 2025 12:12:16 +0200 Subject: [PATCH] build: Adapt from pbs2to3 to pbs3to4 Build and package the new version of the upgrade check binary, ropping the no longer required old one. Signed-off-by: Christian Ebner Link: https://lore.proxmox.com/20250714101217.4178-1-c.ebner@proxmox.com --- Makefile | 4 ++-- debian/lintian-overrides | 2 +- debian/proxmox-backup-server.install | 4 ++-- docs/Makefile | 2 +- docs/conf.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f14b4d8c..2012ae5d 100644 --- a/Makefile +++ b/Makefile @@ -195,7 +195,7 @@ $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen &: --bin proxmox-restore-daemon \ --package proxmox-backup \ --bin docgen \ - --bin pbs2to3 \ + --bin pbs3to4 \ --bin proxmox-backup-api \ --bin proxmox-backup-manager \ --bin proxmox-backup-proxy \ @@ -233,7 +233,7 @@ install: $(COMPILED_BINS) $(STATIC_BINS) $(foreach i,$(USR_SBIN), \ install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(SBINDIR)/ ; \ install -m644 zsh-completions/_$(i) $(DESTDIR)$(ZSH_COMPL_DEST)/ ;) - install -m755 $(COMPILEDIR)/pbs2to3 $(DESTDIR)$(SBINDIR)/ + install -m755 $(COMPILEDIR)/pbs3to4 $(DESTDIR)$(SBINDIR)/ install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/file-restore $(foreach i,$(RESTORE_BIN), \ diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 4e8153f8..96bb0186 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -4,5 +4,5 @@ proxmox-backup-server: package-installs-apt-sources [etc/apt/sources.list.d/pbs- proxmox-backup-server: systemd-service-file-refers-to-unusual-wantedby-target getty.target [usr/lib/systemd/system/proxmox-backup-banner.service] proxmox-backup-server: uses-dpkg-database-directly [usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-api] proxmox-backup-server: uses-dpkg-database-directly [usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-proxy] -proxmox-backup-server: uses-dpkg-database-directly [usr/sbin/pbs2to3] +proxmox-backup-server: uses-dpkg-database-directly [usr/sbin/pbs3to4] proxmox-backup-server: uses-dpkg-database-directly [usr/sbin/proxmox-backup-debug] diff --git a/debian/proxmox-backup-server.install b/debian/proxmox-backup-server.install index 5f9af288..40d8459f 100644 --- a/debian/proxmox-backup-server.install +++ b/debian/proxmox-backup-server.install @@ -13,14 +13,14 @@ usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-banner usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-proxy usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-daily-update usr/lib/x86_64-linux-gnu/proxmox-backup/sg-tape-cmd -usr/sbin/pbs2to3 +usr/sbin/pbs3to4 usr/sbin/proxmox-backup-debug usr/sbin/proxmox-backup-manager usr/share/javascript/proxmox-backup/css/ext6-pbs.css usr/share/javascript/proxmox-backup/images usr/share/javascript/proxmox-backup/index.hbs usr/share/javascript/proxmox-backup/js/proxmox-backup-gui.js -usr/share/man/man1/pbs2to3.1 +usr/share/man/man1/pbs3to4.1 usr/share/man/man1/pmt.1 usr/share/man/man1/pmtx.1 usr/share/man/man1/proxmox-backup-debug.1 diff --git a/docs/Makefile b/docs/Makefile index c57cbbc2..5cf5fc17 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -25,7 +25,7 @@ GENERATED_SYNOPSIS := \ pxar/synopsis.rst \ MAN1_PAGES := \ - pbs2to3.1 \ + pbs3to4.1 \ pmt.1 \ pmtx.1 \ proxmox-backup-client.1 \ diff --git a/docs/conf.py b/docs/conf.py index a7fa1079..64c4f9d4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -102,7 +102,7 @@ man_pages = [ ('pxar/man1', 'pxar', 'Proxmox File Archive CLI Tool', [author], 1), ('pmt/man1', 'pmt', 'Control Linux Tape Devices', [author], 1), ('pmtx/man1', 'pmtx', 'Control SCSI media changer devices (tape autoloaders)', [author], 1), - ('pbs2to3/man1', 'pbs2to3', 'Proxmox Backup Server upgrade checker script for 2.4+ to current 3.x major upgrades', [author], 1), + ('pbs3to4/man1', 'pbs3to4', 'Proxmox Backup Server upgrade checker script for 3.4+ to current 4.x major upgrades', [author], 1), # configs ('config/acl/man5', 'acl.cfg', 'Access Control Configuration', [author], 5), ('config/datastore/man5', 'datastore.cfg', 'Datastore Configuration', [author], 5),