ui: add GroupSelector

[proxmox-backup.git] / Makefile

diff --git a/Makefile b/Makefile
index 40a8049300b5d152a754db9defd4ff8564011f18..6a38931f6a3f1e205134ec78383846f8178441ea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,15 +35,17 @@ SUBCRATES := \
        pbs-api-types \
        pbs-buildcfg \
        pbs-client \
+       pbs-config \
        pbs-datastore \
        pbs-fuse-loop \
-       pbs-runtime \
-       pbs-systemd \
+       proxmox-rest-server \
+       proxmox-rrd \
+       pbs-tape \
        pbs-tools \
        proxmox-backup-banner \
        proxmox-backup-client \
-       proxmox-backup-debug \
        proxmox-file-restore \
+       proxmox-restore-daemon \
        pxar-bin
 
 ifeq ($(BUILD_MODE), release)
@@ -70,8 +72,6 @@ CLIENT_DEB=${PACKAGE}-client_${DEB_VERSION}_${ARCH}.deb
 CLIENT_DBG_DEB=${PACKAGE}-client-dbgsym_${DEB_VERSION}_${ARCH}.deb
 RESTORE_DEB=proxmox-backup-file-restore_${DEB_VERSION}_${ARCH}.deb
 RESTORE_DBG_DEB=proxmox-backup-file-restore-dbgsym_${DEB_VERSION}_${ARCH}.deb
-DEBUG_DEB=${PACKAGE}-debug_${DEB_VERSION}_${ARCH}.deb
-DEBUG_DBG_DEB=${PACKAGE}-debug-dbgsym_${DEB_VERSION}_${ARCH}.deb
 DOC_DEB=${PACKAGE}-docs_${DEB_VERSION}_all.deb
 
 DEBS=${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB} \
@@ -100,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 \
@@ -166,30 +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 \
-           --package proxmox-backup-debug \
+           --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 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 "$@"