split out pbs-runtime module

[proxmox-backup.git] / Makefile

diff --git a/Makefile b/Makefile
index ec52d88fbbf28b5e81f4f3d328393845e3712177..f6915c5f3b5663bbb0da533b9040bd04eff52997 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,14 @@ SERVICE_BIN := \
        proxmox-backup-proxy \
        proxmox-daily-update
 
+# Single file restore daemon
+RESTORE_BIN := \
+       proxmox-restore-daemon
+
+SUBCRATES := \
+       pbs-buildcfg \
+       pbs-runtime
+
 ifeq ($(BUILD_MODE), release)
 CARGO_BUILD_ARGS += --release
 COMPILEDIR := target/release
@@ -40,7 +48,7 @@ endif
 CARGO ?= cargo
 
 COMPILED_BINS := \
-       $(addprefix $(COMPILEDIR)/,$(USR_BIN) $(USR_SBIN) $(SERVICE_BIN))
+       $(addprefix $(COMPILEDIR)/,$(USR_BIN) $(USR_SBIN) $(SERVICE_BIN) $(RESTORE_BIN))
 
 export DEB_VERSION DEB_VERSION_UPSTREAM
 
@@ -48,8 +56,8 @@ SERVER_DEB=${PACKAGE}-server_${DEB_VERSION}_${ARCH}.deb
 SERVER_DBG_DEB=${PACKAGE}-server-dbgsym_${DEB_VERSION}_${ARCH}.deb
 CLIENT_DEB=${PACKAGE}-client_${DEB_VERSION}_${ARCH}.deb
 CLIENT_DBG_DEB=${PACKAGE}-client-dbgsym_${DEB_VERSION}_${ARCH}.deb
-RESTORE_DEB=proxmox-file-restore_${DEB_VERSION}_${ARCH}.deb
-RESTORE_DBG_DEB=proxmox-file-restore-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
 DOC_DEB=${PACKAGE}-docs_${DEB_VERSION}_all.deb
 
 DEBS=${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB} \
@@ -77,13 +85,14 @@ doc:
 .PHONY: build
 build:
        rm -rf build
-       rm -f debian/control
-       debcargo package --config debian/debcargo.toml --changelog-ready --no-overlay-write-back --directory build proxmox-backup $(shell dpkg-parsechangelog -l debian/changelog -SVersion | sed -e 's/-.*//')
-       sed -e '1,/^$$/ ! d' build/debian/control > build/debian/control.src
-       cat build/debian/control.src build/debian/control.in > build/debian/control
-       rm build/debian/control.in build/debian/control.src
-       cp build/debian/control debian/control
-       rm build/Cargo.lock
+       mkdir build
+       cp -a debian \
+         Cargo.toml build.rs src \
+         $(SUBCRATES) \
+         docs etc examples tests www zsh-completions \
+         defines.mk Makefile \
+         ./build/
+       rm -f build/Cargo.lock
        find build/debian -name "*.hint" -delete
        $(foreach i,$(SUBDIRS), \
            $(MAKE) -C build/$(i) clean ;)
@@ -103,7 +112,9 @@ deb: build
        lintian $(DEBS)
 
 .PHONY: deb-all
-deb-all: $(DOC_DEB) $(DEBS)
+deb-all: build
+       cd build; dpkg-buildpackage -b -us -uc --no-pre-clean
+       lintian $(DEBS) $(DOC_DEB)
 
 .PHONY: dsc
 dsc: $(DSC)
@@ -121,8 +132,8 @@ clean:
        find . -name '*~' -exec rm {} ';'
 
 .PHONY: dinstall
-dinstall: ${DEBS}
-       dpkg -i ${DEBS}
+dinstall: ${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB}
+       dpkg -i $^
 
 # make sure we build binaries before docs
 docs: cargo-build
@@ -148,6 +159,9 @@ install: $(COMPILED_BINS)
            install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(SBINDIR)/ ; \
            install -m644 zsh-completions/_$(i) $(DESTDIR)$(ZSH_COMPL_DEST)/ ;)
        install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup
+       install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/file-restore
+       $(foreach i,$(RESTORE_BIN), \
+           install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/file-restore/ ;)
        # install sg-tape-cmd as setuid binary
        install -m4755 -o root -g root $(COMPILEDIR)/sg-tape-cmd $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/sg-tape-cmd
        $(foreach i,$(SERVICE_BIN), \
@@ -159,6 +173,7 @@ install: $(COMPILED_BINS)
 upload: ${SERVER_DEB} ${CLIENT_DEB} ${RESTORE_DEB} ${DOC_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} | ssh -X repoman@repo.proxmox.com upload --product pbs --dist buster
-       tar cf - ${CLIENT_DEB} ${CLIENT_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pbs,pve,pmg" --dist buster
-       tar cf - ${RESTORE_DEB} ${RESTORE_DBG_DEB} | ssh -X repoman@repo.proxmox.com upload --product "pbs,pve,pmg" --dist buster
+       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 - ${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