From f88846ea3be85a8f4a80c8faf63c9826e4453750 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 10 May 2017 07:06:35 +0200 Subject: [PATCH] do not install replication code The code introduces a cyclic package dependency, so we need to move it to pve-manager package. --- Makefile | 12 ++---------- PVE/API2/Storage/Makefile | 2 +- PVE/CLI/Makefile | 2 +- PVE/Makefile | 1 - 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 826d59a..386fea6 100644 --- a/Makefile +++ b/Makefile @@ -33,23 +33,15 @@ pvesm.bash-completion: perl -I. -T -e "use PVE::CLI::pvesm; PVE::CLI::pvesm->generate_bash_completions();" >$@.tmp mv $@.tmp $@ -pvesr.bash-completion: - perl -I. -T -e "use PVE::CLI::pvesr; PVE::CLI::pvesr->generate_bash_completions();" >$@.tmp - mv $@.tmp $@ - .PHONY: install -install: pvesm.1 pvesm.bash-completion pvesr.bash-completion +install: pvesm.1 pvesm.bash-completion install -d ${DESTDIR}${SBINDIR} install -m 0755 pvesm ${DESTDIR}${SBINDIR} - install -m 0755 pvesr ${DESTDIR}${SBINDIR} make -C PVE install - install -d ${DESTDIR}/var/lib/pve-replica install -d ${DESTDIR}/usr/share/man/man1 install -m 0644 pvesm.1 ${DESTDIR}/usr/share/man/man1/ gzip -9 -n ${DESTDIR}/usr/share/man/man1/pvesm.1 install -m 0644 -D pvesm.bash-completion ${DESTDIR}${BASHCOMPLDIR}/pvesm - install -m 0644 -D pvesr.bash-completion ${DESTDIR}${BASHCOMPLDIR}/pverepm - .PHONY: deb deb: ${DEB} @@ -73,7 +65,7 @@ ${DEB}: .PHONY: clean clean: make cleanup-docgen - rm -rf debian *.deb ${PACKAGE}-*.tar.gz dist *.1 *.tmp pvesm.bash-completion pvesr.bash-completion + rm -rf debian *.deb ${PACKAGE}-*.tar.gz dist *.1 *.tmp pvesm.bash-completion find . -name '*~' -exec rm {} ';' .PHONY: distclean diff --git a/PVE/API2/Storage/Makefile b/PVE/API2/Storage/Makefile index 2b91bb0..b23c17c 100644 --- a/PVE/API2/Storage/Makefile +++ b/PVE/API2/Storage/Makefile @@ -1,5 +1,5 @@ -SOURCES= Content.pm Status.pm Config.pm Scan.pm Replication.pm +SOURCES= Content.pm Status.pm Config.pm Scan.pm .PHONY: install install: diff --git a/PVE/CLI/Makefile b/PVE/CLI/Makefile index 3d6f96d..6c6e258 100644 --- a/PVE/CLI/Makefile +++ b/PVE/CLI/Makefile @@ -1,4 +1,4 @@ -SOURCES=pvesm.pm pvesr.pm +SOURCES=pvesm.pm .PHONY: install install: ${SOURCES} diff --git a/PVE/Makefile b/PVE/Makefile index c4075d1..ae2bd35 100644 --- a/PVE/Makefile +++ b/PVE/Makefile @@ -3,7 +3,6 @@ .PHONY: install install: install -D -m 0644 Storage.pm ${DESTDIR}${PERLDIR}/PVE/Storage.pm - install -D -m 0644 ReplicationTools.pm ${DESTDIR}${PERLDIR}/PVE/ReplicationTools.pm install -D -m 0644 Diskmanage.pm ${DESTDIR}${PERLDIR}/PVE/Diskmanage.pm make -C Storage install make -C API2 install