diff --git a/Cargo.toml b/Cargo.toml index b52e5c53..fa6d5019 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,7 +91,7 @@ proxmox-http = { version = "0.2.1", features = [ "client", "http-helpers", "webs #proxmox-http = { version = "0.2.0", path = "../proxmox/proxmox-http", features = [ "client", "http-helpers", "websocket" ] } proxmox-openid = "0.6.0" -pbs-buildcfg = { path = "pbs-buildcfg" } +pbs-buildcfg = { path = "pbs-buildcfg", version = "0.1" } [features] default = [] diff --git a/Makefile b/Makefile index f1b0c592..48296f93 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,9 @@ SERVICE_BIN := \ RESTORE_BIN := \ proxmox-restore-daemon +SUBCRATES := \ + pbs-buildcfg + ifeq ($(BUILD_MODE), release) CARGO_BUILD_ARGS += --release COMPILEDIR := target/release @@ -81,21 +84,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 - # not yet settable via debcargo.toml, required for setuid binaries in `make install` - sed -i -e 's/^Rules-Requires-Root: no/Rules-Requires-Root: binary-targets/g' build/debian/control - 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 ;) diff --git a/debian/control.in b/debian/control.in deleted file mode 100644 index 7e580492..00000000 --- a/debian/control.in +++ /dev/null @@ -1,56 +0,0 @@ -Package: proxmox-backup-server -Architecture: any -Depends: fonts-font-awesome, - libjs-extjs (>= 7~), - libjs-qrcodejs (>= 1.20201119), - libproxmox-acme-plugins, - libsgutils2-2, - libzstd1 (>= 1.3.8), - lvm2, - openssh-server, - pbs-i18n, - postfix | mail-transport-agent, - proxmox-backup-docs, - proxmox-mini-journalreader, - proxmox-widget-toolkit (>= 3.2-1), - pve-xtermjs (>= 4.7.0-1), - sg3-utils, - smartmontools, - ${misc:Depends}, - ${shlibs:Depends}, -Recommends: zfsutils-linux, - ifupdown2, -Description: Proxmox Backup Server daemon with tools and GUI - This package contains the Proxmox Backup Server daemons and related - tools. This includes a web-based graphical user interface. - -Package: proxmox-backup-client -Architecture: any -Depends: qrencode, - ${misc:Depends}, - ${shlibs:Depends}, -Description: Proxmox Backup Client tools - This package contains the Proxmox Backup client, which provides a - simple command line tool to create and restore backups. - -Package: proxmox-backup-docs -Build-Profiles: -Section: doc -Depends: libjs-extjs, - libjs-mathjax, - ${misc:Depends}, -Architecture: all -Description: Proxmox Backup Documentation - This package contains the Proxmox Backup Documentation files. - -Package: proxmox-backup-file-restore -Architecture: any -Depends: ${misc:Depends}, - ${shlibs:Depends}, -Recommends: pve-qemu-kvm (>= 5.0.0-9), - proxmox-backup-restore-image, -Breaks: proxmox-backup-restore-image (<< 0.3.1) -Description: Proxmox Backup single file restore tools for pxar and block device backups - This package contains the Proxmox Backup single file restore client for - restoring individual files and folders from both host/container and VM/block - device backups. It includes a block device restore driver using QEMU. diff --git a/debian/debcargo.toml b/debian/debcargo.toml deleted file mode 100644 index 2b8ec883..00000000 --- a/debian/debcargo.toml +++ /dev/null @@ -1,43 +0,0 @@ -overlay = "." -crate_src_path = ".." -whitelist = ["tests/*.c"] - -maintainer = "Proxmox Support Team " - -[source] -vcs_git = "git://git.proxmox.com/git/proxmox-backup.git" -vcs_browser = "https://git.proxmox.com/?p=proxmox-backup.git;a=summary" -section = "admin" -build_depends = [ - "bash-completion", - "debhelper (>= 12~)", - "fonts-dejavu-core ", - "fonts-lato ", - "fonts-open-sans ", - "graphviz ", - "latexmk ", - "patchelf", - "proxmox-widget-toolkit-dev ", - "pve-eslint (>= 7.18.0-1)", - "python3-docutils", - "python3-pygments", - "python3-sphinx ", - "rsync", - "texlive-fonts-extra ", - "texlive-fonts-recommended ", - "texlive-xetex ", - "xindy ", -] - -build_depends_excludes = [ - "debhelper (>=11)", -] - -[packages.lib] -depends = [ - "libacl1-dev", - "libfuse3-dev", - "libsystemd-dev", - "uuid-dev", - "libsgutils2-dev", -]