cleanup schema function calls

[proxmox-backup.git] / Makefile

diff --git a/Makefile b/Makefile
index 9be9f15b475e0148a5c8df9e5eb8ef634ddcf031..a29cb2df2d425b8cd2421fdc1b3f26c02dfb5a8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,8 @@ USR_BIN := \
 
 # Binaries usable by admins
 USR_SBIN := \
-       proxmox-backup-manager
+       proxmox-backup-manager \
+       proxmox-backup-debug \
 
 # Binaries for services:
 SERVICE_BIN := \
@@ -34,11 +35,17 @@ SUBCRATES := \
        pbs-api-types \
        pbs-buildcfg \
        pbs-client \
+       pbs-config \
        pbs-datastore \
-       pbs-runtime \
-       pbs-systemd \
+       pbs-fuse-loop \
+       proxmox-rest-server \
+       proxmox-rrd \
+       pbs-tape \
        pbs-tools \
        proxmox-backup-banner \
+       proxmox-backup-client \
+       proxmox-file-restore \
+       proxmox-restore-daemon \
        pxar-bin
 
 ifeq ($(BUILD_MODE), release)
@@ -68,7 +75,7 @@ RESTORE_DBG_DEB=proxmox-backup-file-restore-dbgsym_${DEB_VERSION}_${ARCH}.deb
 DOC_DEB=${PACKAGE}-docs_${DEB_VERSION}_all.deb
 
 DEBS=${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB} \
-     ${RESTORE_DEB} ${RESTORE_DBG_DEB}
+     ${RESTORE_DEB} ${RESTORE_DBG_DEB} ${DEBUG_DEB} ${DEBUG_DBG_DEB}
 
 DSC = rust-${PACKAGE}_${DEB_VERSION}.dsc
 
@@ -93,6 +100,9 @@ doc:
 # always re-create this dir
 .PHONY: build
 build:
+       @echo "Setting pkg-buildcfg version to: $(DEB_VERSION_UPSTREAM)"
+       sed -i -e 's/^version =.*$$/version = "$(DEB_VERSION_UPSTREAM)"/' \
+         pbs-buildcfg/Cargo.toml
        rm -rf build
        mkdir build
        cp -a debian \
@@ -145,7 +155,8 @@ clean-deb:
        rm -rf *.deb *.dsc *.tar.gz *.buildinfo *.changes build/
 
 .PHONY: dinstall
-dinstall: ${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB}
+dinstall: ${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB} \
+  ${DEBUG_DEB} ${DEBUG_DBG_DEB}
        dpkg -i $^
 
 # make sure we build binaries before docs
@@ -158,23 +169,30 @@ cargo-build:
 
 $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-cargo-build
 .do-cargo-build:
-       RUSTFLAGS="--cfg openid" $(CARGO) build $(CARGO_BUILD_ARGS) \
-           --bin proxmox-backup-api --bin proxmox-backup-proxy \
-           --bin proxmox-backup-manager --bin docgen
        $(CARGO) build $(CARGO_BUILD_ARGS) \
            --package proxmox-backup-banner \
            --bin proxmox-backup-banner \
+           --package proxmox-backup-client \
+           --bin proxmox-backup-client \
+           --bin dump-catalog-shell-cli \
+           --bin proxmox-backup-debug \
+           --package proxmox-file-restore \
+           --bin proxmox-file-restore \
            --package pxar-bin \
            --bin pxar \
+           --package pbs-tape \
+           --bin pmt \
+           --bin pmtx \
+           --package proxmox-restore-daemon \
+           --bin proxmox-restore-daemon \
            --package proxmox-backup \
-           --bin dump-catalog-shell-cli \
-           --bin pmt --bin pmtx \
-           --bin proxmox-backup-client \
+           --bin docgen \
+           --bin proxmox-backup-api \
+           --bin proxmox-backup-manager \
+           --bin proxmox-backup-proxy \
            --bin proxmox-daily-update \
            --bin proxmox-file-restore \
-           --bin proxmox-restore-daemon \
            --bin proxmox-tape \
-           --bin pxar \
            --bin sg-tape-cmd
        touch "$@"
 
@@ -205,10 +223,11 @@ install: $(COMPILED_BINS)
        $(MAKE) -C docs install
 
 .PHONY: upload
-upload: ${SERVER_DEB} ${CLIENT_DEB} ${RESTORE_DEB} ${DOC_DEB}
+upload: ${SERVER_DEB} ${CLIENT_DEB} ${RESTORE_DEB} ${DOC_DEB} ${DEBUG_DEB}
        # check if working directory is clean
        git diff --exit-code --stat && git diff --exit-code --stat --staged
-       tar cf - ${SERVER_DEB} ${SERVER_DBG_DEB} ${DOC_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB} | \
-           ssh -X repoman@repo.proxmox.com upload --product pbs --dist bullseye
+       tar cf - ${SERVER_DEB} ${SERVER_DBG_DEB} ${DOC_DEB} ${CLIENT_DEB} \
+           ${CLIENT_DBG_DEB} ${DEBUG_DEB} ${DEBUG_DBG_DEB} \
+         | ssh -X repoman@repo.proxmox.com upload --product pbs --dist bullseye
        tar cf - ${CLIENT_DEB} ${CLIENT_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pve,pmg,pbs-client" --dist bullseye
        tar cf - ${RESTORE_DEB} ${RESTORE_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pve" --dist bullseye