# Binaries usable by users
USR_BIN := \
- proxmox-backup-client \
- pxar
+ proxmox-backup-client \
+ proxmox-file-restore \
+ pxar \
+ proxmox-tape \
+ pmtx \
+ pmt
# Binaries usable by admins
USR_SBIN := \
- proxmox-backup-manager
+ proxmox-backup-manager \
+ proxmox-backup-debug \
# Binaries for services:
SERVICE_BIN := \
proxmox-backup-proxy \
proxmox-daily-update
+# Single file restore daemon
+RESTORE_BIN := \
+ proxmox-restore-daemon
+
+SUBCRATES := \
+ pbs-api-types \
+ pbs-buildcfg \
+ pbs-client \
+ pbs-config \
+ pbs-datastore \
+ pbs-fuse-loop \
+ pbs-runtime \
+ proxmox-rest-server \
+ proxmox-systemd \
+ pbs-tape \
+ pbs-tools \
+ proxmox-backup-banner \
+ proxmox-backup-client \
+ proxmox-file-restore \
+ proxmox-restore-daemon \
+ pxar-bin
+
ifeq ($(BUILD_MODE), release)
CARGO_BUILD_ARGS += --release
COMPILEDIR := target/release
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
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-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}
+DEBS=${SERVER_DEB} ${SERVER_DBG_DEB} ${CLIENT_DEB} ${CLIENT_DBG_DEB} \
+ ${RESTORE_DEB} ${RESTORE_DBG_DEB} ${DEBUG_DEB} ${DEBUG_DBG_DEB}
DSC = rust-${PACKAGE}_${DEB_VERSION}.dsc
DESTDIR=
-all: cargo-build $(SUBDIRS)
+tests ?= --workspace
+
+all: $(SUBDIRS)
.PHONY: $(SUBDIRS)
$(SUBDIRS):
$(CARGO) test $(tests) $(CARGO_BUILD_ARGS)
doc:
- $(CARGO) doc --no-deps $(CARGO_BUILD_ARGS)
+ $(CARGO) doc --workspace --no-deps $(CARGO_BUILD_ARGS)
# 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
- 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 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 ;)
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)
cd build; dpkg-buildpackage -S -us -uc -d -nc
lintian $(DSC)
+.PHONY: clean distclean deb clean
distclean: clean
-
-clean:
+clean: clean-deb
$(foreach i,$(SUBDIRS), \
$(MAKE) -C $(i) clean ;)
$(CARGO) clean
- rm -rf *.deb *.dsc *.tar.gz *.buildinfo *.changes build
+ rm -f .do-cargo-build
find . -name '*~' -exec rm {} ';'
+# allows one to avoid running cargo clean when one just wants to tidy up after a packgae build
+clean-deb:
+ rm -rf *.deb *.dsc *.tar.gz *.buildinfo *.changes build/
+
.PHONY: dinstall
-dinstall: ${DEBS}
- dpkg -i ${DEBS}
+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
-docs: cargo-build
+docs: $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen
.PHONY: cargo-build
cargo-build:
- $(CARGO) build $(CARGO_BUILD_ARGS)
+ rm -f .do-cargo-build
+ $(MAKE) $(COMPILED_BINS)
+
+$(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen: .do-cargo-build
+.do-cargo-build:
+ $(CARGO) build $(CARGO_BUILD_ARGS) \
+ --bin proxmox-backup-api \
+ --bin proxmox-backup-proxy \
+ --bin proxmox-backup-manager \
+ --bin docgen \
+ --package proxmox-backup-banner \
+ --bin proxmox-backup-banner \
+ --package proxmox-backup-client \
+ --bin proxmox-backup-client \
+ --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 proxmox-daily-update \
+ --bin proxmox-file-restore \
+ --bin proxmox-tape \
+ --bin sg-tape-cmd
+ touch "$@"
-$(COMPILED_BINS): cargo-build
.PHONY: lint
lint:
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 -m2755 -mu+s $(COMPILEDIR)/sg-tape-cmd $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/sg-tape-cmd
+ install -m4755 -o root -g root $(COMPILEDIR)/sg-tape-cmd $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/sg-tape-cmd
$(foreach i,$(SERVICE_BIN), \
install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/ ;)
$(MAKE) -C www install
$(MAKE) -C docs install
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ $(MAKE) test # HACK, only test now to avoid clobbering build files with wrong config
+endif
.PHONY: upload
-upload: ${SERVER_DEB} ${CLIENT_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} | 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 - ${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
projects / proxmox-backup.git / blobdiff